X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=blobdiff_plain;f=ud-userimport;h=4e044c79a71d3f18cd320d97ef139f6115d3a41d;hp=3e926ecf197563997bc532093fd5d04b29c331c4;hb=cdba05cbc8f2fa6a8557fd43e6c4e4d5d8e1130c;hpb=a6fb69805c3999a85c064a96c93417bb1c284c5c diff --git a/ud-userimport b/ud-userimport index 3e926ec..4e044c7 100755 --- a/ud-userimport +++ b/ud-userimport @@ -83,8 +83,10 @@ def DoPasswd(l,Passwd): Split = re.split("[:\n]",Line); (Split[4],cn,mn,sn) = ParseGecos(Split[4]); - Split[2] = int(Split[2]) - Split[3] = int(Split[3]) + # This just tests whether these are integers and throws an + # exception if not + int(Split[2]) + int(Split[3]) Rec = [("uid",Split[0]), ("uidNumber",Split[2]), ("gidNumber",Split[3]), @@ -106,8 +108,8 @@ def DoPasswd(l,Passwd): if (DoAdd == 1): try: - AddRec = Rec - Rec.append(("objectClass", UserObjectClasses)) + AddRec = Rec[:] + AddRec.append(("objectClass", UserObjectClasses)) l.add_s(Dn,AddRec) DoModify = False @@ -143,7 +145,7 @@ def DoShadow(l,Shadow): continue; for x in range(2,8): - Split[x] = int(Split[x]) + int(Split[x]) Rec = [(ldap.MOD_REPLACE,"shadowLastChange",Split[2]), (ldap.MOD_REPLACE,"shadowMin",Split[3]), @@ -184,7 +186,7 @@ def DoGroup(l,Group): # Split up the group information Split = re.split("[:\n]",Line); Members = re.split("[, ]*",Split[3]); - Split[2] = int(Split[2]) + int(Split[2]) # Iterate over the membership list and add the membership information # To the directory