# 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;
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
Split = re.split("[:\n]",Line);
(Split[4],cn,mn,sn) = ParseGecos(Split[4]);
- CheckNumber(Split[2]);
- CheckNumber(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]),
if (DoAdd == 1):
try:
- AddRec = Rec
- Rec.append(("objectClass", UserObjectClasses))
+ AddRec = Rec[:]
+ AddRec.append(("objectClass", UserObjectClasses))
l.add_s(Dn,AddRec)
DoModify = False
continue;
for x in range(2,8):
- CheckNumber(Split[x]);
+ int(Split[x])
Rec = [(ldap.MOD_REPLACE,"shadowLastChange",Split[2]),
(ldap.MOD_REPLACE,"shadowMin",Split[3]),
# Split up the group information
Split = re.split("[:\n]",Line);
Members = re.split("[, ]*",Split[3]);
- CheckNumber(Split[2]);
+ int(Split[2])
# Iterate over the membership list and add the membership information
# To the directory
# Main program starts here
# Connect to the ldap server
-l = passwdAccessLDAP(LDAPServer, BaseDn, AdminUser)
+l = passwdAccessLDAP(BaseDn, AdminUser)
if (Passwd != ""):
DoPasswd(l,Passwd);