From: Pierangelo Masarati <ando@openldap.org>
Date: Mon, 6 Aug 2007 14:32:44 +0000 (+0000)
Subject: import fix to ITS#5075
X-Git-Tag: OPENLDAP_REL_ENG_2_3_38~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a5ad817ca8286e7b954eda7f5b91c2f40a7f14a;p=thirdparty%2Fopenldap.git

import fix to ITS#5075
---

diff --git a/CHANGES b/CHANGES
index f159b4aa9c..b9ba5492d3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,8 @@ OpenLDAP 2.3.38 Engineering
 	Fixed slapo-syncprov uninit'd vars (ITS#5048,#5049)
 	Fixed libldap ldap_add_result_entry (ITS#5056)
 	Removed lint
+	Build Environment
+		Fixed macro definition of open() in glibc 2.6 (ITS#5075)
 
 OpenLDAP 2.3.37 Release (2007/07/20)
 	Fixed slapd-glue/syncprov interaction (ITS#4623)
diff --git a/build/openldap.m4 b/build/openldap.m4
index 0900fea69e..ecdbb0b5c9 100644
--- a/build/openldap.m4
+++ b/build/openldap.m4
@@ -627,9 +627,9 @@ main()
 	}
 
 #if (DB_VERSION_MAJOR > 3) || (DB_VERSION_MINOR >= 1)
-	rc = env->open( env, NULL, flags, 0 );
+	rc = (env->open)( env, NULL, flags, 0 );
 #else
-	rc = env->open( env, NULL, NULL, flags, 0 );
+	rc = (env->open)( env, NULL, NULL, flags, 0 );
 #endif
 
 	if ( rc == 0 ) {
diff --git a/configure b/configure
index 5bc25fd668..f1e0770e31 100755
--- a/configure
+++ b/configure
@@ -35722,9 +35722,9 @@ main()
 	}
 
 #if (DB_VERSION_MAJOR > 3) || (DB_VERSION_MINOR >= 1)
-	rc = env->open( env, NULL, flags, 0 );
+	rc = (env->open)( env, NULL, flags, 0 );
 #else
-	rc = env->open( env, NULL, NULL, flags, 0 );
+	rc = (env->open)( env, NULL, NULL, flags, 0 );
 #endif
 
 	if ( rc == 0 ) {
diff --git a/servers/slapd/back-bdb/back-bdb.h b/servers/slapd/back-bdb/back-bdb.h
index 1ec19be309..2c638aed36 100644
--- a/servers/slapd/back-bdb/back-bdb.h
+++ b/servers/slapd/back-bdb/back-bdb.h
@@ -226,7 +226,7 @@ struct bdb_op_info {
 };
 
 #define	DB_OPEN(db, file, name, type, flags, mode) \
-	(db)->open(db, file, name, type, flags, mode)
+	((db)->open)(db, file, name, type, flags, mode)
 
 #if DB_VERSION_MAJOR < 4
 #define LOCK_DETECT(env,f,t,a)		lock_detect(env, f, t, a)
@@ -257,7 +257,7 @@ struct bdb_op_info {
 #if DB_VERSION_FULL >= 0x04010011
 #undef DB_OPEN
 #define	DB_OPEN(db, file, name, type, flags, mode) \
-	(db)->open(db, NULL, file, name, type, flags, mode)
+	((db)->open)(db, NULL, file, name, type, flags, mode)
 #endif
 
 #endif
diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index a571402f96..e5434d9027 100644
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -288,7 +288,7 @@ shm_retry:
 		bdb->bi_dbenv->set_shm_key( bdb->bi_dbenv, bdb->bi_shm_key );
 		flags |= DB_SYSTEM_MEM;
 	}
-	rc = bdb->bi_dbenv->open( bdb->bi_dbenv, dbhome,
+	rc = (bdb->bi_dbenv->open)( bdb->bi_dbenv, dbhome,
 			flags | do_recover, bdb->bi_dbenv_mode );
 
 	if ( rc ) {
diff --git a/servers/slapd/back-ldbm/ldbm.c b/servers/slapd/back-ldbm/ldbm.c
index e25ff5a62a..6a8dbc81da 100644
--- a/servers/slapd/back-ldbm/ldbm.c
+++ b/servers/slapd/back-ldbm/ldbm.c
@@ -298,10 +298,10 @@ DB_ENV *ldbm_initialize_env(const char *home, int dbcachesize, int *envdirok)
 	home = n2;
 #endif
 #if DB_VERSION_X >= 0x030100
-	err = env->open( env, home, envFlags, 0 );
+	err = (env->open)( env, home, envFlags, 0 );
 #else
 	/* 3.0.x requires an extra argument */
-	err = env->open( env, home, NULL, envFlags, 0 );
+	err = (env->open)( env, home, NULL, envFlags, 0 );
 #endif
 
 	if ( err != 0 ) {
@@ -380,9 +380,9 @@ ldbm_open( DB_ENV *env, char *name, int rw, int mode, int dbcachesize )
 	name = n2;
 #endif
 #if DB_VERSION_X >= 0x040111
-	err = ret->open( ret, NULL, name, NULL, DB_TYPE, rw, mode);
+	err = (ret->open)( ret, NULL, name, NULL, DB_TYPE, rw, mode);
 #else
-	err = ret->open( ret, name, NULL, DB_TYPE, rw, mode);
+	err = (ret->open)( ret, name, NULL, DB_TYPE, rw, mode);
 #endif
 
 	if ( err != 0 ) {