Don't copy and leak user; it's an env var so just use it directly.

[openldap] / libraries / libldap / init.c

diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index a823946c7c894753d97316343df01f3cc50b1939..e05ade2d4cbb86f1c62219b9e90b1abf4e51d06e 100644 (file)
--- a/libraries/libldap/init.c
+++ b/libraries/libldap/init.c
@@ -26,7 +26,7 @@ struct ldapoptions ldap_int_global_options =
 #define ATTR_INT       2
 #define ATTR_KV                3
 #define ATTR_STRING    4
-#define ATTR_URIS      5
+#define ATTR_OPTION    5
 
 #define ATTR_SASL      6
 #define ATTR_TLS       7
@@ -63,8 +63,8 @@ static const struct ol_attribute {
                offsetof(struct ldapoptions, ldo_defbase)},
        {0, ATTR_INT,           "PORT",                 NULL,           /* deprecated */
                offsetof(struct ldapoptions, ldo_defport)},
-       {0, ATTR_URIS,          "HOST",                 NULL,   1},     /* deprecated */
-       {0, ATTR_URIS,          "URI",                  NULL,   0}, /* replaces HOST/URI */
+       {0, ATTR_OPTION,        "HOST",                 NULL,   LDAP_OPT_HOST_NAME}, /* deprecated */
+       {0, ATTR_OPTION,        "URI",                  NULL,   LDAP_OPT_URI}, /* replaces HOST/PORT */
        {0, ATTR_BOOL,          "REFERRALS",    NULL,   LDAP_BOOL_REFERRALS},
        {0, ATTR_BOOL,          "RESTART",              NULL,   LDAP_BOOL_RESTART},
 
@@ -211,12 +211,8 @@ static void openldap_ldap_init_w_conf(
                                if (* (char**) p != NULL) LDAP_FREE(* (char**) p);
                                * (char**) p = LDAP_STRDUP(opt);
                                break;
-                       case ATTR_URIS:
-                               if (attrs[i].offset == 0) {
-                                       ldap_set_option( NULL, LDAP_OPT_URI, opt );
-                               } else {
-                                       ldap_set_option( NULL, LDAP_OPT_HOST_NAME, opt );
-                               }
+                       case ATTR_OPTION:
+                               ldap_set_option( NULL, attrs[i].offset, opt );
                                break;
                        case ATTR_SASL:
 #ifdef HAVE_CYRUS_SASL
@@ -225,7 +221,7 @@ static void openldap_ldap_init_w_conf(
                                break;
                        case ATTR_TLS:
 #ifdef HAVE_TLS
-                               ldap_int_tls_config( gopts, attrs[i].offset, opt );
+                               ldap_int_tls_config( NULL, attrs[i].offset, opt );
 #endif
                                break;
                        }
@@ -267,11 +263,11 @@ static void openldap_ldap_init_w_userconf(const char *file)
                /* we assume UNIX path syntax is used... */
 
                /* try ~/file */
-               sprintf(path, "%s/%s", home, file);
+               sprintf(path, "%s%s%s", home, LDAP_DIRSEP, file);
                openldap_ldap_init_w_conf(path, 1);
 
                /* try ~/.file */
-               sprintf(path, "%s/.%s", home, file);
+               sprintf(path, "%s%s.%s", home, LDAP_DIRSEP, file);
                openldap_ldap_init_w_conf(path, 1);
        }
 
@@ -351,12 +347,8 @@ static void openldap_ldap_init_w_env(
                                * (char**) p = LDAP_STRDUP(value);
                        }
                        break;
-               case ATTR_URIS:
-                       if (attrs[i].offset == 0) {
-                               ldap_set_option( NULL, LDAP_OPT_URI, value );
-                       } else {
-                               ldap_set_option( NULL, LDAP_OPT_HOST_NAME, value );
-                       }
+               case ATTR_OPTION:
+                       ldap_set_option( NULL, attrs[i].offset, value );
                        break;
                case ATTR_SASL:
 #ifdef HAVE_CYRUS_SASL
@@ -365,7 +357,7 @@ static void openldap_ldap_init_w_env(
                        break;
                case ATTR_TLS:
 #ifdef HAVE_TLS
-                       ldap_int_tls_config( gopts, attrs[i].offset, value );
+                       ldap_int_tls_config( NULL, attrs[i].offset, value );
 #endif                         
                        break;
                }
@@ -404,6 +396,12 @@ void ldap_int_initialize_global_options( struct ldapoptions *gopts, int *dbglvl
 
        LDAP_BOOL_SET(gopts, LDAP_BOOL_REFERRALS);
 
+#ifdef LDAP_CONNECTIONLESS
+       gopts->ldo_peer = NULL;
+       gopts->ldo_cldapdn = NULL;
+       gopts->ldo_is_udp = 0;
+#endif
+
 #ifdef HAVE_CYRUS_SASL
        gopts->ldo_def_sasl_mech = NULL;
        gopts->ldo_def_sasl_realm = NULL;
@@ -419,12 +417,7 @@ void ldap_int_initialize_global_options( struct ldapoptions *gopts, int *dbglvl
                SASL_SEC_NOPLAINTEXT | SASL_SEC_NOANONYMOUS;
 #endif
 
-#ifdef HAVE_TLS
-       gopts->ldo_tls_ctx = NULL;
-#endif
-
        gopts->ldo_valid = LDAP_INITIALIZED;
-
        return;
 }
 
@@ -439,6 +432,8 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
                return;
        }
 
+       ldap_int_error_init();
+
 #if defined(LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND) \
        || defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL)
        ldap_int_hostname = ldap_pvt_get_fqdn( ldap_int_hostname );
@@ -464,8 +459,7 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
                if( user == NULL ) user = getenv("LOGNAME");
 
                if( user != NULL ) {
-                       /* this value is leaked, need at_exit() handler */
-                       gopts->ldo_def_sasl_authcid = LDAP_STRDUP( user );
+                       gopts->ldo_def_sasl_authcid = user;
                }
     }
 #endif