From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 11 Dec 2003 07:28:01 +0000 (+0000)
Subject: Tweak the codes
X-Git-Tag: OPENLDAP_REL_ENG_2_1_MP~213
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=552a51ca5052913bb744619ac58af9cbc701e774;p=openldap

Tweak the codes
---

diff --git a/include/ldap.h b/include/ldap.h
index 67310c9c01..bc033789ab 100644
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -211,6 +211,7 @@ typedef struct ldapcontrol {
 
 #define LDAP_SYNC_NONE					0x00
 #define LDAP_SYNC_REFRESH_ONLY			0x01
+#define LDAP_SYNC_RESERVED				0x02
 #define LDAP_SYNC_REFRESH_AND_PERSIST	0x03
 
 #define LDAP_SYNC_REFRESH_PRESENTS		0
@@ -478,16 +479,16 @@ typedef struct ldapcontrol {
  * Based on draft-ietf-ldap-c-api-xx
  * but with new (negative) codes
  */
-#define LDAP_SERVER_DOWN		(-1)
-#define LDAP_LOCAL_ERROR		(-2)
-#define LDAP_ENCODING_ERROR		(-3)
-#define LDAP_DECODING_ERROR		(-4)
-#define LDAP_TIMEOUT			(-5)
-#define LDAP_AUTH_UNKNOWN		(-6)
-#define LDAP_FILTER_ERROR		(-7)
-#define LDAP_USER_CANCELLED		(-8)
-#define LDAP_PARAM_ERROR		(-9)
-#define LDAP_NO_MEMORY			(-10)
+#define LDAP_SERVER_DOWN				(-1)
+#define LDAP_LOCAL_ERROR				(-2)
+#define LDAP_ENCODING_ERROR				(-3)
+#define LDAP_DECODING_ERROR				(-4)
+#define LDAP_TIMEOUT					(-5)
+#define LDAP_AUTH_UNKNOWN				(-6)
+#define LDAP_FILTER_ERROR				(-7)
+#define LDAP_USER_CANCELLED				(-8)
+#define LDAP_PARAM_ERROR				(-9)
+#define LDAP_NO_MEMORY					(-10)
 #define LDAP_CONNECT_ERROR				(-11)
 #define LDAP_NOT_SUPPORTED				(-12)
 #define LDAP_CONTROL_NOT_FOUND			(-13)
diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index d67b3ee8d2..7dc3b219a7 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -103,13 +103,13 @@ LDAP_BEGIN_DECL
 #define SLAP_TEXT_BUFLEN (256)
 
 /* psuedo error code indicating abandoned operation */
-#define SLAPD_ABANDON (-1)
+#define SLAPD_ABANDON (-1024)
 
 /* psuedo error code indicating disconnect */
-#define SLAPD_DISCONNECT (-2)
+#define SLAPD_DISCONNECT (-1025)
 
 /* unknown config file directive */
-#define SLAP_CONF_UNKNOWN (-2)
+#define SLAP_CONF_UNKNOWN (-1026)
 
 /* We assume "C" locale, that is US-ASCII */
 #define ASCII_SPACE(c)	( (c) == ' ' )
@@ -2016,10 +2016,10 @@ typedef struct slap_op {
 
 	char o_sync;
 	char o_sync_mode;
-#define SLAP_SYNC_NONE					(0x0)
-#define SLAP_SYNC_REFRESH				(0x1)
-#define SLAP_SYNC_PERSIST				(0x2)
-#define SLAP_SYNC_REFRESH_AND_PERSIST	(0x3)
+#define SLAP_SYNC_NONE					LDAP_SYNC_NONE
+#define SLAP_SYNC_REFRESH				LDAP_SYNC_REFRESH_ONLY
+#define SLAP_SYNC_PERSIST				LDAP_SYNC_RESERVED
+#define SLAP_SYNC_REFRESH_AND_PERSIST	LDAP_SYNC_REFRESH_AND_PERSIST
 	struct sync_cookie	o_sync_state;
 	int					o_sync_rhint;
 	struct berval		o_sync_cid;
@@ -2292,7 +2292,7 @@ typedef int (SLAP_CTRL_PARSE_FN) LDAP_P((
 	SlapReply *rs,
 	LDAPControl *ctrl ));
 
-#define SLMALLOC_SLAB_SIZE	1048576
+#define SLMALLOC_SLAB_SIZE	(1024*1024)
 
 LDAP_END_DECL