From ae98dd09279bf506cb63230a8c4bfbb9df10899e Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Sun, 26 Aug 2007 22:49:22 +0000
Subject: [PATCH] set_user_env fixes

---
 ldap-useradmin/config.info           |  2 +-
 ldap-useradmin/ldap-useradmin-lib.pl | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ldap-useradmin/config.info b/ldap-useradmin/config.info
index bff12a911..a2f21e5a3 100644
--- a/ldap-useradmin/config.info
+++ b/ldap-useradmin/config.info
@@ -54,7 +54,7 @@ charset=Character set for editing users and groups,3,From Webmin language
 secmode=Show secondary groups on user form?,1,0-Yes,1-No,2-As text box
 
 line2=Samba account options,11
-samba_class=LDAP object class for Samba users,0
+samba_class=LDAP object class for Samba users,10,sambaAccount-sambaAccount (Samba 2),sambaSamAccount-sambaSamAccount (Samba 3),Other
 samba_def=Enabled Samba account by default?,1,1-Yes,0-No
 samba_domain=Domain SID for Samba3,0
 samba_props=LDAP properties for new Samba users,9,40,3,\t
diff --git a/ldap-useradmin/ldap-useradmin-lib.pl b/ldap-useradmin/ldap-useradmin-lib.pl
index c66ea1082..790000d82 100644
--- a/ldap-useradmin/ldap-useradmin-lib.pl
+++ b/ldap-useradmin/ldap-useradmin-lib.pl
@@ -505,17 +505,24 @@ if ($config{'post_command'} =~ /\S/) {
 return undef;
 }
 
-# set_user_envs(&hash, action, [plainpass], [secondary])
+# set_user_envs(&hash, action, [plainpass], [secondary],
+#		[&olduser], [oldplainpass])
 # Just call the useradmin function of the same name
 sub set_user_envs
 {
-local $rv = &useradmin::set_user_envs(@_[0..3]);
+local $rv = &useradmin::set_user_envs(@_);
 if ($_[0]->{'all_ldap_attrs'}) {
 	foreach my $a (keys %{$_[0]->{'all_ldap_attrs'}}) {
 		my $v = $_[0]->{'all_ldap_attrs'}->{$a};
 		$ENV{'USERADMIN_LDAP_'.uc($a)} = $v;
 		}
 	}
+if ($_[5]->{'all_ldap_attrs'}) {
+	foreach my $a (keys %{$_[5]->{'all_ldap_attrs'}}) {
+		my $v = $_[5]->{'all_ldap_attrs'}->{$a};
+		$ENV{'USERADMIN_OLD_LDAP_'.uc($a)} = $v;
+		}
+	}
 return $rv;
 }