# 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
# 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:
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)
new[3] = new[3] & ~termios.ECHO; # lflags
try:
termios.tcsetattr(fd, termios.TCSADRAIN, new);
- passwd = raw_input(prompt);
+ try:
+ passwd = raw_input(prompt);
+ except KeyboardInterrupt:
+ termios.tcsetattr(fd, termios.TCSADRAIN, old);
+ print
+ sys.exit(0)
+ except EOFError:
+ passwd = ""
finally:
termios.tcsetattr(fd, termios.TCSADRAIN, old);
print;
return passwd;
+def passwdAccessLDAP(LDAPServer, BaseDn, AdminUser):
+ """
+ Ask for the AdminUser's password and connect to the LDAP server.
+ Returns the connection handle.
+ """
+ print "Accessing LDAP directory as '" + AdminUser + "'";
+ while (1):
+ Password = getpass(AdminUser + "'s password: ");
+
+ if len(Password) == 0:
+ sys.exit(0)
+
+ l = ldap.open(LDAPServer);
+ UserDn = "uid=" + AdminUser + "," + BaseDn;
+
+ # Connect to the ldap server
+ try:
+ l.simple_bind_s(UserDn,Password);
+ except ldap.INVALID_CREDENTIALS:
+ continue
+ break
+ return l
+
# Split up a name into multiple components. This tries to best guess how
# to split up a name
def NameSplit(Name):
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]
- 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