]> git.sur5r.net Git - openldap/blobdiff - libraries/libldap/error.c
Changes from HEAD for beta
[openldap] / libraries / libldap / error.c
index 464b9e5172ce3877669cec5c75db24f977d53b93..e4359eca4f1b9ac89e512b77bf371276f572b275 100644 (file)
@@ -3,6 +3,10 @@
  * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
+/*
+ * Portions Copyright (C) The Internet Society (1997)
+ * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
+ */
 
 #include "portable.h"
 
@@ -93,14 +97,14 @@ static struct ldaperror ldap_builtin_errlist[] = {
        {LDAP_CLIENT_LOOP,                              N_("Client Loop")},
        {LDAP_REFERRAL_LIMIT_EXCEEDED,  N_("Referral Limit Exceeded")},
 
-#ifdef LDAP_CLIENT_UPDATE
-       {LDAP_CUP_RESOURCES_EXHAUSTED,  N_("Client Update Resource Exhausted")},
-       {LDAP_CUP_SECURITY_VIOLATION,   N_("Client Update Security Violation")},
-       {LDAP_CUP_INVALID_COOKIE,               N_("Client Update Invalid Cookie")},
-       {LDAP_CUP_UNSUPPORTED_SCHEME,   N_("Client Update Unsupported Scheme")},
-       {LDAP_CUP_CLIENT_DISCONNECT,    N_("Client Update Client Disconnect")},
-       {LDAP_CUP_RELOAD_REQUIRED,              N_("Client Update Reload Required")},
-#endif
+       {LDAP_ASSERTION_FAILED,                 N_("Assertion Failed")},
+
+       {LDAP_SYNC_RESOURCES_EXHAUSTED, N_("Content Sync Resource Exhausted")},
+       {LDAP_SYNC_SECURITY_VIOLATION,  N_("Content Sync Security Violation")},
+       {LDAP_SYNC_INVALID_COOKIE,              N_("Content Sync Invalid Cookie")},
+       {LDAP_SYNC_UNSUPPORTED_SCHEME,  N_("Content Sync Unsupported Scheme")},
+       {LDAP_SYNC_CLIENT_DISCONNECT,   N_("Content Sync Client Disconnect")},
+       {LDAP_SYNC_RELOAD_REQUIRED,             N_("Content Sync Reload Required")},
 
 #ifdef LDAP_EXOP_X_CANCEL
        {LDAP_CANCELLED,                                N_("Cancelled")},