From: Paul Wise <pabs@debian.org>
Date: Mon, 13 Jun 2016 00:27:44 +0000 (+0800)
Subject: Look up the default group from the config instead of hardcoding it
X-Git-Tag: userdir-ldap-0.3.88~9
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=04d7f29e9b8d848af7c5f61e81bdff7769817e10

Look up the default group from the config instead of hardcoding it
---

diff --git a/ud-guest-upgrade b/ud-guest-upgrade
index 1ef7f64..a259d0b 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,7 +70,7 @@ 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"