X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-killcrypt;h=45dbcc277729b4ffdd94d0dda503674b9e02c672;hb=f561403b242249bc684536cfb2615084e4105278;hp=e92aa550ff1891c77848ba7b0cab19e0091b0a62;hpb=9bcf7bd209b5c5473c9acc36ae9ce52c411c7242;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-killcrypt b/ud-killcrypt
index e92aa55..45dbcc2 100644
--- a/ud-killcrypt
+++ b/ud-killcrypt
@@ -1,6 +1,23 @@
 #!/usr/bin/env python
 # -*- mode: python -*-
 
+#   Copyright (c) 2001       Jason Gunthorpe <jgg@debian.org>
+#   Copyright (c) 2004       Joey Schulze <joey@debian.org>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
 import string, re, time, ldap, getopt, sys, pwd, os, posix;
 from userdir_ldap import *;
 
@@ -15,11 +32,7 @@ for (switch, val) in options:
 	Anon = 1;
 			      
 # Connect to the ldap server
-l = ldap.open(LDAPServer);
-print "Accessing LDAP directory as '" + User + "'";
-Password = getpass(User + "'s password: ");
-UserDn = "uid=" + User + "," + BaseDn;
-l.simple_bind_s(UserDn,Password);
+l = passwdAccessLDAP(LDAPServer, BaseDn, User)
 
 Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"userpassword=*",\
          ["uid","cn","mn","sn","userpassword"]);