Ready for release

diff --git a/CHANGES b/CHANGES
index 39938ad1ac0fd9db2859b6005fbac5679745341f..11034ef271162295e9720e5a3a908ac89fceba55 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,6 @@
 OpenLDAP 2.1 Change Log
 
-OpenLDAP 2.1.17 Engineering
+OpenLDAP 2.1.17 Release
        Fixed libldap_r thread pool context bug (ITS#2404)
        Fixed libldap T.61 convert bug (ITS#2388)
        Fixed libldap h_errno bug

diff --git a/build/version.var b/build/version.var
index 6a13192a489cd72559a6654ebce8ca3020eece70..ab3a5c012fbc12a832f150a8e73e5fe6bd4590ad 100644 (file)
--- a/build/version.var
+++ b/build/version.var
@@ -7,7 +7,7 @@
 ol_package=OpenLDAP
 ol_major=2
 ol_minor=1
-ol_patch=X
-ol_api_inc=20116
-ol_api_lib=2:116:0
-ol_release_date="03-15-2003"
+ol_patch=17
+ol_api_inc=20117
+ol_api_lib=2:117:0
+ol_release_date="04-04-2003"

diff --git a/configure b/configure
index 59e03974282941b11835f72c0497e2e70514e901..ea8f12044a20bb42d2628826ac5a37fca3f959fa 100755 (executable)
--- a/configure
+++ b/configure
@@ -19115,7 +19115,7 @@ else
 #      define DB_VERSION_MINOR 0
 #endif
 
-/* require 4.0 or later */
+/* require 4.1 or later */
 #if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 1)
        __db_version_compat
 #endif

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 538f3721ce0acc141f71e141c23bf2706893377e..b7cfdf9b10117ea1699412a5f6eea7424f180894 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -881,7 +881,7 @@ void connection_done( Connection *c )
 static void *
 connection_operation( void *ctx, void *arg_v )
 {
-       int rc;
+       int rc = SLAPD_DISCONNECT;
        Operation *op = arg_v;
        ber_tag_t tag = op->o_tag;
 #ifdef SLAPD_MONITOR

diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication
index d8d00599221baede41395126e56186ef1c91a90b..f5bf76519a357ee6540ab8c3bb1dd163a2e345d7 100755 (executable)
--- a/tests/scripts/test007-replication
+++ b/tests/scripts/test007-replication
@@ -128,6 +128,7 @@ drink: Iced Tea
 drink: Mad Dog 20/20
 
 dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US
+changetype: modify
 delete: member
 member: cn=James A Jones 2, ou=Information Technology Division, ou=People, o=University of Michigan, c=US
 member: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US