ius/mailAdmin: comparison account.pm

equal deleted inserted replaced

-:e8285fb4fb63
+:430b3ecdbbf8
 }
 if ( defined $Cf->aclgroups ) {
 my $ag = $Cf->aclgroups;
+my $lag = $e->get_value(AT_ACLGROUPS);
+# groups should be supplied with leading '$' for consistency with
+# dovecots imap acl, but should not be saved in ldap with it!
+$ag =~ s/(^|,[+-]?)\K\$//g;
 if ( $ag =~ /(^|,\s*)[+-]/ ) {
 my %x;
-@x{ split /,/, $e->get_value(AT_ACLGROUPS) } = ();
+@x{ split /,/, $lag } = ();
 for ( split /,/, $ag ) {
 if (s/^-//) {
 delete $x{$_};
 } else {
 s/^\+//;
 }
 if ($ag) {
 $e->replace( (AT_ACLGROUPS) => $ag );
 } else {
-$e->delete( AT_ACLGROUPS );
+$e->delete( AT_ACLGROUPS ) if $lag;
 }
 $modified++;
 }
 if ( my $a = $Cf->primary ) {
 my $cn   = join( ", ", $e->get_value("cn") );
 my $mr   = $e->get_value(AT_PRIMARYADDRESS) || "";                  # ??
 my $ml   = join( ", ", $e->get_value(AT_ADDRESS) ) || "";           # ??
 my $mg   = join( ", ", $e->get_value(AT_GROUP) ) || "";             # ??
 my $forw = join( ", ", $e->get_value(AT_FORWARDINGADDRESS) ) || "";
-my $ag   = $e->get_value(AT_ACLGROUPS);
+my $ag   = join ',$', split /,/, $e->get_value(AT_ACLGROUPS);
+$ag = "\$$ag" if $ag;
 print "$uid: $cn <$mr>";
 #if (($e->get_value("iusRestrictedMail")||"") eq "TRUE") {
 #print " INTERNAL";