X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=blobdiff_plain;f=ud-arbimport;h=5d5a37d0b2290c6a36936c5abe0aaa614bcaada3;hp=5b64ed83c063d10dc21f81a274b3b2e84c37ea66;hb=a6fb69805c3999a85c064a96c93417bb1c284c5c;hpb=ee3eb0677056b25df70d8fe93a74cb2e6c0e38f5

diff --git a/ud-arbimport b/ud-arbimport
index 5b64ed8..5d5a37d 100755
--- a/ud-arbimport
+++ b/ud-arbimport
@@ -1,10 +1,28 @@
 #!/usr/bin/env python
 # -*- mode: python -*-
+
+#   Copyright (c) 1999       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.
+
 # This script imports arbitary lists of data. The input is a file with 
 # the form of:
 #  uid: <data>
 
-import string, re, time, ldap, getopt, sys;
+import re, time, ldap, getopt, sys;
 from userdir_ldap import *;
 
 # Process options
@@ -21,25 +39,39 @@ if len(arguments) == 0:
    os.exit(0);
 
 # 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)
 
 List = open(arguments[1],"r");
+Set = [];
+User = None;
 while(1):
    Line = List.readline();
-   if Line == "":
-      break;
-
-   Split = re.split("[:\n]",Line);
+   if Line != "":
+      # Glob similar lines
+      Split = re.split("[:\n]",Line);
+      if User == None:
+         User = Split[0];
+      if Split[0] == User:
+         Set.append(Split[1].strip());
+         continue;
+   else:
+      if len(Set) == 0:
+         break;
    
-   Rec = [(ldap.MOD_REPLACE,arguments[0],string.strip(Split[1]))];
-   Dn = "uid=" + Split[0] + "," + BaseDn;
+   # Generate the command..
+   Rec = [(ldap.MOD_REPLACE,arguments[0],Set[0])];
+   for x in Set[1:]:
+      Rec.append((ldap.MOD_ADD,arguments[0],x))
+
+   Dn = "uid=" + User + "," + BaseDn;
    try:
+      print Dn,Rec;
       l.modify_s(Dn,Rec);
    except:
       print "Failed",Dn;
+   
+   # Out of data..
+   if Line == "":
+      break;   
+   User = Split[0];
+   Set = [Split[1].strip()];