Mailinglist Archive: yast-commit (1224 mails)

[rhafer@xxxxxxxxxxxxxxxx]

Author: rhafer
Date: Thu Nov 12 17:09:53 2009
New Revision: 59502

URL: http://svn.opensuse.org/viewcvs/yast?rev=59502&view=rev
Log:
Ignore "already exists" error during Entry creation

Modified:
    branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm

Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm?rev=59502&r1=59501&r2=59502&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm (original)
+++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm Thu Nov 12 
17:09:53 2009
@@ -450,13 +450,19 @@
                 my $ldapERR = SCR->Read(".ldap.error");
                 y2error("Can not add base entry.");
                 y2error( $ldapERR->{'code'}." : ".$ldapERR->{'msg'});
-                return 0;
+                if ( $ldapERR->{'code'} != 68 ) # already exists
+                {
+                    return 0;
+                }
             }
             if (! SCR->Write(".ldap.add", { dn => $syncreplaccount->{'syncdn'} 
} , $syncaccountentry)) {
                 my $ldapERR = SCR->Read(".ldap.error");
                 y2error("Can not add syncaccount entry.");
                 y2error( $ldapERR->{'code'}." : ".$ldapERR->{'msg'});
-                return 0;
+                if ( $ldapERR->{'code'} != 68 ) # already exists */
+                {
+                    return 0;
+                }
             }
             y2milestone("sync entries added");
         }

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx