X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-userimport;h=90a8de6b002fc66b1cc26eab729f34998df33110;hb=c99ba895d0c0434b6fb836e97c3104a42e2df26c;hp=2e6f903bf7a5dd2a01170156e5c7718ac40893ac;hpb=c50d88536a4feb3087d1aa802e110250cb2861fc;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-userimport b/ud-userimport
index 2e6f903..90a8de6 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.
@@ -89,11 +108,11 @@ def DoPasswd(l,Passwd):
       if (DoAdd == 1):
          try:
             l.add_s(Dn,[("uid",Split[0]),
-                        ("objectclass","top"),
-                        ("objectclass","account"),
-                        ("objectclass","posixAccount"),
-                        ("objectclass","shadowAccount"),
-                        ("objectclass","debiandeveloper")]);
+                        ("objectClass","top"),
+                        ("objectClass","account"),
+                        ("objectClass","posixAccount"),
+                        ("objectClass","shadowAccount"),
+                        ("objectClass","debiandeveloper")]);
          except ldap.ALREADY_EXISTS:
             print "exists",;
 
@@ -162,7 +181,7 @@ def DoGroup(l,Group):
 
       # Iterate over the membership list and add the membership information
       # To the directory
-      Rec = [(ldap.MOD_ADD,"supplementarygid",Split[0])];
+      Rec = [(ldap.MOD_ADD,"supplementaryGid",Split[0])];
       Counter = 0;
       for x in Members:
 	 if x == "":
@@ -191,8 +210,8 @@ def DoGroup(l,Group):
       if (DoAdd == 1):
          try:
             l.add_s(Dn,[("gid",Split[0]),
-                        ("objectclass","top"),
-                        ("objectclass","posixGroup")]);
+                        ("objectClass","top"),
+                        ("objectClass","posixGroup")]);
          except ldap.ALREADY_EXISTS:
             print "exists",;
 
@@ -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, AdminUser)
 
 if (Passwd != ""):
    DoPasswd(l,Passwd);