Ready for 2.2beta

diff --git a/ANNOUNCEMENT b/ANNOUNCEMENT
index 74f9324ed4d3af66369e6c4e192a2c84199606ad..af86e91bf789852a79a07f64da86af5d1eaec619 100644 (file)
--- a/ANNOUNCEMENT
+++ b/ANNOUNCEMENT
@@ -1,7 +1,7 @@
 A N N O U N C E M E N T -- OpenLDAP 2.1
 
     The OpenLDAP Project is pleased to announce the availability
-    of OpenLDAP Software 2.1, a suite of the Lightweight Directory
+    of OpenLDAP Software 2.2, a suite of the Lightweight Directory
     Access Protocol (v3) servers, clients, utilities, and
     development tools.
 

diff --git a/build/version.var b/build/version.var
index c048c53cc597453e5975630e4f8c5df2c545db5a..4027de617ab4a4927acec7e7916a720979ce1b9a 100644 (file)
--- a/build/version.var
+++ b/build/version.var
@@ -7,7 +7,7 @@
 ol_package=OpenLDAP
 ol_major=2
 ol_minor=2
-ol_patch=X
-ol_api_inc=20200
-ol_api_lib=2:200:0
-ol_release_date="05/31/2003"
+ol_patch=1beta
+ol_api_inc=20201
+ol_api_lib=2:201:0
+ol_release_date="09/19/2003"

diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index baf0d1b1d98987af7eecc413c1ad4068046db0e7..a4c48fa2799d7386c3662525116864411cb1ad9c 100644 (file)
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
@@ -67,7 +67,7 @@ int ldap_int_sasl_init( void )
        if ( ((rc >> 16) != ((SASL_VERSION_MAJOR << 8)|SASL_VERSION_MINOR)) ||
                (rc & 0xffff) < SASL_VERSION_STEP) {
                char version[sizeof("xxx.xxx.xxxxx")];
-               sprintf( version, "%d.%d.%d", rc >> 24, rc >> 16 * 0xff,
+               sprintf( version, "%u.%d.%d", (unsigned)rc >> 24, (rc >> 16) & 0xff,
                        rc & 0xffff );
 
 #ifdef NEW_LOGGING

diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index 2a7806194ad1a6d02e9679900d1d3510626633d7..8bdecdeef3236edca1ca7b830055cc15402c276a 100644 (file)
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -73,13 +73,13 @@ static char *proxy_authz_extops[] = {
 
 static struct slap_control control_defs[] = {
        { LDAP_CONTROL_ASSERT,
-               SLAP_CTRL_ACCESS, NULL,
+               SLAP_CTRL_HIDE|SLAP_CTRL_ACCESS, NULL,
                parseAssert, LDAP_SLIST_ENTRY_INITIALIZER(next) },
        { LDAP_CONTROL_PRE_READ,
-               SLAP_CTRL_DELETE|SLAP_CTRL_MODIFY|SLAP_CTRL_RENAME, NULL,
+               SLAP_CTRL_HIDE|SLAP_CTRL_DELETE|SLAP_CTRL_MODIFY|SLAP_CTRL_RENAME, NULL,
                parsePreRead, LDAP_SLIST_ENTRY_INITIALIZER(next) },
        { LDAP_CONTROL_POST_READ,
-               SLAP_CTRL_ADD|SLAP_CTRL_MODIFY|SLAP_CTRL_RENAME, NULL,
+               SLAP_CTRL_HIDE|SLAP_CTRL_ADD|SLAP_CTRL_MODIFY|SLAP_CTRL_RENAME, NULL,
                parsePostRead, LDAP_SLIST_ENTRY_INITIALIZER(next) },
        { LDAP_CONTROL_VALUESRETURNFILTER,
                SLAP_CTRL_SEARCH, NULL,
@@ -111,7 +111,7 @@ static struct slap_control control_defs[] = {
                SLAP_CTRL_HIDE|SLAP_CTRL_SEARCH, NULL,
                parseLDAPsync, LDAP_SLIST_ENTRY_INITIALIZER(next) },
        { LDAP_CONTROL_MODIFY_INCREMENT,
-               SLAP_CTRL_MODIFY, NULL,
+               SLAP_CTRL_HIDE|SLAP_CTRL_MODIFY, NULL,
                parseModifyIncrement, LDAP_SLIST_ENTRY_INITIALIZER(next) },
        { LDAP_CONTROL_MANAGEDSAIT,
                SLAP_CTRL_ACCESS, NULL,

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index 819c92e3bdffb01d0127d641048c3385d356666e..b2bde3fcfa130b6c40d8a1d989739b25bcff25cb 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -30,7 +30,9 @@ static struct berval supportedFeatures[] = {
        BER_BVC(LDAP_FEATURE_ABSOLUTE_FILTERS), /* (&) and (|) search filters */
        BER_BVC(LDAP_FEATURE_LANGUAGE_TAG_OPTIONS), /* Language Tag Options */
        BER_BVC(LDAP_FEATURE_LANGUAGE_RANGE_OPTIONS), /* Language Range Options */
+#ifdef LDAP_DEVEL
        BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT), /* Modify/increment */
+#endif
        {0,NULL}
 };
 

diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index 527e95cda90308bfdbe1eb1a1ad30aa886553931..4f2a08ef43a0b46ac556a1458ce85062eaace159 100644 (file)
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -735,7 +735,7 @@ slap_sasl_authorize(
                "slap_sasl_authorize: conn %d authcid=\"%s\" authzid=\"%s\"\n",
                conn ? conn->c_connid : -1, auth_identity, requested_user);
 #else
-       Debug( LDAP_DEBUG_ARGS, "SASL Authorize [conn=%ld]: "
+       Debug( LDAP_DEBUG_ARGS, "SASL proxy authorize [conn=%ld]: "
                "authcid=\"%s\" authzid=\"%s\"\n",
                conn ? conn->c_connid : -1, auth_identity, requested_user );
 #endif
@@ -763,11 +763,12 @@ slap_sasl_authorize(
        if ( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
                LDAP_LOG( TRANSPORT, INFO, 
-                       "slap_sasl_authorize: conn %ld  authorization disallowed (%d)\n",
+                       "slap_sasl_authorize: conn %ld "
+                       "proxy authorization disallowed (%d)\n",
                        (long)(conn ? conn->c_connid : -1), rc, 0 );
 #else
-               Debug( LDAP_DEBUG_TRACE, "SASL Authorize [conn=%ld]: "
-                       " authorization disallowed (%d)\n",
+               Debug( LDAP_DEBUG_TRACE, "SASL Proxy Authorize [conn=%ld]: "
+                       "proxy authorization disallowed (%d)\n",
                        (long) (conn ? conn->c_connid : -1), rc, 0 );
 #endif
 
@@ -787,11 +788,11 @@ ok:
 
 #ifdef NEW_LOGGING
        LDAP_LOG( TRANSPORT, ENTRY, 
-               "slap_sasl_authorize: conn %d authorization allowed\n",
+               "slap_sasl_authorize: conn %d proxy authorization allowed\n",
                (long)(conn ? conn->c_connid : -1), 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "SASL Authorize [conn=%ld]: "
-               " authorization allowed\n",
+               " proxy authorization allowed\n",
                (long) (conn ? conn->c_connid : -1), 0, 0 );
 #endif
        return SASL_OK;
@@ -878,11 +879,12 @@ slap_sasl_authorize(
        if( rc ) {
 #ifdef NEW_LOGGING
                LDAP_LOG( TRANSPORT, INFO, 
-                       "slap_sasl_authorize: conn %ld  authorization disallowed (%d)\n",
+                       "slap_sasl_authorize: conn %ld "
+                       "proxy authorization disallowed (%d)\n",
                        (long)(conn ? conn->c_connid : -1), rc, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE, "SASL Authorize [conn=%ld]: "
-                       " authorization disallowed (%d)\n",
+                       "proxy authorization disallowed (%d)\n",
                        (long) (conn ? conn->c_connid : -1), rc, 0 );
 #endif
 
@@ -895,7 +897,7 @@ slap_sasl_authorize(
 ok:
 #ifdef NEW_LOGGING
        LDAP_LOG( TRANSPORT, RESULTS, 
-               "slap_sasl_authorize: conn %d authorization allowed\n",
+               "slap_sasl_authorize: conn %d proxy authorization allowed\n",
           (long)(conn ? conn->c_connid : -1 ), 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "SASL Authorize [conn=%ld]: "
@@ -975,7 +977,7 @@ int slap_sasl_init( void )
        if ( ((rc >> 16) != ((SASL_VERSION_MAJOR << 8)|SASL_VERSION_MINOR)) ||
                (rc & 0xffff) < SASL_VERSION_STEP) {
                char version[sizeof("xxx.xxx.xxxxx")];
-               sprintf( version, "%d.%d.%d", rc >> 24, rc >> 16 & 0xff,
+               sprintf( version, "%u.%d.%d", (unsigned)rc >> 24, (rc >> 16) & 0xff,
                        rc & 0xffff );
 #ifdef NEW_LOGGING
                LDAP_LOG( TRANSPORT, INFO,