[yast-commit] r67975 - in /trunk/dns-server: package/yast2-dns-server.changes src/DnsZones.pm

20 Apr 2012

Author: locilka
Date: Fri Apr 20 16:19:54 2012
New Revision: 67975

URL: http://svn.opensuse.org/viewcvs/yast?rev=67975&view=rev
Log:
- Fixed removing RRs from LDAP when they share the same LDAP
  object with another non-deleted RRs (BNC#755592).


Modified:
    trunk/dns-server/package/yast2-dns-server.changes
    trunk/dns-server/src/DnsZones.pm

Modified: trunk/dns-server/package/yast2-dns-server.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/package/yast2-dns-server.changes?rev=67975&r1=67974&r2=67975&view=diff
==============================================================================

--- trunk/dns-server/package/yast2-dns-server.changes (original)
+++ trunk/dns-server/package/yast2-dns-server.changes Fri Apr 20 16:19:54 2012
@@ -1,4 +1,10 @@
 ------------------------------------------------------------------
+Fri Apr 20 16:16:11 CEST 2012 - locilka@suse.com
+
+- Fixed removing RRs from LDAP when they share the same LDAP
+  object with another non-deleted RRs (BNC#755592).
+
+------------------------------------------------------------------
 Tue Apr 17 16:53:59 CEST 2012 - locilka@suse.com
 
 - Triggering the global "modified" flag while adding/modifying

Modified: trunk/dns-server/src/DnsZones.pm
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/DnsZones.pm?rev=67975&r1=67974&r2=67975&view=diff
==============================================================================
--- trunk/dns-server/src/DnsZones.pm (original)
+++ trunk/dns-server/src/DnsZones.pm Fri Apr 20 16:19:54 2012
@@ -33,6 +33,7 @@
 
 my $zone_base_config_dn = "";
 
+my $LDAP_RECORD = 'Record';
 
 YaST::YCP::Import ("SCR");
 use DnsTsigKeys;
@@ -470,6 +471,11 @@
 
 # LDAP data
 
+# @param string record type
+sub LDAPRecordString {
+    return drunkCamelType (shift).$LDAP_RECORD;
+}
+
 BEGIN { $TYPEINFO{ZoneReadLdap} = ["function", [ "map", "any", "any" ], "string", "string" ]; }
 sub ZoneReadLdap {
     my $self = shift;
@@ -506,7 +512,7 @@
     my %zonemap = %{$found[0] || {}};
 
     my $serial = $self->UpdateSerial ("");
-    my @soa_str_lst = @{$zonemap{"sOARecord"}|| ["@ root $serial 3H 1H 1W 1D"]};
+    my @soa_str_lst = @{$zonemap{LDAPRecordString('SOA')}|| ["@ root $serial 3H 1H 1W 1D"]};
 
     my $soa_str = $soa_str_lst[0];
     my @soa_lst = split (" ", $soa_str);
@@ -557,7 +563,7 @@
 
 	foreach my $rec_type (@all_rec_types)
 	{
-	    my $value_key = $rec_type."Record";
+	    my $value_key = $rec_type.$LDAP_RECORD;
 	    my @values = @{$record{$value_key} || []};
 	    foreach my $value (@values)
 	    {
@@ -574,6 +580,41 @@
     return \%ret;
 }
 
+sub FillUpTmpLDAPRecords {
+    my $ref_found = shift;
+
+    my ($ldap_key, $record_key);
+    my $ldap_records = {};
+
+    foreach my $l_record (@{$$ref_found}) {
+	$ldap_key = $l_record->{'relativeDomainName'}[0];
+	$ldap_records->{$ldap_key} = [] if not defined $ldap_records->{$ldap_key};
+	foreach $record_key (keys %{$l_record}) {
+	    push @{$ldap_records->{$ldap_key}}, $record_key if ($record_key =~ /^.*$LDAP_RECORD$/);
+	}
+    }
+
+    return $ldap_records;
+}
+
+sub MarkRemovedRecords {
+    my $ref_ldap_record = shift;
+    my $ref_relative_domain = shift;
+    my $ref_all_records = shift;
+
+    # Record is currently in LDAP
+    if (defined $$ref_all_records->{$$ref_relative_domain}) {
+	# All record types in relative domain
+	foreach my $recordtype (@{$$ref_all_records->{$$ref_relative_domain}}) {
+	    # The new record does not contain such record type (thus it's removed)
+	    if (not defined $$ref_ldap_record{$recordtype}) {
+		$$ref_ldap_record{$recordtype} = [];
+		y2milestone ("Record ".$recordtype." has been removed from ".$$ref_relative_domain." object");
+	    }
+	}
+    }
+}
+
 BEGIN { $TYPEINFO{ZoneFileWriteLdap} = ["function", "boolean", [ "map", "any", "any"]];}
 sub ZoneFileWriteLdap {
     my $self = shift;
@@ -611,16 +652,16 @@
 	"relativeDomainName" => ["@"],
 	"dNSTTL" => [DnsRoutines->NormalizeTime ($zone_map{"ttl"} || "2D")],
 	"dNSClass" => ["IN"],
-	"sOARecord" => $soa_record,
+	LDAPRecordString('SOA') => $soa_record,
     );
 
     my @current_records = grep {
 	my %r = %{$_};
-	$r{"key"} eq "@" || $r{"key"} eq $zone . "."
+	$r{"key"} eq "@" || $r{"key"} eq $zone."."
     } @records;
 
     foreach my $rec_ref (@current_records) {
-	my $type = lc ($rec_ref->{"type"}) . "record";
+	my $type = LDAPRecordString($rec_ref->{"type"});
 	my @cur_vals = @{$ldap_record{$type} || []};
 	push @cur_vals, $rec_ref->{"value"};
 	$ldap_record{$type} = \@cur_vals;
@@ -639,15 +680,24 @@
     );
 
     my $found_ref = SCR->Read (".ldap.search", \%ldap_query);
+    y2debug ("Base record: ".Dumper($found_ref));
+
+    my $ldap_records = FillUpTmpLDAPRecords(\$found_ref);
+
+    # Some (sub)records have been removed but the LDAP record have to stay
+    foreach my $r ('@', $zone.'.') {
+	MarkRemovedRecords (\%ldap_record, \$r, \$ldap_records);
+    }
+    y2debug ("New base record: ".Dumper(\%ldap_record));
 
     if (scalar (@{$found_ref || []}) == 0)
     {
-	y2milestone ("Creating new record");
+	y2milestone ("Creating new zone record");
 	SCR->Write (".ldap.add", \%ldap_cmd, \%ldap_record);
     }
     else
     {
-	y2milestone ("Modifying existing record");
+	y2milestone ("Modifying existing zone record");
 	delete $ldap_record{"objectClass"}; # objectclass can be changed by mail-server
 	SCR->Write (".ldap.modify", \%ldap_cmd, \%ldap_record);
     }
@@ -656,7 +706,9 @@
 	my %r = %{$_};
 	$r{"key"}
     } @records;
+    # Never delete the base entry
     push @all_records, "@";
+
     # the search config map
     %ldap_query = (
         "base_dn" => $zone_dn,
@@ -668,13 +720,16 @@
     $found_ref = SCR->Read (".ldap.search", \%ldap_query) || [];
 
     my @found = @{$found_ref};
-
     @found = map {
 	my @l = @{$_->{"relativeDomainName"}};
 	$l[0];
     } @found;
 
-   #remove removed entries
+    $ldap_records = FillUpTmpLDAPRecords(\$found_ref);
+    y2debug ("Records currently in LDAP: ".Dumper($ldap_records));
+    y2debug ("New state of records: ".Dumper(\@records));
+
+    # Delete removed entries (only fully removed entries will be deleted)
     my @deleted = grep {
 	my $current = $_;
 	my @equiv = grep {
@@ -716,12 +771,16 @@
 	} @records;
 
 	foreach my $rec_ref (@current_records) {
-	    my $type = drunkCamelType ($rec_ref->{"type"})."Record";
+	    my $type = LDAPRecordString($rec_ref->{"type"});
 	    my @cur_vals = @{$ldap_record{$type} || []};
 	    push @cur_vals, $rec_ref->{"value"};
 	    $ldap_record{$type} = \@cur_vals;
 	}
 
+	# Some (sub)records have been removed but the LDAP record have to stay
+	MarkRemovedRecords (\%ldap_record, \$r, \$ldap_records);
+	y2debug ("New record: ".Dumper(\%ldap_record));
+
 	# the search config map - to choose add or modify
 	my %ldap_query = (
 	    "base_dn" => $rec_dn,

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

[yast-commit] r67975 - in /trunk/dns-server: package/yast2-dns-server.changes src/DnsZones.pm

locilka＠svn2.opensuse.org