X-Git-Url: https://git.proxmox.com/?p=pve-access-control.git;a=blobdiff_plain;f=PVE%2FAccessControl.pm;h=9396537d411bf908c5b7ff07571362d165d1d07c;hp=3db2bff9e5dbaaf2e4cef014279fd9583d4543b5;hb=a427cecb2b9f1cb5a527c93d3f654cb9ac879675;hpb=af4a8a8522118cfd15b0c58f81d748a9184a0ef8

diff --git a/PVE/AccessControl.pm b/PVE/AccessControl.pm
index 3db2bff..9396537 100644
--- a/PVE/AccessControl.pm
+++ b/PVE/AccessControl.pm
@@ -351,7 +351,7 @@ sub authenticate_user {
 
     if (!user_enabled($usercfg, $username)) {
 	sleep(2);
-	die "no such user ('$username')\n"
+	die "no such user ('$username')\n";
     }
 
     my $ctime = time();
@@ -899,7 +899,7 @@ sub write_domains {
 		    $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";
@@ -994,6 +994,8 @@ sub parse_domains {
 		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;
 	    }
@@ -1038,8 +1040,6 @@ sub write_user_config {
     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}) : '';