X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=blobdiff_plain;f=ud-arbimport;h=90a1746e3e350ca99404157768e933048bbc659e;hp=ab3af80e27c80d074560665b14817abf6f48ff88;hb=HEAD;hpb=d8db058585fa257e2c725f159d399e2613adfb4a

diff --git a/ud-arbimport b/ud-arbimport
index ab3af80..90a1746 100755
--- a/ud-arbimport
+++ b/ud-arbimport
@@ -22,7 +22,7 @@
 # the form of:
 #  uid: <data>
 
-import string, re, time, ldap, getopt, sys;
+import re, time, ldap, getopt, sys;
 from userdir_ldap import *;
 
 # Process options
@@ -36,10 +36,10 @@ for (switch, val) in options:
        NoAct = 1;
 if len(arguments) == 0:
    print "Give the key to assignt to then the file to import";
-   os.exit(0);
+   sys.exit(0)
 
 # Main program starts here
-l = passwdAccessLDAP(LDAPServer, BaseDn, AdminUser)
+l = passwdAccessLDAP(BaseDn, AdminUser)
 
 List = open(arguments[1],"r");
 Set = [];
@@ -52,7 +52,7 @@ while(1):
       if User == None:
          User = Split[0];
       if Split[0] == User:
-         Set.append(string.strip(Split[1]));
+         Set.append(Split[1].strip());
          continue;
    else:
       if len(Set) == 0:
@@ -74,4 +74,4 @@ while(1):
    if Line == "":
       break;   
    User = Split[0];
-   Set = [string.strip(Split[1])];
+   Set = [Split[1].strip()];