from userdir_gpg import *;
HavePrivateList = getattr(ConfModule, "haveprivatelist", True)
+DefaultGroup = getattr(ConfModule, "defaultgroup", 'users')
# This tries to search for a free UID. There are two possible ways to do
# this, one is to fetch all the entires and pick the highest, the other
# search through all UIDs.
def GetFreeID(l):
Attrs = l.search_s(BaseBaseDn,ldap.SCOPE_SUBTREE,
- "uidNumber=*",["uidNumber", "gidNumber", "uid"]);
+ "(|(uidNumber=*)(gidNumber=*))",["uidNumber", "gidNumber", "uid"]);
HighestUID = 0;
gids = [];
uids = [];
print " -u=<user> Admin user (defaults to current username)"
print " -m Force mail (for updates)"
print " -a Use old keyrings instead (??)"
- print " -n Do not automatically assign UID/GIDs (useful for usergroups or non-default group membership"
+ print " -n Do not automatically assign UID/GIDs"
print " -g Add a guest account"
sys.exit(0)
elif (switch == '-u'):
else:
privsub = " "
-if not gidNumber:
- if not GuestAccount:
- gidNumber = DefaultGID
- else:
- gidNumber = DebianGroups['guest']
(uidNumber, generatedGID) = GetFreeID(l)
-UserGroup = 0
+if not gidNumber:
+ gidNumber = generatedGID
+
+UserGroup = 1
if NoAutomaticIDs:
# UID
if not Update:
uidNumber = Res;
# GID
- Res = raw_input("Group ID Number (default group is %s, new usergroup %s) [%s]" % (DefaultGID, generatedGID, gidNumber));
+ Res = raw_input("Group ID Number (new usergroup is %s) [%s]" % (generatedGID, gidNumber));
if Res != "":
if Res.isdigit():
gidNumber = int(Res);
else:
gidNumber = Group2GID(l, Res);
- if gidNumber == generatedGID:
- UserGroup = 1
+ if gidNumber != generatedGID:
+ UserGroup = 0
+
+if GuestAccount:
+ supplementaryGid = 'guest'
+else:
+ supplementaryGid = DefaultGroup
shadowExpire = None
hostacl = []
print "Final information collected:"
print " %s <%s@%s>:" % (FullName,account,EmailAppend);
print " Assigned UID:",uidNumber," GID:", gidNumber;
+print " supplementary group:",supplementaryGid
print " Email forwarded to:",emailaddr
if HavePrivateList:
print " Private Subscription:",privsub;
("objectClass", UserObjectClasses),
("uidNumber",str(uidNumber)),
("gidNumber",str(gidNumber)),
+ ("supplementaryGid",supplementaryGid),
("gecos",FullName+",,,,"),
("loginShell","/bin/bash"),
("keyFingerPrint",Keys[0][1]),
# Send the Welcome message
print "Sending Welcome Email"
-templatepath = TemplatesDir + "/welcome-message-%d" % int(gidNumber)
+templatepath = TemplatesDir + "/welcome-message-%s" % supplementaryGid
if not os.path.exists(templatepath):
templatepath = TemplatesDir + "/welcome-message"
Reply = TemplateSubst(Subst,open(templatepath, "r").read())