Clean up LDAP Sync result codes

diff --git a/include/ldap.h b/include/ldap.h
index 260bfbb40897360877d59795e04c5f72b3858c69..4a7548e84bc8d91b56018c3d59cc776eca5daed7 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -474,20 +474,17 @@ typedef struct ldapcontrol {
 
 #define LDAP_OTHER                             0x50
 
-/* Expermental result codes */
+/* Experimental result codes */
 #define LDAP_X_ERROR(n)                LDAP_RANGE((n),0x1000,0x3FFF) /* experimental */
 #define LDAP_PVT_ERROR(n)      LDAP_RANGE((n),0x4000,0xFFFF) /* private use */
 
-#define LDAP_SYNC_RESOURCES_EXHAUSTED  0x4100
-#define LDAP_SYNC_SECURITY_VIOLATION   0x4101
-#define LDAP_SYNC_INVALID_COOKIE               0x4102
-#define LDAP_SYNC_UNSUPPORTED_SCHEME   0x4103
-#define LDAP_SYNC_CLIENT_DISCONNECT            0x4104
-#define LDAP_SYNC_RELOAD_REQUIRED              0x4105
+/* for the LDAP Sync operation */
+#define LDAP_SYNC_REFRESH_REQUIRED             0x4100
 
+/* for the Assertion control */
 #define LDAP_ASSERTION_FAILED                  0x410f
 
-/* resultCode for Cancel Response */
+/* for the Cancel operation */
 #define LDAP_CANCELLED                                 0x4110
 #define LDAP_NO_SUCH_OPERATION                 0x4111
 #define LDAP_TOO_LATE                                  0x4112

diff --git a/libraries/libldap/error.c b/libraries/libldap/error.c
index 53fd8002881de8048291b661faf1761146702f84..c537d398b60ba40ab8f958cd4e8135aca6f171d5 100644 (file)
--- a/libraries/libldap/error.c
+++ b/libraries/libldap/error.c
@@ -105,15 +105,9 @@ static struct ldaperror ldap_builtin_errlist[] = {
        {LDAP_CLIENT_LOOP,                              N_("Client Loop")},
        {LDAP_REFERRAL_LIMIT_EXCEEDED,  N_("Referral Limit Exceeded")},
 
+       {LDAP_SYNC_REFRESH_REQUIRED,    N_("Content Sync Refresh Required")},
        {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")},
        {LDAP_NO_SUCH_OPERATION,                N_("No Operation to Cancel")},