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 1f651d1c400efc91b87f91ceed044a2b8f531e55..20669ba1fd2e96cc18e8778a766a471e3932370a 100644 (file)
--- 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 23193d149846e0efe5b42c7b78ccecaf57010f47..55681f47124044d5e29832d0cd16ac224f9bf808 100644 (file)
--- 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 e2ffda2c7c0d1582f3b27b0e13a3551fdd14b6c9..14fadd6b1acd4741a254d5baebe4ac91c57e23b3 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -700,6 +700,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 a56a5fc011466ae84f9236b86d51e606361adf85..e8b73c71b5f70085395621ef603d0a3be88d3795 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -1937,6 +1937,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 *)  slap_sasl_auxprops;