X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=blobdiff_plain;f=ud-guest-upgrade;h=91288c01a1592c7ca5ac500c2a16c13cf14080a5;hp=1ef7f643481c1d790c17dd32b284f8d804402763;hb=HEAD;hpb=7837df081edbfaee24981fc60dd085bb4922e2cc

diff --git a/ud-guest-upgrade b/ud-guest-upgrade
index 1ef7f64..91288c0 100755
--- a/ud-guest-upgrade
+++ b/ud-guest-upgrade
@@ -26,6 +26,8 @@ import os, pwd, sys
 from userdir_ldap import *;
 from string import Template
 
+DefaultGroup = getattr(ConfModule, "defaultgroup", 'users')
+
 parser = argparse.ArgumentParser(description='Upgrade a guest account.')
 parser.add_argument('uid', metavar='UID',
                    help="user's uid to be upgraded")
@@ -68,10 +70,10 @@ print "delete: shadowExpire"
 print "-"
 print "replace: supplementaryGid"
 for gid in attrs['supplementaryGid']:
-    if gid == "guest": gid = "Debian"
+    if gid == "guest": gid = DefaultGroup
     print "supplementaryGid:", gid
 print "-"
-print "add: privateSub"
+print "replace: privateSub"
 print "privateSub:", uid+"@debian.org"
 print "-"
 print