Subversion Repositories skolelinux

Compare Revisions

Ignore whitespace Rev 33958 → Rev 33959

/branches/from_wls_20031110_BRANCH/src/webmin-ldap-skolelinux/config.info
8,3 → 8,4
passwd_lowercase=The passwords must contain at least one lowercase letter,4,0-No,1-Yes
passwd_number=The passwords must contain at least one numeric character,4,0-No,1-Yes
passwd_length=The minimal length of passwords,6
 
/branches/from_wls_20031110_BRANCH/src/webmin-ldap-skolelinux/WebminLdapSkolelinux.pm
123,9 → 123,17
init_config(); # gives me %config, $cb, tb, $text
read_adduser_config(); # puts adduser config into %config
read_miniserv_config(); # pulls in miniserv config for cookie sttings
my $username;
if ( $remote_user eq "root" ){
$username = $config{'rootdn'};
}
else {
$username = "cn=$remote_user,ou=People,$config{'basedn'}"
}
 
ldap_connect( # Connect to the ldap server.
$config{'server'}, $config{'rootdn'},
$config{'server'}, $username,
$config{'basedn'}, $config{'FIRST_UID'} || 10000,
$config{'LAST_UID'} || 29999,
);
222,18 → 230,18
my $unauthorized = check_authorisation(); #
 
my ( @edit_items, @display_items );
unless ( $unauthorized ) {
if ( $unauthorized ) {
@edit_items = qw/userPassword passwordreconfirm/;
@display_items = qw/cn uid uidNumber gidNumber shadowFlag
loginShell homeDirectory mailMessageStore description/;
}
else {
@edit_items = qw/cn userPassword passwordreconfirm loginShell
homeDirectory mailMessageStore description/;
@display_items = qw/uid uidNumber gidNumber shadowFlag/;
}
else {
@edit_items = qw/userPassword passwordreconfirm/;
@display_items = qw/cn uid uidNumber gidNumber shadowFlag
loginShell homeDirectory mailMessageStore description/;
}
my $user_name = $par{user_name};
my $rootpw = get_root_password($q);
1856,7 → 1864,7
@bug_matrix = @{ $global{bug_matrix} };
}
 
my (@res, $row_count);
my @res;
my $row_count = 0;
for my $row ( @{$users_ref} ) {
my @col;
1938,6 → 1946,11
 
my $state_ref = retrieve $filename ;
 
# my $unauthorized = check_authorisation();
# if ( $unauthorized ) {
# delete $state_ref->{passwd}
# }
 
$global{state} = $state_ref;
 
$global{tmp_file} = $filename;