Sync with 2.x

[openldap] / libraries / libldap / init.c

diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index b7558f75ecef5e2ced51c365231fa116f55eb9a9..a823946c7c894753d97316343df01f3cc50b1939 100644 (file)
--- a/libraries/libldap/init.c
+++ b/libraries/libldap/init.c
@@ -69,13 +69,21 @@ static const struct ol_attribute {
        {0, ATTR_BOOL,          "RESTART",              NULL,   LDAP_BOOL_RESTART},
 
 #ifdef HAVE_CYRUS_SASL
-       {0, ATTR_SASL,          "SASL_SECPROPS",NULL,   LDAP_OPT_X_SASL_SECPROPS},
+       {1, ATTR_STRING,        "SASL_MECH",            NULL,
+               offsetof(struct ldapoptions, ldo_def_sasl_mech)},
+       {1, ATTR_STRING,        "SASL_REALM",           NULL,
+               offsetof(struct ldapoptions, ldo_def_sasl_realm)},
+       {1, ATTR_STRING,        "SASL_AUTHCID",         NULL,
+               offsetof(struct ldapoptions, ldo_def_sasl_authcid)},
+       {1, ATTR_STRING,        "SASL_AUTHZID",         NULL,
+               offsetof(struct ldapoptions, ldo_def_sasl_authzid)},
+       {0, ATTR_SASL,          "SASL_SECPROPS",        NULL,   LDAP_OPT_X_SASL_SECPROPS},
 #endif
 
 #ifdef HAVE_TLS
        {0, ATTR_TLS,           "TLS",                  NULL,   LDAP_OPT_X_TLS},
-       {0, ATTR_TLS,           "TLS_CERT",             NULL,   LDAP_OPT_X_TLS_CERTFILE},
-       {0, ATTR_TLS,           "TLS_KEY",              NULL,   LDAP_OPT_X_TLS_KEYFILE},
+       {1, ATTR_TLS,           "TLS_CERT",             NULL,   LDAP_OPT_X_TLS_CERTFILE},
+       {1, ATTR_TLS,           "TLS_KEY",              NULL,   LDAP_OPT_X_TLS_KEYFILE},
        {0, ATTR_TLS,           "TLS_CACERT",   NULL,   LDAP_OPT_X_TLS_CACERTFILE},
        {0, ATTR_TLS,           "TLS_CACERTDIR",NULL,   LDAP_OPT_X_TLS_CACERTDIR},
        {0, ATTR_TLS,           "TLS_REQCERT",  NULL,   LDAP_OPT_X_TLS_REQUIRE_CERT},
@@ -389,21 +397,30 @@ void ldap_int_initialize_global_options( struct ldapoptions *gopts, int *dbglvl
        gopts->ldo_defport = LDAP_PORT;
 
        gopts->ldo_refhoplimit = LDAP_DEFAULT_REFHOPLIMIT;
-       gopts->ldo_rebindproc = NULL;
+       gopts->ldo_rebind_proc = NULL;
+       gopts->ldo_rebind_params = NULL;
 
        LDAP_BOOL_ZERO(gopts);
 
        LDAP_BOOL_SET(gopts, LDAP_BOOL_REFERRALS);
 
-#ifdef HAVE_TLS
-       gopts->ldo_tls_ctx = NULL;
-#endif
 #ifdef HAVE_CYRUS_SASL
-       memset( &gopts->ldo_sasl_secprops, '\0', sizeof(gopts->ldo_sasl_secprops) );
+       gopts->ldo_def_sasl_mech = NULL;
+       gopts->ldo_def_sasl_realm = NULL;
+       gopts->ldo_def_sasl_authcid = NULL;
+       gopts->ldo_def_sasl_authzid = NULL;
+
+       memset( &gopts->ldo_sasl_secprops,
+               '\0', sizeof(gopts->ldo_sasl_secprops) );
 
        gopts->ldo_sasl_secprops.max_ssf = INT_MAX;
-       gopts->ldo_sasl_secprops.maxbufsize = 65536;
-       gopts->ldo_sasl_secprops.security_flags = SASL_SEC_NOPLAINTEXT|SASL_SEC_NOANONYMOUS;
+       gopts->ldo_sasl_secprops.maxbufsize = SASL_MAX_BUFF_SIZE;
+       gopts->ldo_sasl_secprops.security_flags =
+               SASL_SEC_NOPLAINTEXT | SASL_SEC_NOANONYMOUS;
+#endif
+
+#ifdef HAVE_TLS
+       gopts->ldo_tls_ctx = NULL;
 #endif
 
        gopts->ldo_valid = LDAP_INITIALIZED;
@@ -413,7 +430,7 @@ void ldap_int_initialize_global_options( struct ldapoptions *gopts, int *dbglvl
 
 #if defined(LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND) \
        || defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL)
-char * ldap_int_hostname = "localhost";
+char * ldap_int_hostname = NULL;
 #endif
 
 void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
@@ -424,23 +441,11 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
 
 #if defined(LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND) \
        || defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL)
-       {
-               char hostbuf[MAXHOSTNAMELEN+1];
-               if( gethostname( hostbuf, MAXHOSTNAMELEN ) == 0 ) {
-                       hostbuf[MAXHOSTNAMELEN] = '\0';
-                       ldap_int_hostname = hostbuf;
-               }
-       }
+       ldap_int_hostname = ldap_pvt_get_fqdn( ldap_int_hostname );
 #endif
 
        ldap_int_utils_init();
 
-#ifdef HAVE_TLS
-       ldap_pvt_tls_init();
-#endif
-
-       ldap_int_sasl_init();
-
        if ( ldap_int_tblsize == 0 )
                ldap_int_ip_init();
 
@@ -450,6 +455,21 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
                return;
        }
 
+#ifdef HAVE_CYRUS_SASL
+       {
+               /* set authentication identity to current user name */
+               char *user = getenv("USER");
+
+               if( user == NULL ) user = getenv("USERNAME");
+               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 );
+               }
+    }
+#endif
+
        openldap_ldap_init_w_sysconf(LDAP_CONF_FILE);
        openldap_ldap_init_w_userconf(LDAP_USERRC_FILE);
 
@@ -480,4 +500,6 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
        }
 
        openldap_ldap_init_w_env(gopts, NULL);
+
+       ldap_int_sasl_init();
 }