From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 29 Nov 2003 11:09:52 +0000 (+0000)
Subject: naming cleanup && more leaks fixed
X-Git-Tag: OPENLDAP_REL_ENG_2_1_MP~348
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=044d46aa29334d7a77ed9ac369792b5303f5dc16;p=openldap

naming cleanup && more leaks fixed
---

diff --git a/libraries/librewrite/ldapmap.c b/libraries/librewrite/ldapmap.c
index 07e04bccf2..68b70d35eb 100644
--- a/libraries/librewrite/ldapmap.c
+++ b/libraries/librewrite/ldapmap.c
@@ -31,21 +31,21 @@
  * LDAP map data structure
  */
 struct ldap_map_data {
-	char                           *url;
-	LDAPURLDesc                    *lud;
-	int                             attrsonly;
-	char                           *binddn;
-	char                           *bindpw;
+	char                           *lm_url;
+	LDAPURLDesc                    *lm_lud;
+	int                             lm_attrsonly;
+	char                           *lm_binddn;
+	char                           *lm_bindpw;
 
 #define MAP_LDAP_EVERYTIME		0x00
 #define MAP_LDAP_NOW			0x01
 #define MAP_LDAP_LATER			0x02
-	int                             when;
+	int                             lm_when;
 
-	LDAP                           *ld;
+	LDAP                           *lm_ld;
 
 #ifdef USE_REWRITE_LDAP_PVT_THREADS
-	ldap_pvt_thread_mutex_t         mutex;
+	ldap_pvt_thread_mutex_t         lm_mutex;
 #endif /* USE_REWRITE_LDAP_PVT_THREADS */
 };
 
@@ -56,24 +56,24 @@ map_ldap_free(
 {
 	assert( data != NULL );
 
-	if ( data->url != NULL ) {
-		free( data->url );
+	if ( data->lm_url != NULL ) {
+		free( data->lm_url );
 	}
 
-	if ( data->lud != NULL ) {
-		ldap_free_urldesc( data->lud );
+	if ( data->lm_lud != NULL ) {
+		ldap_free_urldesc( data->lm_lud );
 	}
 
-	if ( data->binddn != NULL ) {
-		free( data->binddn );
+	if ( data->lm_binddn != NULL ) {
+		free( data->lm_binddn );
 	}
 
-	if ( data->bindpw != NULL ) {
-		free( data->bindpw );
+	if ( data->lm_bindpw != NULL ) {
+		free( data->lm_bindpw );
 	}
 
-	if ( data->when != MAP_LDAP_EVERYTIME && data->ld != NULL ) {
-		ldap_unbind_s( data->ld );
+	if ( data->lm_when != MAP_LDAP_EVERYTIME && data->lm_ld != NULL ) {
+		ldap_unbind_s( data->lm_ld );
 	}
 
 	free( data );
@@ -108,13 +108,13 @@ map_ldap_parse(
 		return NULL;
 	}
 
-	data->url = strdup( argv[ 0 ] );
-	if ( data->url == NULL ) {
+	data->lm_url = strdup( argv[ 0 ] );
+	if ( data->lm_url == NULL ) {
 		map_ldap_free( data );
 		return NULL;
 	}
 	
-	if ( ldap_url_parse( argv[ 0 ], &data->lud ) != REWRITE_SUCCESS ) {
+	if ( ldap_url_parse( argv[ 0 ], &data->lm_lud ) != REWRITE_SUCCESS ) {
 		Debug( LDAP_DEBUG_ANY,
 				"[%s:%d] illegal URI '%s'\n",
 				fname, lineno, argv[ 0 ] );
@@ -122,14 +122,14 @@ map_ldap_parse(
 		return NULL;
 	}
 
-	p = strchr( data->url, '/' );
+	p = strchr( data->lm_url, '/' );
 	assert( p[ 1 ] == '/' );
 	if ( ( p = strchr( p + 2, '/' ) ) != NULL ) {
 		p[ 0 ] = '\0';
 	}
 
-	if ( strcasecmp( data->lud->lud_attrs[ 0 ], "dn" ) == 0 ) {
-		data->attrsonly = 1;
+	if ( strcasecmp( data->lm_lud->lud_attrs[ 0 ], "dn" ) == 0 ) {
+		data->lm_attrsonly = 1;
 	}
 	      
 	for ( argc--, argv++; argc > 0; argc--, argv++ ) {
@@ -148,19 +148,19 @@ map_ldap_parse(
 				l = strlen( p );
 			}
 			
-			data->binddn = strdup( p );			
-			if ( data->binddn == NULL ) {
+			data->lm_binddn = strdup( p );			
+			if ( data->lm_binddn == NULL ) {
 				map_ldap_free( data );
 				return NULL;
 			}
 
-			if ( data->binddn[ l ] == '\"' 
-					|| data->binddn[ l ] == '\'' ) {
-				data->binddn[ l ] = '\0';
+			if ( data->lm_binddn[ l ] == '\"' 
+					|| data->lm_binddn[ l ] == '\'' ) {
+				data->lm_binddn[ l ] = '\0';
 			}
 		} else if ( strncasecmp( argv[ 0 ], "bindpw=", 7 ) == 0 ) {
-			data->bindpw = strdup( argv[ 2 ] + 7 );
-			if ( data->bindpw == NULL ) {
+			data->lm_bindpw = strdup( argv[ 2 ] + 7 );
+			if ( data->lm_bindpw == NULL ) {
 				map_ldap_free( data );
 				return NULL;
 			}
@@ -170,30 +170,30 @@ map_ldap_parse(
 			if ( strcasecmp( p, "now" ) == 0 ) {
 				int rc;
 				
-				data->when = MAP_LDAP_NOW;
+				data->lm_when = MAP_LDAP_NOW;
 				
 				/*
 				 * Init LDAP handler ...
 				 */
-				rc = ldap_initialize( &data->ld, data->url );
+				rc = ldap_initialize( &data->lm_ld, data->lm_url );
 				if ( rc != LDAP_SUCCESS ) {
 					map_ldap_free( data );
 					return NULL;
 				}
 
 #ifdef USE_REWRITE_LDAP_PVT_THREADS
-				ldap_pvt_thread_mutex_init( &data->mutex );
+				ldap_pvt_thread_mutex_init( &data->lm_mutex );
 #endif /* USE_REWRITE_LDAP_PVT_THREADS */
 
 			} else if ( strcasecmp( p, "later" ) == 0 ) {
-				data->when = MAP_LDAP_LATER;
+				data->lm_when = MAP_LDAP_LATER;
 
 #ifdef USE_REWRITE_LDAP_PVT_THREADS
-				ldap_pvt_thread_mutex_init( &data->mutex );
+				ldap_pvt_thread_mutex_init( &data->lm_mutex );
 #endif /* USE_REWRITE_LDAP_PVT_THREADS */
 
 			} else if ( strcasecmp( p, "everytime" ) == 0 ) {
-				data->when = MAP_LDAP_EVERYTIME;
+				data->lm_when = MAP_LDAP_EVERYTIME;
 			} else {
 				/* ignore ... */
 			}
@@ -216,7 +216,7 @@ map_ldap_apply(
 	char **values;
 	int rc;
 	struct ldap_map_data *data = ( struct ldap_map_data * )map->lb_private;
-	LDAPURLDesc *lud = data->lud;
+	LDAPURLDesc *lud = data->lm_lud;
 	
 	int first_try = 1;
 
@@ -229,20 +229,21 @@ map_ldap_apply(
 	val->bv_val = NULL;
 	val->bv_len = 0;
 
-	if ( data->when == MAP_LDAP_EVERYTIME ) {
-		rc = ldap_initialize( &ld, data->url );
+	if ( data->lm_when == MAP_LDAP_EVERYTIME ) {
+		rc = ldap_initialize( &ld, data->lm_url );
+
 	} else {
 #ifdef USE_REWRITE_LDAP_PVT_THREADS
-		ldap_pvt_thread_mutex_lock( &data->mutex );
+		ldap_pvt_thread_mutex_lock( &data->lm_mutex );
 #endif /* USE_REWRITE_LDAP_PVT_THREADS */
 
 		rc = LDAP_SUCCESS;
 
-		if ( data->when == MAP_LDAP_LATER && data->ld == NULL ) {
-			rc = ldap_initialize( &data->ld, data->url );
+		if ( data->lm_when == MAP_LDAP_LATER && data->lm_ld == NULL ) {
+			rc = ldap_initialize( &data->lm_ld, data->lm_url );
 		}
 		
-		ld = data->ld;
+		ld = data->lm_ld;
 	}
 
 	if ( rc != LDAP_SUCCESS ) {
@@ -251,15 +252,16 @@ map_ldap_apply(
 	}
 
 do_bind:;
-	if ( data->binddn != NULL ) {
-		rc = ldap_simple_bind_s( ld, data->binddn, data->bindpw );
+	if ( data->lm_binddn != NULL ) {
+		rc = ldap_simple_bind_s( ld, data->lm_binddn, data->lm_bindpw );
 		if ( rc == LDAP_SERVER_DOWN && first_try ) {
 			first_try = 0;
-			if ( ldap_initialize( &ld, data->url ) != LDAP_SUCCESS ) {
+			if ( ldap_initialize( &ld, data->lm_url ) != LDAP_SUCCESS ) {
 				rc = REWRITE_ERR;
 				goto rc_return;
 			}
 			goto do_bind;
+
 		} else if ( rc != REWRITE_SUCCESS ) {
 			rc = REWRITE_ERR;
 			goto rc_return;
@@ -267,14 +269,15 @@ do_bind:;
 	}
 
 	rc = ldap_search_s( ld, lud->lud_dn, lud->lud_scope, ( char * )filter,
-			lud->lud_attrs, data->attrsonly, &res );
+			lud->lud_attrs, data->lm_attrsonly, &res );
 	if ( rc == LDAP_SERVER_DOWN && first_try ) {
 		first_try = 0;
-                if ( ldap_initialize( &ld, data->url ) != LDAP_SUCCESS ) {
+                if ( ldap_initialize( &ld, data->lm_url ) != LDAP_SUCCESS ) {
 			rc = REWRITE_ERR;
 			goto rc_return;
 		}
 		goto do_bind;
+
 	} else if ( rc != REWRITE_SUCCESS ) {
 		rc = REWRITE_ERR;
 		goto rc_return;
@@ -289,11 +292,12 @@ do_bind:;
 	entry = ldap_first_entry( ld, res );
 	assert( entry != NULL );
 
-	if ( data->attrsonly == 1 ) {
+	if ( data->lm_attrsonly == 1 ) {
 		/*
 		 * dn is newly allocated, so there's no need to strdup it
 		 */
 		val->bv_val = ldap_get_dn( ld, entry );
+
 	} else {
 		values = ldap_get_values( ld, entry, lud->lud_attrs[ 0 ] );
 		if ( values == NULL || values[ 0 ] == NULL ) {
@@ -317,14 +321,15 @@ do_bind:;
 	val->bv_len = strlen( val->bv_val );
 
 rc_return:;
-	if ( data->when == MAP_LDAP_EVERYTIME ) {
+	if ( data->lm_when == MAP_LDAP_EVERYTIME ) {
 		if ( ld != NULL ) {
 			ldap_unbind_s( ld );
 		}
+
 	} else {
-		data->ld = ld;
+		data->lm_ld = ld;
 #ifdef USE_REWRITE_LDAP_PVT_THREADS
-		ldap_pvt_thread_mutex_unlock( &data->mutex );
+		ldap_pvt_thread_mutex_unlock( &data->lm_mutex );
 #endif /* USE_REWRITE_LDAP_PVT_THREADS */
 	}
 	
@@ -343,9 +348,35 @@ map_ldap_destroy(
 	
 	data = ( struct ldap_map_data * )(*pmap)->lb_private;
 
+	if ( data->lm_when != MAP_LDAP_EVERYTIME && data->lm_ld != NULL ) {
+		ldap_unbind_s( data->lm_ld );
+		data->lm_ld = NULL;
+	}
+
+	if ( data->lm_lud ) {
+		ldap_free_urldesc( data->lm_lud );
+		data->lm_lud = NULL;
+	}
+
+	if ( data->lm_url ) {
+		free( data->lm_url );
+		data->lm_url = NULL;
+	}
+
+	if ( data->lm_binddn ) {
+		free( data->lm_binddn );
+		data->lm_binddn = NULL;
+	}
+
+	if (data->lm_bindpw ) {
+		memset( data->lm_bindpw, 0, strlen( data->lm_bindpw ) );
+		free( data->lm_bindpw );
+		data->lm_bindpw = NULL;
+	}
+	
 	free( data );
-	*pmap = NULL;
+	(*pmap)->lb_private = NULL;
 
 	return 0;
 }
-		
+