Enhanced checking for errors while writing to LDAP

- BNC #768708
yast · Nov 9, 2012 · 293cc7d · 293cc7d
1 parent 26b330a
commit 293cc7d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/src/DnsServer.pm b/src/DnsServer.pm
@@ -402,7 +402,11 @@ sub SaveGlobals {
 	    my %zone = %{$_};
 	    $zone{"zone"};
 	} @zones;
-	DnsZones->ZonesDeleteLdap (\@zone_names);
+
+	unless (DnsZones->ZonesDeleteLdap (\@zone_names)) {
+	    y2error ("Cannot delete selected zones");
+	    return 0;
+	}
     }
 
     # delete all removed options

diff --git a/src/DnsZones.pm b/src/DnsZones.pm
@@ -706,6 +706,7 @@ sub ZoneFileWriteLdap {
     unless ($ldap_write) {
         y2error("LDAP Error (write): ".Ldap->LDAPError());
         Ldap->LDAPErrorMessage('write', Ldap->LDAPError());
+        return 0;
     }
 
     my @all_records = map {
@@ -753,6 +754,7 @@ sub ZoneFileWriteLdap {
     unless ($ldap_write) {
         y2error("LDAP Error (delete): ".Ldap->LDAPError());
         Ldap->LDAPErrorMessage('write', Ldap->LDAPError());
+        return 0;
     }
 
     # write all the other records
@@ -820,6 +822,7 @@ sub ZoneFileWriteLdap {
     unless ($ldap_write) {
         y2error("LDAP Error (write): ".Ldap->LDAPError());
         Ldap->LDAPErrorMessage('write', Ldap->LDAPError());
+        return 0;
     }
 
     return $ldap_write;
@@ -839,14 +842,24 @@ sub ZonesDeleteLdap {
 	@check_zones == 0;
     } @current_zones_in_ldap;
 
+    my $ldap_write = 1;
+
     foreach my $z (@zones_to_delete) {
 	y2milestone ("Removing zone $z from LDAP");
 	my %request = (
 	    "dn" => "zoneName=$z,$zone_base_config_dn",
 	    "subtree" => 1,
 	);
-	SCR->Write (".ldap.delete", \%request);
+	$ldap_write = SCR->Write (".ldap.delete", \%request);
+
+	unless ($ldap_write) {
+	    y2error("LDAP Error (write): ".Ldap->LDAPError());
+	    Ldap->LDAPErrorMessage('write', Ldap->LDAPError());
+	    last;
+	}
     }
+
+    return $ldap_write;
 }
 
 BEGIN{ $TYPEINFO{ZonesListLdap} = ["function", ["list", "string"]];}