projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Import from samosa: support for debianGroup and ldap-AND
[mirror/userdir-ldap.git]
/
ud-groupadd
diff --git
a/ud-groupadd
b/ud-groupadd
index
94b25e1
..
7a6dc16
100755
(executable)
--- a/
ud-groupadd
+++ b/
ud-groupadd
@@
-13,10
+13,10
@@
from userdir_gpg import *;
def GetFreeID(l):
HighestUID = 1000;
Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,
def GetFreeID(l):
HighestUID = 1000;
Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,
- "gid
number>="+str(HighestUID),["gidn
umber"]);
+ "gid
Number>="+str(HighestUID),["gidN
umber"]);
HighestUID = 0;
for I in Attrs:
HighestUID = 0;
for I in Attrs:
- ID = int(GetAttr(I,"gid
n
umber","0"));
+ ID = int(GetAttr(I,"gid
N
umber","0"));
if ID > HighestUID and ID < 60000:
HighestUID = ID;
return HighestUID + 1;
if ID > HighestUID and ID < 60000:
HighestUID = ID;
return HighestUID + 1;
@@
-42,7
+42,7
@@
UserDn = "uid=" + AdminUser + "," + BaseDn;
l.simple_bind_s(UserDn,Password);
while 1:
l.simple_bind_s(UserDn,Password);
while 1:
- Group = raw_input("Group name?");
+ Group = raw_input("Group name?
");
if Group == "":
sys.exit(1);
if Group == "":
sys.exit(1);
@@
-59,6
+59,5
@@
Dn = "gid=" + Group + "," + BaseDn;
print "Updating LDAP directory..",
sys.stdout.flush();
l.add_s(Dn,[("gid",Group),
print "Updating LDAP directory..",
sys.stdout.flush();
l.add_s(Dn,[("gid",Group),
- ("gidnumber",str(Id)),
- ("objectclass","top"),
- ("objectclass","posixGroup")]);
+ ("gidNumber",str(Id)),
+ ("objectClass",("top", "debianGroup"))]);