michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-05-04 22:30:33 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

set_user_env fixes

Browse Source
This commit is contained in:
Jamie Cameron
2007-08-26 22:49:22 +00:00
parent ec8c2780c3
commit ae98dd0927
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ldap-useradmin/config.info
View File

@@ -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

11
ldap-useradmin/ldap-useradmin-lib.pl
View File

@@ -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;
}