projects
/
mirror
/
userdir-ldap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5e5f77b
)
Import from samosa: case sensitive LDAP attributes
author
joey
<>
Thu, 18 Nov 2004 16:08:03 +0000
(16:08 +0000)
committer
joey
<>
Thu, 18 Nov 2004 16:08:03 +0000
(16:08 +0000)
ud-useradd
patch
|
blob
|
history
diff --git
a/ud-useradd
b/ud-useradd
index
fb0d52d
..
9971549
100755
(executable)
--- a/
ud-useradd
+++ b/
ud-useradd
@@
-1,4
+1,4
@@
-
y
#!/usr/bin/env python
+#!/usr/bin/env python
# -*- mode: python -*-
import string, re, time, ldap, getopt, sys, os, pwd;
# -*- mode: python -*-
import string, re, time, ldap, getopt, sys, os, pwd;
@@
-13,10
+13,10
@@
from userdir_gpg import *;
def GetFreeID(l):
HighestUID = 1400;
Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,
def GetFreeID(l):
HighestUID = 1400;
Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,
- "uidnumber>="+str(HighestUID),["uid
n
umber"]);
+ "uidnumber>="+str(HighestUID),["uid
N
umber"]);
HighestUID = 0;
for I in Attrs:
HighestUID = 0;
for I in Attrs:
- ID = int(GetAttr(I,"uid
n
umber","0"));
+ ID = int(GetAttr(I,"uid
N
umber","0"));
if ID > HighestUID:
HighestUID = ID;
return HighestUID + 1;
if ID > HighestUID:
HighestUID = ID;
return HighestUID + 1;
@@
-76,8
+76,8
@@
email = Addr[1] + '@' + Addr[2];
account = Addr[1];
privsub = email;
account = Addr[1];
privsub = email;
-gid
n
umber = str(DefaultGID);
-uid
n
umber = 0;
+gid
N
umber = str(DefaultGID);
+uid
N
umber = 0;
# Decide if we should use IDEA encryption
UsePGP2 = 0;
# Decide if we should use IDEA encryption
UsePGP2 = 0;
@@
-89,7
+89,7
@@
while len(Keys[0][1]) < 40:
if Res == "":
break;
if Res == "":
break;
-Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"key
fingerp
rint=" + Keys[0][1]);
+Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"key
FingerP
rint=" + Keys[0][1]);
if len(Attrs) != 0:
print "*** This key already belongs to",GetAttr(Attrs[0],"uid");
account = GetAttr(Attrs[0],"uid");
if len(Attrs) != 0:
print "*** This key already belongs to",GetAttr(Attrs[0],"uid");
account = GetAttr(Attrs[0],"uid");
@@
-108,10
+108,10
@@
while 1:
if Res == "yes":
# Update mode, fetch the default values from the directory
Update = 1;
if Res == "yes":
# Update mode, fetch the default values from the directory
Update = 1;
- privsub = GetAttr(Attrs[0],"private
s
ub");
- gid
number = GetAttr(Attrs[0],"gidn
umber");
- uid
number = GetAttr(Attrs[0],"uidn
umber");
- email = GetAttr(Attrs[0],"email
f
orward");
+ privsub = GetAttr(Attrs[0],"private
S
ub");
+ gid
Number = GetAttr(Attrs[0],"gidN
umber");
+ uid
Number = GetAttr(Attrs[0],"uidN
umber");
+ email = GetAttr(Attrs[0],"email
F
orward");
cn = GetAttr(Attrs[0],"cn");
sn = GetAttr(Attrs[0],"sn");
mn = GetAttr(Attrs[0],"mn");
cn = GetAttr(Attrs[0],"cn");
sn = GetAttr(Attrs[0],"sn");
mn = GetAttr(Attrs[0],"mn");
@@
-139,13
+139,13
@@
if Res != "":
privsub = Res;
# GID
privsub = Res;
# GID
-Res = raw_input("Group ID Number [" + gid
n
umber + "]? ");
+Res = raw_input("Group ID Number [" + gid
N
umber + "]? ");
if Res != "":
if Res != "":
- gid
n
umber = Res;
+ gid
N
umber = Res;
# UID
# UID
-if uid
n
umber == 0:
- uid
n
umber = GetFreeID(l);
+if uid
N
umber == 0:
+ uid
N
umber = GetFreeID(l);
# Generate a random password
if Update == 0 or ForceMail == 1:
# Generate a random password
if Update == 0 or ForceMail == 1:
@@
-177,7
+177,7
@@
else:
print "------------";
print "Final information collected:"
print " %s <%s@%s>:" % (FullName,account,EmailAppend);
print "------------";
print "Final information collected:"
print " %s <%s@%s>:" % (FullName,account,EmailAppend);
-print " Assigned UID:",uid
number," GID:", gidn
umber;
+print " Assigned UID:",uid
Number," GID:", gidN
umber;
print " Email forwarded to:",email;
print " Private Subscription:",privsub;
print " GECOS Field: \"%s,,,,\"" % (FullName);
print " Email forwarded to:",email;
print " Private Subscription:",privsub;
print " GECOS Field: \"%s,,,,\"" % (FullName);
@@
-200,15
+200,15
@@
Subst["__PASSWORD__"] = CryptedPass;
# Generate the LDAP request
Rec = [(ldap.MOD_REPLACE,"uid",account),
# Generate the LDAP request
Rec = [(ldap.MOD_REPLACE,"uid",account),
- (ldap.MOD_REPLACE,"uidNumber",str(uid
n
umber)),
- (ldap.MOD_REPLACE,"gidNumber",str(gid
n
umber)),
+ (ldap.MOD_REPLACE,"uidNumber",str(uid
N
umber)),
+ (ldap.MOD_REPLACE,"gidNumber",str(gid
N
umber)),
(ldap.MOD_REPLACE,"gecos",FullName+",,,,"),
(ldap.MOD_REPLACE,"loginShell","/bin/bash"),
(ldap.MOD_REPLACE,"gecos",FullName+",,,,"),
(ldap.MOD_REPLACE,"loginShell","/bin/bash"),
- (ldap.MOD_REPLACE,"key
fingerp
rint",Keys[0][1]),
+ (ldap.MOD_REPLACE,"key
FingerP
rint",Keys[0][1]),
(ldap.MOD_REPLACE,"cn",cn),
(ldap.MOD_REPLACE,"mn",mn),
(ldap.MOD_REPLACE,"sn",sn),
(ldap.MOD_REPLACE,"cn",cn),
(ldap.MOD_REPLACE,"mn",mn),
(ldap.MOD_REPLACE,"sn",sn),
- (ldap.MOD_REPLACE,"email
f
orward",email),
+ (ldap.MOD_REPLACE,"email
F
orward",email),
(ldap.MOD_REPLACE,"shadowLastChange",str(int(time.time()/24/60/60))),
(ldap.MOD_REPLACE,"shadowMin","0"),
(ldap.MOD_REPLACE,"shadowMax","99999"),
(ldap.MOD_REPLACE,"shadowLastChange",str(int(time.time()/24/60/60))),
(ldap.MOD_REPLACE,"shadowMin","0"),
(ldap.MOD_REPLACE,"shadowMax","99999"),
@@
-216,7
+216,7
@@
Rec = [(ldap.MOD_REPLACE,"uid",account),
(ldap.MOD_REPLACE,"shadowInactive",""),
(ldap.MOD_REPLACE,"shadowExpire","")];
if privsub != " ":
(ldap.MOD_REPLACE,"shadowInactive",""),
(ldap.MOD_REPLACE,"shadowExpire","")];
if privsub != " ":
- Rec.append((ldap.MOD_REPLACE,"private
s
ub",privsub));
+ Rec.append((ldap.MOD_REPLACE,"private
S
ub",privsub));
if Pass != None:
Rec.append((ldap.MOD_REPLACE,"userPassword","{crypt}"+Pass));
if Pass != None:
Rec.append((ldap.MOD_REPLACE,"userPassword","{crypt}"+Pass));
@@
-253,7
+253,7
@@
if Update == 1 and ForceMail == 0:
# Send the Welcome message
print "Sending Welcome Email"
# Send the Welcome message
print "Sending Welcome Email"
-Reply = TemplateSubst(Subst,open(TemplatesDir+"/welcome-message-"+gid
n
umber,"r").read());
+Reply = TemplateSubst(Subst,open(TemplatesDir+"/welcome-message-"+gid
N
umber,"r").read());
Child = os.popen("/usr/sbin/sendmail -t","w");
#Child = os.popen("cat","w");
Child.write(Reply);
Child = os.popen("/usr/sbin/sendmail -t","w");
#Child = os.popen("cat","w");
Child.write(Reply);