From e9f5f4e42a9668aba3064ffbab2cc450e6dfbde7 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Sat, 31 Jul 2010 02:04:49 -0700
Subject: [PATCH] Fix automatic home dir that includes group

---
 ldap-useradmin/edit_user.cgi | 13 ++++++++++---
 ldap-useradmin/save_user.cgi |  1 +
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ldap-useradmin/edit_user.cgi b/ldap-useradmin/edit_user.cgi
index 9cb3b9406..60e92ef48 100755
--- a/ldap-useradmin/edit_user.cgi
+++ b/ldap-useradmin/edit_user.cgi
@@ -142,10 +142,18 @@ if ($config{'given'}) {
 print &ui_table_row($text{'real'},
 	&ui_textbox("real", $real, 40));
 
+# Work out group name
+if ($in{'new'}) {
+	$grp = $mconfig{'default_group'};
+	}
+else {
+	$grp = &all_getgrgid($gid);
+	}
+
 # Show home directory input, with an 'automatic' option
 if ($mconfig{'home_base'}) {
 	local $hb = $in{'new'} ||
-	    &auto_home_dir($mconfig{'home_base'}, $user) eq $home;
+	    &auto_home_dir($mconfig{'home_base'}, $user, $grp) eq $home;
 	$homefield = &ui_radio("home_base", $hb ? 1 : 0,
 			       [ [ 1, $text{'uedit_auto'} ],
 				 [ 0, &ui_filebox("home", $hb ? "" : $home,
@@ -263,8 +271,7 @@ print &ui_table_start($text{'uedit_gmem'}, "width=100%", 4, \@tds);
 
 # Primary group
 print &ui_table_row($text{'group'},
-	&ui_textbox("gid", $in{'new'} ? $mconfig{'default_group'}
-				      : ($x=&all_getgrgid($gid)) || $gid, 13).
+	&ui_textbox("gid", $grp || $gid, 13).
 	" ".&group_chooser_button("gid"), 3);
 
 if ($config{'secmode'} != 1) {
diff --git a/ldap-useradmin/save_user.cgi b/ldap-useradmin/save_user.cgi
index 64a4238ed..2d93cc233 100755
--- a/ldap-useradmin/save_user.cgi
+++ b/ldap-useradmin/save_user.cgi
@@ -265,6 +265,7 @@ else {
 		$gid = &all_getgrnam($in{'gid'});
 		defined($gid) || &error(&text('usave_egid', $in{'gid'}));
 		}
+	$grp = &all_getgrgid($gid);
 
 	# Build useradmin-style hash of user details
 	local %uhash = ( 'user' => $user,