projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mark that no passwords are exported also in the generated passwd file, not
[mirror/userdir-ldap.git]
/
userdir_ldap.py
diff --git
a/userdir_ldap.py
b/userdir_ldap.py
index
f60b715
..
c2b864d
100644
(file)
--- a/
userdir_ldap.py
+++ b/
userdir_ldap.py
@@
-1,6
+1,6
@@
# Copyright (c) 1999-2000 Jason Gunthorpe <jgg@debian.org>
# Copyright (c) 2001-2003 Ryan Murray <rmurray@debian.org>
# Copyright (c) 1999-2000 Jason Gunthorpe <jgg@debian.org>
# Copyright (c) 2001-2003 Ryan Murray <rmurray@debian.org>
-# Copyright (c) 2004 Joey Schulze <joey@infodrom.org>
+# Copyright (c) 2004
-2005
Joey Schulze <joey@infodrom.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@
-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:
@@
-48,7
+48,11
@@
userdir_gpg.SetKeyrings(string.split(ConfModule.keyrings,":"));
LastNamesPre = {"van": None, "von": None, "le": None, "de": None, "di": None};
# This is a list of common groups on Debian hosts
LastNamesPre = {"van": None, "von": None, "le": None, "de": None, "di": None};
# This is a list of common groups on Debian hosts
-DebianGroups = {"Debian": 800, "guest": 60000}
+DebianGroups = {
+ "Debian": 800,
+ "guest": 60000,
+ "nogroup": 65534
+ }
# SSH Key splitting. The result is:
# (options,size,modulous,exponent,comment)
# SSH Key splitting. The result is:
# (options,size,modulous,exponent,comment)
@@
-407,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