X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=blobdiff_plain;f=ud-userimport;h=3e926ecf197563997bc532093fd5d04b29c331c4;hp=4a21dafd64f6e6d516b133cad829315514d6046a;hb=a6fb69805c3999a85c064a96c93417bb1c284c5c;hpb=3ec1386cd62200a1d86fc72168c2aa1fe305bdd8

diff --git a/ud-userimport b/ud-userimport
index 4a21daf..3e926ec 100755
--- a/ud-userimport
+++ b/ud-userimport
@@ -37,7 +37,7 @@
 #  ldapimport -s /etc/shadow -g /etc/group
 # 
 
-import string, re, time, ldap, getopt, sys;
+import re, time, ldap, getopt, sys;
 from userdir_ldap import *;
 
 DoAdd = 0;
@@ -71,11 +71,6 @@ def ParseGecos(Field):
            Gecos[3] + "," + Gecos[4];
    return (Field,cn,mn,sn);
 
-# Check if a number string is really a number
-def CheckNumber(Num):
-   for x in Num:
-      string.index(string.digits,x);
-
 # Read the passwd file into the database
 def DoPasswd(l,Passwd):
    # Read the passwd file and import it
@@ -88,8 +83,8 @@ def DoPasswd(l,Passwd):
 
       Split = re.split("[:\n]",Line);
       (Split[4],cn,mn,sn) = ParseGecos(Split[4]);
-      CheckNumber(Split[2]);
-      CheckNumber(Split[3]);
+      Split[2] = int(Split[2])
+      Split[3] = int(Split[3])
       Rec = [("uid",Split[0]),
              ("uidNumber",Split[2]),
              ("gidNumber",Split[3]),
@@ -148,7 +143,7 @@ def DoShadow(l,Shadow):
          continue;
 
       for x in range(2,8):
-         CheckNumber(Split[x]);
+         Split[x] = int(Split[x])
 
       Rec = [(ldap.MOD_REPLACE,"shadowLastChange",Split[2]),
              (ldap.MOD_REPLACE,"shadowMin",Split[3]),
@@ -189,7 +184,7 @@ def DoGroup(l,Group):
       # Split up the group information
       Split = re.split("[:\n]",Line);
       Members = re.split("[, ]*",Split[3]);
-      CheckNumber(Split[2]);
+      Split[2] = int(Split[2])
 
       # Iterate over the membership list and add the membership information
       # To the directory