ud-mailgate: remove exception for münchen.debian.net

[mirror/userdir-ldap.git] / ud-guest-upgrade

diff --git a/ud-guest-upgrade b/ud-guest-upgrade
index 1ef7f64..91288c0 100755 (executable)
--- 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