X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=blobdiff_plain;f=ud-userimport;h=fceaf4ea8fed74d9c1a786c9019d52934f25fa91;hp=cbb6bac19249394dbeffff748abaff752ed027fc;hb=29a64949fcfdee5b1fb6333037c78baf648827ed;hpb=836c37b9ee287a5934e9d42b8eee5bfa632c560b

diff --git a/ud-userimport b/ud-userimport
index cbb6bac..fceaf4e 100755
--- a/ud-userimport
+++ b/ud-userimport
@@ -1,5 +1,24 @@
 #!/usr/bin/env python
 # -*- mode: python -*-
+
+#   Copyright (c) 1999       Jason Gunthorpe <jgg@debian.org>
+#   Copyright (c) 2003       James Troup <troup@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.
+
 # Imports passwd, shadow and group files into the directory.
 # You should cleanse the files of anything you do not want to add to the
 # directory.
@@ -220,13 +239,9 @@ for (switch, val) in options:
       AdminUser = val
 
 # Main program starts here
-print "Accessing LDAP directory as '" + AdminUser + "'";
-Password = getpass(AdminUser + "'s password: ");
 
 # Connect to the ldap server
-l = ldap.open(LDAPServer);
-UserDn = "uid=" + AdminUser + "," + BaseDn;
-l.simple_bind_s(UserDn,Password);
+l = passwdAccessLDAP(LDAPServer, BaseDn, User)
 
 if (Passwd != ""):
    DoPasswd(l,Passwd);