From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 17 Dec 2003 21:09:28 +0000 (+0000)
Subject: Clean up LDAP Sync result codes
X-Git-Tag: OPENLDAP_REL_ENG_2_1_MP~160
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=46053f84a6a2fefdf1f9abf4d3746cf803c23482;p=openldap

Clean up LDAP Sync result codes
---

diff --git a/include/ldap.h b/include/ldap.h
index 260bfbb408..4a7548e84b 100644
--- 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 53fd800288..c537d398b6 100644
--- 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")},