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 dnsTTL host attribute to override the zone default TTL for A and AAAA records...
[mirror/userdir-ldap.git]
/
ud-roleadd
diff --git
a/ud-roleadd
b/ud-roleadd
index
db83f18
..
9c30bd1
100755
(executable)
--- a/
ud-roleadd
+++ b/
ud-roleadd
@@
-4,6
+4,7
@@
# Copyright (c) 1999-2000 Jason Gunthorpe <jgg@debian.org>
# Copyright (c) 2001-2003 James Troup <troup@debian.org>
# Copyright (c) 2004-2005 Joey Schulze <joey@infodrom.org>
# Copyright (c) 1999-2000 Jason Gunthorpe <jgg@debian.org>
# Copyright (c) 2001-2003 James Troup <troup@debian.org>
# Copyright (c) 2004-2005 Joey Schulze <joey@infodrom.org>
+# Copyright (c) 2007 Peter Palfrader <peter@palfrader.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
@@
-19,7
+20,7
@@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-import
string,
time, ldap, getopt, sys, os, pwd
+import time, ldap, getopt, sys, os, pwd
from userdir_ldap import *
# This tries to search for a free UID. There are two possible ways to do
from userdir_ldap import *
# This tries to search for a free UID. There are two possible ways to do
@@
-49,7
+50,7
@@
for (switch, val) in options:
if (switch == '-u'):
AdminUser = val
if (switch == '-u'):
AdminUser = val
-l = passwdAccessLDAP(
LDAPServer,
BaseDn, AdminUser)
+l = passwdAccessLDAP(BaseDn, AdminUser)
while 1:
account = raw_input("Who are you going to add? ")
while 1:
account = raw_input("Who are you going to add? ")
@@
-69,7
+70,10
@@
if Res != "":
# GID
Res = raw_input("Group ID Number? ")
if Res != "":
# GID
Res = raw_input("Group ID Number? ")
if Res != "":
- gidNumber = Group2GID(Res)
+ gidNumber = Group2GID(l, Res)
+ if gidNumber == -1:
+ print "Can't figure out which gid %s is" % Res
+ sys.exit(1)
# UID
uidNumber = GetFreeID(l)
# UID
uidNumber = GetFreeID(l)
@@
-92,8
+96,7
@@
print "Updating LDAP directory..",
sys.stdout.flush()
Details = [("uid",account),
sys.stdout.flush()
Details = [("uid",account),
- ("objectClass",
- ("top","inetOrgPerson","debianAccount","shadowAccount","debianRoleAccount")),
+ ("objectClass", RoleObjectClasses),
("uidNumber",str(uidNumber)),
("gidNumber",str(gidNumber)),
("gecos",cn+",,,,"),
("uidNumber",str(uidNumber)),
("gidNumber",str(gidNumber)),
("gecos",cn+",,,,"),