proxmox-mirrors/pve-access-control
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-access-control synced 2025-08-15 13:48:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

allow to pass emtpy strings to delete settings

Browse Source
This commit is contained in:
Dietmar Maurer 2012-01-13 09:42:53 +01:00
parent af4a8a8522
commit 0c1563637a
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
PVE/API2/Domains.pm
View File

@ -146,12 +146,15 @@ __PACKAGE__->register_method ({
foreach my $p (keys %$param) { foreach my $p (keys %$param) {
next if $p eq 'realm'; next if $p eq 'realm';
$cfg->{$realm}->{$p} = $param->{$p}; $cfg->{$realm}->{$p} = $param->{$p} if $param->{$p};
} }
# port 0 ==> use default # port 0 ==> use default
if (defined($param->{port}) && !$param->{port}) { # server2 == '' ===> delete server2
delete $cfg->{$realm}->{port}; for my $p (qw(port server2)) {
if (defined($param->{$p}) && !$param->{$p}) {
delete $cfg->{$realm}->{$p};
}
} }
cfs_write_file($domainconfigfile, $cfg); cfs_write_file($domainconfigfile, $cfg);
@ -247,12 +250,11 @@ __PACKAGE__->register_method ({
} }
foreach my $p (keys %$param) { foreach my $p (keys %$param) {
if ($param->{$p}) {
$cfg->{$realm}->{$p} = $param->{$p}; $cfg->{$realm}->{$p} = $param->{$p};
} else {
delete $cfg->{$realm}->{$p};
} }
# port 0 ==> use default
if (defined($param->{port}) && !$param->{port}) {
delete $cfg->{$realm}->{port};
} }
cfs_write_file($domainconfigfile, $cfg); cfs_write_file($domainconfigfile, $cfg);

4
PVE/AccessControl.pm
View File

@ -899,7 +899,7 @@ sub write_domains {
$wrote_default = 1; $wrote_default = 1;
} elsif (defined($formats->{$k})) { } elsif (defined($formats->{$k})) {
if (!$formats->{$k}) { if (!$formats->{$k}) {
$data .= "\t$k\n"; $data .= "\t$k\n" if $v;
} elsif ($v =~ m/^$formats->{$k}$/) { } elsif ($v =~ m/^$formats->{$k}$/) {
$v = PVE::Tools::encode_text($v) if $k eq 'comment'; $v = PVE::Tools::encode_text($v) if $k eq 'comment';
$data .= "\t$k $v\n"; $data .= "\t$k $v\n";
@ -994,6 +994,8 @@ sub parse_domains {
warn "ignoring domain '$realm' - missing user attribute\n"; warn "ignoring domain '$realm' - missing user attribute\n";
} elsif (($entry->{type} eq "ldap") && !$entry->{base_dn}) { } elsif (($entry->{type} eq "ldap") && !$entry->{base_dn}) {
warn "ignoring domain '$realm' - missing base_dn attribute\n"; 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 { } else {
$cfg->{$realm} = $entry; $cfg->{$realm} = $entry;
} }