projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add 1000 to UIDs and GIDs if the ud-generate.conf contains '[UIDSHIFT]' as
[mirror/userdir-ldap.git]
/
userdir_ldap.py
diff --git
a/userdir_ldap.py
b/userdir_ldap.py
index
634c514
..
c2b864d
100644
(file)
--- a/
userdir_ldap.py
+++ b/
userdir_ldap.py
@@
-17,7
+17,7
@@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
# Some routines and configuration that are used by the ldap progams
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
# Some routines and configuration that are used by the ldap progams
-import termios, re, string, imp, ldap, sys,
whrandom,
crypt, rfc822;
+import termios, re, string, imp, ldap, sys, crypt, rfc822;
import userdir_gpg
try:
import userdir_gpg
try:
@@
-411,9
+411,18
@@
def GetUID(l,Name,UnknownMap = {}):
return (None,None);
return (None,None);
-def Group2GID(name):
- """Returns the numerical id of a common group"""
+def Group2GID(l, name):
+ """
+ Returns the numerical id of a common group
+ on error returns -1
+ """
for g in DebianGroups.keys():
if name == g:
return DebianGroups[g]
for g in DebianGroups.keys():
if name == g:
return DebianGroups[g]
- return name
+
+ filter = "(gid=%s)" % name
+ res = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,filter,["gidNumber"]);
+ if res:
+ return int(GetAttr(res[0], "gidNumber"))
+
+ return -1