}
}
-sub user_enabled {
- my ($usercfg, $username) = @_;
+sub check_user_enabled {
+ my ($usercfg, $username, $noerr) = @_;
- $username = verify_username($username, 1);
+ $username = verify_username($username, $noerr);
return undef if !$username;
return 1 if $usercfg && $usercfg->{users}->{$username} &&
return 1 if $username eq 'root@pam'; # root is always enabled
- return 0;
+ die "no such user ('$username')\n" if !$noerr;
+
+ return undef;
}
# password should be utf8 encoded
my $usercfg = cfs_read_file('user.cfg');
- if (!user_enabled($usercfg, $username)) {
+ eval { check_user_enabled($usercfg, $username); };
+ if (my $err = $@) {
sleep(2);
- die "no such user ('$username')\n"
+ die $err;
}
my $ctime = time();
$wrote_default = 1;
} elsif (defined($formats->{$k})) {
if (!$formats->{$k}) {
- $data .= "\t$k\n";
+ $data .= "\t$k\n" if $v;
} elsif ($v =~ m/^$formats->{$k}$/) {
$v = PVE::Tools::encode_text($v) if $k eq 'comment';
$data .= "\t$k $v\n";
warn "ignoring domain '$realm' - missing user attribute\n";
} elsif (($entry->{type} eq "ldap") && !$entry->{base_dn}) {
warn "ignoring domain '$realm' - missing base_dn attribute\n";
+ } elsif (($entry->{type} eq "ad") && !$entry->{domain}) {
+ warn "ignoring domain '$realm' - missing domain attribute\n";
} else {
$cfg->{$realm} = $entry;
}
my $data = '';
foreach my $user (keys %{$cfg->{users}}) {
- next if $user eq 'root@pam';
-
my $d = $cfg->{users}->{$user};
my $firstname = $d->{firstname} ? PVE::Tools::encode_text($d->{firstname}) : '';
my $lastname = $d->{lastname} ? PVE::Tools::encode_text($d->{lastname}) : '';