From: Howard Chu <hyc@openldap.org>
Date: Sun, 19 Apr 2009 23:25:41 +0000 (+0000)
Subject: Add global_host_bv, why do we still have bare char *s lying around...
X-Git-Tag: ACLCHECK_0~614
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d70afbe6d150bf5d0c667c138c1ba76ce52dadf2;p=openldap

Add global_host_bv, why do we still have bare char *s lying around...
---

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index e6c138b3ac..a343eae174 100644
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -64,6 +64,7 @@ int		global_gentlehup = 0;
 int		global_idletimeout = 0;
 int		global_writetimeout = 0;
 char	*global_host = NULL;
+struct berval global_host_bv = BER_BVNULL;
 char	*global_realm = NULL;
 char	*sasl_host = NULL;
 char		**default_passwd_hash = NULL;
diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 23193d1498..55681f4712 100644
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -687,16 +687,16 @@ slapd_slp_init( const char* urls )
 	for ( i = 0; slapd_srvurls[i] != NULL; i++ ) {
 		if ( strcmp( slapd_srvurls[i], "ldap:///" ) == 0 ) {
 			slapd_srvurls[i] = (char *) ch_realloc( slapd_srvurls[i],
-				strlen( global_host ) +
+				global_host_bv.bv_len +
 				sizeof( LDAP_SRVTYPE_PREFIX ) );
 			strcpy( lutil_strcopy(slapd_srvurls[i],
-				LDAP_SRVTYPE_PREFIX ), global_host );
+				LDAP_SRVTYPE_PREFIX ), global_host_bv.bv_val );
 		} else if ( strcmp( slapd_srvurls[i], "ldaps:///" ) == 0 ) {
 			slapd_srvurls[i] = (char *) ch_realloc( slapd_srvurls[i],
-				strlen( global_host ) +
+				global_host_bv.bv_len +
 				sizeof( LDAPS_SRVTYPE_PREFIX ) );
 			strcpy( lutil_strcopy(slapd_srvurls[i],
-				LDAPS_SRVTYPE_PREFIX ), global_host );
+				LDAPS_SRVTYPE_PREFIX ), global_host_bv.bv_val );
 		}
 	}
 
diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index b22e8b70f1..64d1876dc7 100644
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -699,6 +699,7 @@ unhandled_option:;
 	Debug( LDAP_DEBUG_ANY, "%s", Versionstr, 0, 0 );
 
 	global_host = ldap_pvt_get_fqdn( NULL );
+	ber_str2bv( global_host, 0, 0, &global_host_bv );
 
 	if( check == CHECK_NONE && slapd_daemon_init( urls ) != 0 ) {
 		rc = 1;
diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index ae2753483d..abf6593396 100644
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -1935,6 +1935,7 @@ LDAP_SLAPD_V (int)		global_gentlehup;
 LDAP_SLAPD_V (int)		global_idletimeout;
 LDAP_SLAPD_V (int)		global_writetimeout;
 LDAP_SLAPD_V (char *)	global_host;
+LDAP_SLAPD_V (struct berval)	global_host_bv;
 LDAP_SLAPD_V (char *)	global_realm;
 LDAP_SLAPD_V (char *)	sasl_host;
 LDAP_SLAPD_V (char **)	default_passwd_hash;