From fedora-directory-commits at redhat.com Thu May 1 20:21:33 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 1 May 2008 16:21:33 -0400 Subject: [Fedora-directory-commits] dsmlgw build.xml,1.10,1.11 Message-ID: <200805012021.m41KLXUj010297@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsmlgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10280/dsmlgw Modified Files: build.xml Log Message: use sane default values Index: build.xml =================================================================== RCS file: /cvs/dirsec/dsmlgw/build.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- build.xml 30 Apr 2008 20:49:21 -0000 1.10 +++ build.xml 1 May 2008 20:21:31 -0000 1.11 @@ -82,9 +82,9 @@ - + - + From fedora-directory-commits at redhat.com Fri May 9 14:17:40 2008 From: fedora-directory-commits at redhat.com (Robert Crittenden (rcritten)) Date: Fri, 9 May 2008 10:17:40 -0400 Subject: [Fedora-directory-commits] mod_nss mod_nss.h, 1.19, 1.20 nss_engine_init.c, 1.30, 1.31 Message-ID: <200805091417.m49EHePA011612@cvs-int.fedora.redhat.com> Author: rcritten Update of /cvs/dirsec/mod_nss In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11413 Modified Files: mod_nss.h nss_engine_init.c Log Message: NSS has been modified to not allow a fork after an NSS_Init() in the soft token. It apparently always did this for hardware tokens as it is part of the PKCS#11 spec. This moves the initialization code into the child process init function. 444348 Index: mod_nss.h =================================================================== RCS file: /cvs/dirsec/mod_nss/mod_nss.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- mod_nss.h 18 Oct 2007 18:26:21 -0000 1.19 +++ mod_nss.h 9 May 2008 14:17:38 -0000 1.20 @@ -222,6 +222,7 @@ pid_t pid; int nInitCount; apr_pool_t *pPool; + apr_pool_t *ptemp; /* pointer to ptemp passed in during init */ const char *pCertificateDatabase; const char *pDBPrefix; @@ -407,6 +408,7 @@ void nss_init_Child(apr_pool_t *, server_rec *); void nss_init_ConfigureServer(server_rec *, apr_pool_t *, apr_pool_t *, SSLSrvConfigRec *); apr_status_t nss_init_ModuleKill(void *data); +apr_status_t nss_init_ChildKill(void *data); int nss_parse_ciphers(server_rec *s, char *ciphers, PRBool cipher_list[ciphernum]); /* Apache API hooks */ Index: nss_engine_init.c =================================================================== RCS file: /cvs/dirsec/mod_nss/nss_engine_init.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- nss_engine_init.c 7 Jun 2007 14:58:31 -0000 1.30 +++ nss_engine_init.c 9 May 2008 14:17:38 -0000 1.31 @@ -135,111 +135,85 @@ * Initialize SSL library * */ -static void nss_init_SSLLibrary(server_rec *s, int fipsenabled, - int ocspenabled, int ocspdefault, - const char * ocspurl, const char *ocspname) +static void nss_init_SSLLibrary(server_rec *base_server) { SECStatus rv; - SSLModConfigRec *mc = myModConfig(s); + SSLModConfigRec *mc = myModConfig(base_server); SSLSrvConfigRec *sc; - int threaded = 0; char cwd[PATH_MAX]; + server_rec *s; + int fipsenabled = FALSE; + int ocspenabled = FALSE; + int ocspdefault = FALSE; + const char * ocspurl = NULL; + const char * ocspname = NULL; - sc = mySrvConfig(s); - - ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, - "Init: %snitializing NSS library", mc->nInitCount == 1 ? "I" : "Re-i"); - - /* Do we need to fire up our password helper? */ - if (mc->nInitCount == 1) { - const char * child_argv[4]; - apr_status_t rv; + sc = mySrvConfig(base_server); - if (mc->pphrase_dialog_helper == NULL) { - ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, - "NSSPassPhraseHelper is not set. It is required."); - nss_die(); + for (s = base_server; s; s = s->next) { + if (sc->fips == TRUE) { + fipsenabled = TRUE; } - child_argv[0] = mc->pphrase_dialog_helper; - child_argv[1] = fipsenabled ? "on" : "off"; - child_argv[2] = mc->pCertificateDatabase; - child_argv[3] = mc->pDBPrefix; - child_argv[4] = NULL; - - rv = apr_procattr_create(&mc->procattr, mc->pPool); - - if (rv != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, - "apr_procattr_create() failed APR err: %d.", rv); - nss_die(); + if (sc->ocsp == TRUE) { + ocspenabled = TRUE; } - apr_procattr_io_set(mc->procattr, APR_PARENT_BLOCK, APR_PARENT_BLOCK, - APR_FULL_NONBLOCK); - apr_procattr_error_check_set(mc->procattr, 1); - - /* the process inherits our environment, which should allow the - * dynamic loader to find NSPR and NSS. - */ - apr_procattr_cmdtype_set(mc->procattr, APR_PROGRAM_ENV); - - /* We've now spawned our helper process, the actual communication - * with it occurs in nss_engine_pphrase.c. - */ - rv = apr_proc_create(&mc->proc, child_argv[0], child_argv, NULL, mc->procattr, mc->pPool); - if (rv != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, - "apr_proc_create failed to launch %s APR err: %d.", child_argv[0], rv); - nss_die(); + if (sc->ocsp_default == TRUE) { + ocspdefault = TRUE; + ocspurl = sc->ocsp_url; + ocspname = sc->ocsp_name; + if ((ocspurl == NULL) || (ocspname == NULL)) { + ap_log_error(APLOG_MARK, APLOG_ERR, 0, base_server, + "When NSSOCSPDefaultResponder is enabled both a default URL (NSSOCSPDefaultUrl) and certificate nickname (NSSOCSPDefaultName) are required."); + if (mc->nInitCount == 1) + nss_die(); + else + return; + } } - /* Set a 30-second read/write timeout */ - apr_file_pipe_timeout_set(mc->proc.in, apr_time_from_sec(30)); - apr_file_pipe_timeout_set(mc->proc.out, apr_time_from_sec(30)); } - /* Initialize NSPR */ - PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 256); - - /* Set the PKCS #11 strings for the internal token. */ - PK11_ConfigurePKCS11(NULL,NULL,NULL, INTERNAL_TOKEN_NAME, NULL, NULL,NULL,NULL,8,1); - - ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, - "Initializing SSL Session Cache of size %d. SSL2 timeout = %d, SSL3/TLS timeout = %d.", mc->session_cache_size, mc->session_cache_timeout, mc->ssl3_session_cache_timeout); - ap_mpm_query(AP_MPMQ_MAX_THREADS, &threaded); - if (!threaded) - SSL_ConfigMPServerSIDCache(mc->session_cache_size, (PRUint32) mc->session_cache_timeout, (PRUint32) mc->ssl3_session_cache_timeout, NULL); - else - SSL_ConfigServerSessionIDCache(mc->session_cache_size, (PRUint32) mc->session_cache_timeout, (PRUint32) mc->ssl3_session_cache_timeout, NULL); - /* We need to be in the same directory as libnssckbi.so to load the * root certificates properly. */ if (getcwd(cwd, PATH_MAX) == NULL) { - ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, base_server, "Unable to determine current working directory"); - nss_die(); + if (mc->nInitCount == 1) + nss_die(); + else + return; } if (chdir(mc->pCertificateDatabase) != 0) { - ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, base_server, "Unable to change directory to %s", mc->pCertificateDatabase); - nss_die(); + if (mc->nInitCount == 1) + nss_die(); + else + return; } /* Initialize NSS and open the certificate database read-only. */ rv = NSS_Initialize(mc->pCertificateDatabase, mc->pDBPrefix, mc->pDBPrefix, "secmod.db", NSS_INIT_READONLY); if (chdir(cwd) != 0) { - ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, base_server, "Unable to change directory to %s", cwd); - nss_die(); + if (mc->nInitCount == 1) + nss_die(); + else + return; } /* Assuming everything is ok so far, check the cert database password(s). */ if (rv != SECSuccess) { NSS_Shutdown(); - ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, - "NSS initialization failed. Certificate database: %s.", mc->pCertificateDatabase != NULL ? mc->pCertificateDatabase : "not set in configuration"); - nss_log_nss_error(APLOG_MARK, APLOG_ERR, s); - nss_die(); + ap_log_error(APLOG_MARK, APLOG_ERR, 0, base_server, + "NSS_Initialize failed. Certificate database: %s.", mc->pCertificateDatabase != NULL ? mc->pCertificateDatabase : "not set in configuration"); + nss_log_nss_error(APLOG_MARK, APLOG_ERR, base_server); + if (mc->nInitCount == 1) + nss_die(); + else + return; } if (fipsenabled) { @@ -249,39 +223,47 @@ if ((SECMOD_DeleteInternalModule(internal_name) != SECSuccess) || !PK11_IsFIPS()) { - ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, base_server, "Unable to enable FIPS mode on certificate database %s.", mc->pCertificateDatabase); NSS_Shutdown(); - nss_log_nss_error(APLOG_MARK, APLOG_ERR, s); - nss_die(); + nss_log_nss_error(APLOG_MARK, APLOG_ERR, base_server); + if (mc->nInitCount == 1) + nss_die(); + else + return; } PR_smprintf_free(internal_name); } /* FIPS is already enabled, nothing to do */ } - if (nss_Init_Tokens(s) != SECSuccess) { + if (nss_Init_Tokens(base_server) != SECSuccess) { NSS_Shutdown(); - ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, base_server, "NSS initialization failed. Certificate database: %s.", mc->pCertificateDatabase != NULL ? mc->pCertificateDatabase : "not set in configuration"); - nss_log_nss_error(APLOG_MARK, APLOG_ERR, s); - nss_die(); + nss_log_nss_error(APLOG_MARK, APLOG_ERR, base_server); + if (mc->nInitCount == 1) + nss_die(); + else + return; } if (NSS_SetDomesticPolicy() != SECSuccess) { NSS_Shutdown(); - ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, base_server, "NSS set domestic policy failed on certificate database %s.", mc->pCertificateDatabase); - nss_log_nss_error(APLOG_MARK, APLOG_ERR, s); - nss_die(); + nss_log_nss_error(APLOG_MARK, APLOG_ERR, base_server); + if (mc->nInitCount == 1) + nss_die(); + else + return; } if (ocspenabled) { CERT_EnableOCSPChecking(CERT_GetDefaultCertDB()); - ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, base_server, "OCSP is enabled."); - /* We ensure that ocspname and ocspurl are not NULL in nss_init_Module - */ + /* We ensure that ocspname and ocspurl are not NULL above. */ if (ocspdefault) { SECStatus sv; @@ -289,21 +271,34 @@ ocspurl, ocspname); if (sv == SECFailure) { - ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, base_server, "Unable to set OCSP default responder nickname %s.", ocspname); - nss_log_nss_error(APLOG_MARK, APLOG_INFO, s); - nss_die(); + nss_log_nss_error(APLOG_MARK, APLOG_ERR, base_server); + if (mc->nInitCount == 1) + nss_die(); + else + return; } sv = CERT_EnableOCSPDefaultResponder(CERT_GetDefaultCertDB()); if (sv == SECFailure) { - ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, base_server, "Unable to enable the OCSP default responder, %s (this shouldn't happen).", ocspname); - nss_log_nss_error(APLOG_MARK, APLOG_INFO, s); - nss_die(); + nss_log_nss_error(APLOG_MARK, APLOG_ERR, base_server); + if (mc->nInitCount == 1) + nss_die(); + else + return; } } } + + /* + * Seed the Pseudo Random Number Generator (PRNG) + * only need ptemp here; nothing inside allocated from the pool + * needs to live once we return from nss_rand_seed(). + */ + nss_rand_seed(base_server, mc->ptemp, SSL_RSCTX_STARTUP, "Init: "); } int nss_init_Module(apr_pool_t *p, apr_pool_t *plog, @@ -315,20 +310,12 @@ server_rec *s; int sslenabled = FALSE; int fipsenabled = FALSE; - int ocspenabled = FALSE; - int ocspdefault = FALSE; - const char * ocspurl = NULL; - const char * ocspname = NULL; + int threaded = 0; mc->nInitCount++; - - /* - * Let us cleanup on restarts and exists - */ - apr_pool_cleanup_register(p, base_server, - nss_init_ModuleKill, - apr_pool_cleanup_null); + mc->ptemp = ptemp; + /* * Any init round fixes the global config */ @@ -383,6 +370,10 @@ sc->ocsp = FALSE; } + if (sc->ocsp_default == UNSET) { + sc->ocsp_default = FALSE; + } + /* If any servers have SSL, we want sslenabled set so we * can initialize the database. fipsenabled is similar. If * any of the servers have it set, they all will need to use @@ -397,69 +388,112 @@ sc->proxy_enabled = FALSE; } + if ((sc->enabled == TRUE) || (sc->proxy_enabled == TRUE)) { + sslenabled = TRUE; + } + if (sc->fips == TRUE) { fipsenabled = TRUE; } + } - if (sc->ocsp == TRUE) { - ocspenabled = TRUE; + if (sslenabled == FALSE) { + return OK; + } + + ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, + "Init: %snitializing NSS library", mc->nInitCount == 1 ? "I" : "Re-i"); + + /* Do we need to fire up our password helper? */ + if (mc->nInitCount == 1) { + const char * child_argv[5]; + apr_status_t rv; + + if (mc->pphrase_dialog_helper == NULL) { + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, + "NSSPassPhraseHelper is not set. It is required."); + nss_die(); } - if ((sc->enabled == TRUE) || (sc->proxy_enabled == TRUE)) { - sslenabled = TRUE; + child_argv[0] = mc->pphrase_dialog_helper; + child_argv[1] = fipsenabled ? "on" : "off"; + child_argv[2] = mc->pCertificateDatabase; + child_argv[3] = mc->pDBPrefix; + child_argv[4] = NULL; + + rv = apr_procattr_create(&mc->procattr, mc->pPool); + + if (rv != APR_SUCCESS) { + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, + "apr_procattr_create() failed APR err: %d.", rv); + nss_die(); } - if (sc->ocsp_default == TRUE) { - ocspdefault = TRUE; - ocspurl = sc->ocsp_url; - ocspname = sc->ocsp_name; - if ((ocspurl == NULL) || (ocspname == NULL)) { - ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, - "When NSSOCSPDefaultResponder is enabled both a default URL (NSSOCSPDefaultUrl) and certificate nickname (NSSOCSPDefaultName) are required."); - nss_die(); - } + apr_procattr_io_set(mc->procattr, APR_PARENT_BLOCK, APR_PARENT_BLOCK, + APR_FULL_NONBLOCK); + apr_procattr_error_check_set(mc->procattr, 1); + + /* the process inherits our environment, which should allow the + * dynamic loader to find NSPR and NSS. + */ + apr_procattr_cmdtype_set(mc->procattr, APR_PROGRAM_ENV); + + /* We've now spawned our helper process, the actual communication + * with it occurs in nss_engine_pphrase.c. + */ + rv = apr_proc_create(&mc->proc, child_argv[0], child_argv, NULL, mc->procattr, mc->pPool); + if (rv != APR_SUCCESS) { + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, + "apr_proc_create failed to launch %s APR err: %d.", child_argv[0], rv); + nss_die(); } + /* Set a 30-second read/write timeout */ + apr_file_pipe_timeout_set(mc->proc.in, apr_time_from_sec(30)); + apr_file_pipe_timeout_set(mc->proc.out, apr_time_from_sec(30)); } - if (sslenabled == FALSE) - return OK; + /* Initialize NSPR */ + PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 256); - nss_init_SSLLibrary(base_server, fipsenabled, ocspenabled, - ocspdefault, ocspurl, ocspname); - ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, - "done Init: Initializing NSS library"); + /* Set the PKCS #11 string for the internal token to a nicer name. */ + PK11_ConfigurePKCS11(NULL,NULL,NULL, INTERNAL_TOKEN_NAME, NULL, NULL,NULL,NULL,8,1); + + ap_log_error(APLOG_MARK, APLOG_INFO, 0, base_server, + "Initializing SSL Session Cache of size %d. SSL2 timeout = %d, SSL3/TLS timeout = %d.", mc->session_cache_size, mc->session_cache_timeout, mc->ssl3_session_cache_timeout); + ap_mpm_query(AP_MPMQ_MAX_THREADS, &threaded); + if (!threaded) + SSL_ConfigMPServerSIDCache(mc->session_cache_size, (PRUint32) mc->session_cache_timeout, (PRUint32) mc->ssl3_session_cache_timeout, NULL); + else + SSL_ConfigServerSessionIDCache(mc->session_cache_size, (PRUint32) mc->session_cache_timeout, (PRUint32) mc->ssl3_session_cache_timeout, NULL); /* Load our layer */ nss_io_layer_init(); - /* - * Seed the Pseudo Random Number Generator (PRNG) - * only need ptemp here; nothing inside allocated from the pool - * needs to live once we return from nss_rand_seed(). - */ - if (mc->nInitCount > 1) - nss_rand_seed(base_server, ptemp, SSL_RSCTX_STARTUP, "Init: "); - - /* - * initialize servers - */ - ap_log_error(APLOG_MARK, APLOG_INFO, 0, base_server, - "Init: Initializing (virtual) servers for SSL"); - - for (s = base_server; s; s = s->next) { - sc = mySrvConfig(s); + if (mc->nInitCount == 1) { + nss_init_SSLLibrary(base_server); /* - * Either now skip this server when SSL is disabled for - * it or give out some information about what we're - * configuring. + * initialize servers */ + ap_log_error(APLOG_MARK, APLOG_INFO, 0, base_server, + "Init: Initializing (virtual) servers for SSL"); - /* - * Read the server certificate and key - */ - nss_init_ConfigureServer(s, p, ptemp, sc); - } + for (s = base_server; s; s = s->next) { + sc = mySrvConfig(s); + /* + * Either now skip this server when SSL is disabled for + * it or give out some information about what we're + * configuring. + */ + + /* + * Read the server certificate and key + */ + nss_init_ConfigureServer(s, p, ptemp, sc); + } + nss_init_ChildKill(base_server); + nss_init_ModuleKill(base_server); + } /* * Announce mod_nss and SSL library in HTTP Server field @@ -801,9 +835,9 @@ } static void nss_init_server_check(server_rec *s, - apr_pool_t *p, - apr_pool_t *ptemp, - modnss_ctx_t *mctx) + apr_pool_t *p, + apr_pool_t *ptemp, + modnss_ctx_t *mctx) { #ifdef NSS_ENABLE_ECC if (mctx->servercert != NULL || mctx->eccservercert != NULL) { @@ -1006,8 +1040,6 @@ apr_pool_t *ptemp, SSLSrvConfigRec *sc) { - SSLModConfigRec *mc = myModConfig(s); - nss_init_ctx(s, p, ptemp, sc->proxy); nss_init_server_certs(s, p, ptemp, sc->proxy); @@ -1018,8 +1050,6 @@ apr_pool_t *ptemp, SSLSrvConfigRec *sc) { - SSLModConfigRec *mc = myModConfig(s); - nss_init_server_check(s, p, ptemp, sc->server); nss_init_ctx(s, p, ptemp, sc->server); @@ -1048,20 +1078,60 @@ } } -void nss_init_Child(apr_pool_t *p, server_rec *s) +void nss_init_Child(apr_pool_t *p, server_rec *base_server) { - SSLModConfigRec *mc = myModConfig(s); + SSLModConfigRec *mc = myModConfig(base_server); + SSLSrvConfigRec *sc; + server_rec *s; + mc->pid = getpid(); /* only call getpid() once per-process */ + + if (SSL_InheritMPServerSIDCache(NULL) != SECSuccess) { + ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, + "SSL_InheritMPServerSIDCache failed"); + nss_log_nss_error(APLOG_MARK, APLOG_ERR, NULL); + } + + nss_init_SSLLibrary(base_server); + + /* Configure all virtual servers */ + for (s = base_server; s; s = s->next) { + sc = mySrvConfig(s); + if (sc->server->servercert == NULL && NSS_IsInitialized()) + nss_init_ConfigureServer(s, p, mc->ptemp, sc); + } + + /* + * Let us cleanup on restarts and exits + */ + apr_pool_cleanup_register(p, base_server, + nss_init_ChildKill, + apr_pool_cleanup_null); } apr_status_t nss_init_ModuleKill(void *data) { + server_rec *base_server = (server_rec *)data; + + ap_log_error(APLOG_MARK, APLOG_INFO, 0, base_server, + "Shutting down SSL Session ID Cache"); + + SSL_ShutdownServerSessionIDCache(); + + /* NSS_Shutdown() gets called in nss_init_ChildKill */ + return APR_SUCCESS; +} + +apr_status_t nss_init_ChildKill(void *data) +{ SSLSrvConfigRec *sc; server_rec *base_server = (server_rec *)data; server_rec *s; - SECStatus rv; int shutdown = 0; + /* Clear any client-side session cache data */ + SSL_ClearSessionCache(); + /* * Free the non-pool allocated structures * in the per-server configurations @@ -1111,13 +1181,7 @@ nss_log_nss_error(APLOG_MARK, APLOG_ERR, NULL); } - SSL_ShutdownServerSessionIDCache(); - - if ((rv = NSS_Shutdown()) != SECSuccess) { - ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, - "NSS_Shutdown failed"); - nss_log_nss_error(APLOG_MARK, APLOG_ERR, NULL); - } + NSS_Shutdown(); } return APR_SUCCESS; From fedora-directory-commits at redhat.com Wed May 14 18:39:33 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 14 May 2008 14:39:33 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd config.c, 1.10, 1.11 Message-ID: <200805141839.m4EIdXSV016915@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16574 Modified Files: config.c Log Message: Resolves: #230673 Summary: LDAPI: referral mode needs LDAPI socket Problem Description: If you start the server with the referral mode, e.g., like this: ns-slapd refer -D /etc/dirsrv/slapd-test -r ldap://laputa.example.com UNIX socket for LDAPI was not opened since LDAPI configuration parameters are not read from dse.ldif at that moment. Fix Description: adding the code to process nsslapd-ldapifilepath and nsslapd-ldapilisten in slapd_bootstrap_config. Index: config.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/config.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- config.c 10 Nov 2006 23:45:40 -0000 1.10 +++ config.c 14 May 2008 18:39:31 -0000 1.11 @@ -375,7 +375,33 @@ CONFIG_SASLPATH_ATTRIBUTE, errorbuf); } } +#if defined(ENABLE_LDAPI) + /* set the ldapi file path; needed in main */ + workpath[0] = '\0'; + if (entry_has_attr_and_value(e, CONFIG_LDAPI_FILENAME_ATTRIBUTE, + workpath, sizeof(workpath))) + { + if (config_set_ldapi_filename(CONFIG_LDAPI_FILENAME_ATTRIBUTE, + workpath, errorbuf, CONFIG_APPLY) != LDAP_SUCCESS) + { + LDAPDebug(LDAP_DEBUG_ANY, "%s: %s: %s. \n", configfile, + CONFIG_LDAPI_FILENAME_ATTRIBUTE, errorbuf); + } + } + /* set the ldapi switch; needed in main */ + workpath[0] = '\0'; + if (entry_has_attr_and_value(e, CONFIG_LDAPI_SWITCH_ATTRIBUTE, + workpath, sizeof(workpath))) + { + if (config_set_ldapi_switch(CONFIG_LDAPI_SWITCH_ATTRIBUTE, + workpath, errorbuf, CONFIG_APPLY) != LDAP_SUCCESS) + { + LDAPDebug(LDAP_DEBUG_ANY, "%s: %s: %s. \n", configfile, + CONFIG_LDAPI_SWITCH_ATTRIBUTE, errorbuf); + } + } +#endif /* see if the entry is a child of the plugin base dn */ if (slapi_sdn_isparent(&plug_dn, slapi_entry_get_sdn_const(e))) From fedora-directory-commits at redhat.com Fri May 16 15:16:05 2008 From: fedora-directory-commits at redhat.com (Robert Crittenden (rcritten)) Date: Fri, 16 May 2008 11:16:05 -0400 Subject: [Fedora-directory-commits] mod_nss nss_engine_init.c, 1.31, 1.32 nss_engine_pphrase.c, 1.10, 1.11 Message-ID: <200805161516.m4GFG59O007415@cvs-int.fedora.redhat.com> Author: rcritten Update of /cvs/dirsec/mod_nss In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7275 Modified Files: nss_engine_init.c nss_engine_pphrase.c Log Message: Make FIPS mode work. This fixes 2 problems: 1. In nss_init_SSLLibrary() the server config wasn't being set properly for each virtual server so FIPS wasn't getting turned on. 2. There seem to be a problem in NSS_Shutdown() that makes subsequent logins appear to succeed but they actually are skipped causing keys and certs to not be available. Also switch an error message to a warning related to FIPS ciphers. Index: nss_engine_init.c =================================================================== RCS file: /cvs/dirsec/mod_nss/nss_engine_init.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- nss_engine_init.c 9 May 2008 14:17:38 -0000 1.31 +++ nss_engine_init.c 16 May 2008 15:16:02 -0000 1.32 @@ -148,9 +148,10 @@ const char * ocspurl = NULL; const char * ocspname = NULL; - sc = mySrvConfig(base_server); for (s = base_server; s; s = s->next) { + sc = mySrvConfig(s); + if (sc->fips == TRUE) { fipsenabled = TRUE; } @@ -802,7 +803,7 @@ if (mctx->sc->fips) { for (i=0; islot; + /* This is needed to work around a bug in NSS while in FIPS mode. + * The first login will succeed but NSS_Shutdown() isn't cleaning + * something up causing subsequent logins to be skipped making + * keys and certs unavailable. + */ + PK11_Logout(slot); + if (PK11_NeedLogin(slot) && PK11_NeedUserInit(slot)) { if (slot == PK11_GetInternalKeySlot()) { ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, From fedora-directory-commits at redhat.com Fri May 16 15:18:10 2008 From: fedora-directory-commits at redhat.com (Robert Crittenden (rcritten)) Date: Fri, 16 May 2008 11:18:10 -0400 Subject: [Fedora-directory-commits] mod_nss Makefile.am, 1.12, 1.13 configure.in, 1.12, 1.13 aclocal.m4, 1.10, 1.11 Makefile.in, 1.19, 1.20 configure, 1.16, 1.17 Message-ID: <200805161518.m4GFIADh007619@cvs-int.fedora.redhat.com> Author: rcritten Update of /cvs/dirsec/mod_nss In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7569 Modified Files: Makefile.am configure.in aclocal.m4 Makefile.in configure Log Message: No need to link with softokn3 446101 Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/mod_nss/Makefile.am,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Makefile.am 3 Mar 2006 15:24:14 -0000 1.12 +++ Makefile.am 16 May 2008 15:18:07 -0000 1.13 @@ -11,7 +11,7 @@ ## Set the includes and libraries needed INCLUDES = -I at apache_inc@ @nspr_inc@ @nss_inc@ @apr_inc@ -LIBS = @nspr_lib@ @nss_lib@ -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lplc4 -lplds4 -lnspr4 +LIBS = @nspr_lib@ @nss_lib@ -lssl3 -lsmime3 -lnss3 -lplc4 -lplds4 -lnspr4 EXTRA_CPPFLAGS=@extra_cppflags@ install-libLTLIBRARIES: libmodnss.la Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/mod_nss/Makefile.in,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- Makefile.in 3 Mar 2006 15:24:14 -0000 1.19 +++ Makefile.in 16 May 2008 15:18:07 -0000 1.20 @@ -120,7 +120,7 @@ libmodnss_la_LDFLAGS = -module -avoid-version INCLUDES = -I at apache_inc@ @nspr_inc@ @nss_inc@ @apr_inc@ -LIBS = @nspr_lib@ @nss_lib@ -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lplc4 -lplds4 -lnspr4 +LIBS = @nspr_lib@ @nss_lib@ -lssl3 -lsmime3 -lnss3 -lplc4 -lplds4 -lnspr4 EXTRA_CPPFLAGS = @extra_cppflags@ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ From fedora-directory-commits at redhat.com Fri May 16 16:25:57 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 16 May 2008 12:25:57 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src/scripts DSCreate.pm.in, 1.10, 1.11 Message-ID: <200805161625.m4GGPvF4019648@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19092/admin/src/scripts Modified Files: DSCreate.pm.in Log Message: Resolves: #436400 Summary: LDAPI: cleaning up template-ldapi-default.ldif.in and DSCreate.pm.in Description: Separated auto-bind attributes from the ldapi attributes. Fixed to store auto-bind attributes in dsel.dif only when auto-bind is enabled. Index: DSCreate.pm.in =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSCreate.pm.in,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- DSCreate.pm.in 13 Mar 2008 21:52:37 -0000 1.10 +++ DSCreate.pm.in 16 May 2008 16:25:54 -0000 1.11 @@ -336,14 +336,14 @@ $ent->setValues("nsslapd-ldapilisten", "off"); } if ("@enable_autobind@") { - $ent->setValues("nsslapd-ldapiautobind", "on"); + $ent->setValues("nsslapd-ldapiautobind", "off"); + $ent->setValues("nsslapd-ldapimaprootdn", $inf->{slapd}->{RootDN}); + $ent->setValues("nsslapd-ldapimaptoentries", "off"); + $ent->setValues("nsslapd-ldapiuidnumbertype", "uidNumber"); + $ent->setValues("nsslapd-ldapigidnumbertype", "gidNumber"); + $ent->setValues("nsslapd-ldapientrysearchbase", $inf->{slapd}->{Suffix}); + $ent->setValues("nsslapd-ldapiautodnsuffix", "cn=peercred,cn=external,cn=auth"); } - $ent->setValues("nsslapd-ldapimaprootdn", $inf->{slapd}->{RootDN}); - $ent->setValues("nsslapd-ldapimaptoentries", "off"); - $ent->setValues("nsslapd-ldapiuidnumbertype", "uidNumber"); - $ent->setValues("nsslapd-ldapigidnumbertype", "gidNumber"); - $ent->setValues("nsslapd-ldapientrysearchbase", "dc=example, dc=com"); - $ent->setValues("nsslapd-ldapiautodnsuffix", "cn=peercred,cn=external,cn=auth"); if (!$conn->update($ent)) { $conn->close(); return ("error_enabling_feature", "ldapi", $conn->getErrorString()); From fedora-directory-commits at redhat.com Fri May 16 16:25:57 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 16 May 2008 12:25:57 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/ldif template-ldapi-default.ldif.in, 1.1, 1.2 Message-ID: <200805161625.m4GGPvxl019654@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/ldif In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19092/ldif Modified Files: template-ldapi-default.ldif.in Log Message: Resolves: #436400 Summary: LDAPI: cleaning up template-ldapi-default.ldif.in and DSCreate.pm.in Description: Separated auto-bind attributes from the ldapi attributes. Fixed to store auto-bind attributes in dsel.dif only when auto-bind is enabled. Index: template-ldapi-default.ldif.in =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/ldif/template-ldapi-default.ldif.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- template-ldapi-default.ldif.in 19 Jun 2007 18:24:57 -0000 1.1 +++ template-ldapi-default.ldif.in 16 May 2008 16:25:55 -0000 1.2 @@ -5,22 +5,4 @@ - replace: nsslapd-ldapilisten nsslapd-ldapilisten: off -- -replace: nsslapd-ldapimaprootdn -nsslapd-ldapimaprootdn: cn=Directory Manager -- -replace: nsslapd-ldapimaptoentries -nsslapd-ldapimaptoentries: off -- -replace: nsslapd-ldapiuidnumbertype -nsslapd-ldapiuidnumbertype: uidNumber -- -replace: nsslapd-ldapigidnumbertype -nsslapd-ldapigidnumbertype: gidNumber -- -replace: nsslapd-ldapientrysearchbase -nsslapd-ldapientrysearchbase: dc=example, dc=com -- -replace: nsslapd-ldapiautodnsuffix -nsslapd-ldapiautodnsuffix: cn=peercred,cn=external,cn=auth From fedora-directory-commits at redhat.com Fri May 16 16:46:52 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 16 May 2008 12:46:52 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd slap.h, 1.31, 1.32 getsocketpeer.c, 1.3, 1.4 daemon.c, 1.18, 1.19 bind.c, 1.11, 1.12 Message-ID: <200805161646.m4GGkq15020776@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20423 Modified Files: slap.h getsocketpeer.c daemon.c bind.c Log Message: Resolves: #436390 Summary: LDAPI: support auto-bind Description: 1) Debugged the basic code of slapd_get_socket_peer, which is used for Solaris9 and HP-UX. The recvmsg call returns an error immediately if no data is waiting to be received since the socket is set PR_SockOpt_Nonblocking (O_NONBLOCK). To make slapd_get_socket_peer more robust, we have to retry recvmsg if it returns EAGAIN. But set a retry count not to hang there. 2) Introduced c_local_valid in the Connection handle to tell the autobind code that the uid/gid pair is valid or not. 3) Stops the automagic/unconditional auto-bind (the code used to be in daemon.c). 4) Auto-bind is effective only when the client passes the SASL/EXTERNAL request. Index: slap.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slap.h,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- slap.h 3 Apr 2008 16:52:46 -0000 1.31 +++ slap.h 16 May 2008 16:46:49 -0000 1.32 @@ -1247,9 +1247,10 @@ int c_enable_sasl_io; /* Flag to tell us to enable SASL I/O on the next read */ int c_sasl_io; /* Flag to tell us to enable SASL I/O on the next read */ int c_sasl_ssf; /* flag to tell us the SASL SSF */ - int c_unix_local; /* flag true for LDAPI */ - uid_t c_local_uid; /* uid of connecting process */ - gid_t c_local_gid; /* gid of connecting process */ + int c_unix_local; /* flag true for LDAPI */ + int c_local_valid; /* flag true if the uid/gid are valid */ + uid_t c_local_uid; /* uid of connecting process */ + gid_t c_local_gid; /* gid of connecting process */ } Connection; #define CONN_FLAG_SSL 1 /* Is this connection an SSL connection or not ? * Used to direct I/O code when SSL is handled differently Index: getsocketpeer.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/getsocketpeer.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- getsocketpeer.c 27 Feb 2007 20:16:08 -0000 1.3 +++ getsocketpeer.c 16 May 2008 16:46:49 -0000 1.4 @@ -70,7 +70,7 @@ } } -#elif 0 /*defined(HAVE_GETPEERUCRED)*/ /* solaris */ +#elif defined(HAVE_GETPEERUCRED) /* solaris10 */ ucred_t *creds = 0; @@ -78,15 +78,15 @@ { if(uid) { - uid = ucred_getruid(creds); + *uid = ucred_getruid(creds); if(-1 != uid) ret = 0; } if(gid) { - gid = ucred_getrgid(creds); - if(-1 == gid) + *gid = ucred_getrgid(creds); + if(-1 == *gid) ret = -1; else ret = 0; @@ -95,44 +95,61 @@ ucred_free(creds); } -#elif 0 /* defined(HAVE_GETPEEREID) */ /* osx / some BSDs */ +#elif defined(HAVE_GETPEEREID) /* osx / some BSDs */ if(0 == getpeereid(fd, &uid, &gid)) ret = 0; -#elif 0 /* hpux / some BSDs - file descriptor cooperative auth */ - - struct msghdr msg; +#else /* hpux / Solaris9 / some BSDs - file descriptor cooperative auth */ +#include +#include +#include +#include + struct msghdr msg; struct iovec iov; char dummy[8]; - int fd[2]; + int pass_sd[2]; + int rc = 0; + unsigned int retrycnt = 0xffffffff; /* safety net */ + int myerrno = 0; - memset(msg, 0, sizeof(msg)); + memset((void *)&msg, 0, sizeof(msg)); iov.iov_base = dummy; iov.iov_len = sizeof(dummy); msg.msg_iov = &iov; msg.msg_iovlen = 1; - msg.msg_accrights = (char*)fd; - msg.msg_accrightslen = sizeof(fd); + msg.msg_accrights = (caddr_t)&pass_sd; + msg.msg_accrightslen = sizeof(pass_sd); /* Initialize it with 8 bytes. + If recvmsg is successful, + 4 is supposed to be returned. */ + /* + Since PR_SockOpt_Nonblocking is set to the socket, + recvmsg returns immediately if no data is waiting to be received. + If recvmsg returns an error and EGAIN (== EWOULDBLOCK) is set to errno, + we should retry some time. + */ + while ((rc = recvmsg(fd, &msg, MSG_PEEK)) < 0 && (EAGAIN == (myerrno = errno)) && retrycnt-- >= 0) + ; - if(recvmsg(fd, &msg, MSG_PEEK) >= 0 && msg.msg_accrightslen == sizeof(int)) - { + if (rc >= 0 && msg.msg_accrightslen == sizeof(int)) + { struct stat st; - ret = fstat(fd[0], &st); - close(fd[0]); + ret = fstat(pass_sd[0], &st); if(0 == ret && S_ISFIFO(st.st_mode) && - 0 == st.st_mode & (S_IRWXG|S_IRWXO)) + 0 == (st.st_mode & (S_IRWXG|S_IRWXO))) { if(uid) - uid = st.st_uid; + *uid = st.st_uid; if(gid) - gid = st.st_gid; + *gid = st.st_gid; + } else { + ret = -1; } - } + } #endif Index: daemon.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/daemon.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- daemon.c 14 Nov 2007 20:18:53 -0000 1.18 +++ daemon.c 16 May 2008 16:46:49 -0000 1.19 @@ -1963,11 +1963,13 @@ int ret = -1; uid_t uid = 0; gid_t gid = 0; + conn->c_local_valid = 0; if(0 == slapd_get_socket_peer(conn->c_prfd, &uid, &gid)) { conn->c_local_uid = uid; conn->c_local_gid = gid; + conn->c_local_valid = 1; ret = 0; } @@ -1983,6 +1985,11 @@ uid_t uid = conn->c_local_uid; gid_t gid = conn->c_local_gid; + if (!conn->c_local_valid) + { + goto bail; + } + /* observe configuration for auto binding */ /* bind at all? */ if(config_get_ldapi_bind_switch()) @@ -2338,16 +2345,12 @@ #if defined(ENABLE_LDAPI) #if !defined( XP_WIN32 ) - /* ldapi */ - if( local ) - { - conn->c_unix_local = 1; + /* ldapi */ + if( local ) + { + conn->c_unix_local = 1; slapd_identify_local_user(conn); - -#if defined(ENABLE_AUTOBIND) - slapd_bind_local_user(conn); -#endif /* ENABLE_AUTOBIND */ - } + } #endif #endif /* ENABLE_LDAPI */ Index: bind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/bind.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- bind.c 18 Oct 2007 00:08:34 -0000 1.11 +++ bind.c 16 May 2008 16:46:49 -0000 1.12 @@ -259,20 +259,24 @@ bind_credentials_clear( pb->pb_conn, PR_FALSE, /* do not lock conn */ PR_FALSE /* do not clear external creds. */ ); +#if defined(ENABLE_AUTOBIND) /* LDAPI might have auto bind on, binding as anon should mean bind as self in this case */ -#if defined(ENABLE_AUTOBIND) - if((0 == dn || 0 == dn[0]) && pb->pb_conn->c_unix_local) + /* You are "bound" when the SSL connection is made, + but the client still passes a BIND SASL/EXTERNAL request. + */ + if((LDAP_AUTH_SASL == method) && + (0 == strcasecmp (saslmech, LDAP_SASL_EXTERNAL)) && + (0 == dn || 0 == dn[0]) && pb->pb_conn->c_unix_local) { slapd_bind_local_user(pb->pb_conn); - - if(pb->pb_conn->c_dn) - { + if(pb->pb_conn->c_dn) + { auto_bind = 1; /* flag the bind method */ - dn = slapi_ch_strdup(pb->pb_conn->c_dn); - slapi_sdn_init_dn_passin(&sdn,dn); - } + dn = slapi_ch_strdup(pb->pb_conn->c_dn); + slapi_sdn_init_dn_passin(&sdn,dn); + } } #endif /* ENABLE_AUTOBIND */ @@ -365,11 +369,17 @@ ids_sasl_check_bind(pb); goto free_and_return; } - else { - charray_free(supported); /* Avoid leaking */ - } + else { + charray_free(supported); /* Avoid leaking */ + } if (!strcasecmp (saslmech, LDAP_SASL_EXTERNAL)) { +#if defined(ENABLE_AUTOBIND) + if (1 == auto_bind) { + /* Already AUTO-BOUND */ + break; + } +#endif /* * if this is not an SSL connection, fail and return an * inappropriateAuth error. From fedora-directory-commits at redhat.com Fri May 16 17:34:26 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 16 May 2008 13:34:26 -0400 Subject: [Fedora-directory-commits] ldapserver Makefile.in, 1.85, 1.86 configure, 1.81, 1.82 aclocal.m4, 1.64, 1.65 Makefile.am, 1.65, 1.66 config.h.in, 1.14, 1.15 configure.ac, 1.46, 1.47 Message-ID: <200805161734.m4GHYQOS029336@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29293 Modified Files: Makefile.in configure aclocal.m4 Makefile.am config.h.in configure.ac Log Message: Resolves: #436388 Summary: LDAPI: introduce --enable-autobind to support AUTOBIND Description: --enable-autobind is supported. Unless it's set, the auto-bind code is not compiled in. Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.in,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- Makefile.in 27 Feb 2008 17:04:25 -0000 1.85 +++ Makefile.in 16 May 2008 17:34:23 -0000 1.86 @@ -855,7 +855,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_FALSE = @SOLARIS_FALSE@ @@ -902,6 +901,8 @@ debug_defs = @debug_defs@ defaultgroup = @defaultgroup@ defaultuser = @defaultuser@ +enable_autobind_FALSE = @enable_autobind_FALSE@ +enable_autobind_TRUE = @enable_autobind_TRUE@ enable_bitwise_FALSE = @enable_bitwise_FALSE@ enable_bitwise_TRUE = @enable_bitwise_TRUE@ enable_dna_FALSE = @enable_dna_FALSE@ @@ -1826,6 +1827,7 @@ #------------------------ @enable_ldapi_TRUE at GETSOCKETPEER = ldap/servers/slapd/getsocketpeer.c @enable_ldapi_TRUE at enable_ldapi = 1 + at enable_autobind_TRUE@enable_autobind = 1 ns_slapd_SOURCES = ldap/servers/slapd/abandon.c \ ldap/servers/slapd/auth.c \ ldap/servers/slapd/bind.c \ Index: configure =================================================================== RCS file: /cvs/dirsec/ldapserver/configure,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- configure 27 Feb 2008 17:04:25 -0000 1.81 +++ configure 16 May 2008 17:34:23 -0000 1.82 @@ -465,7 +465,7 @@ #endif" ac_default_prefix=/opt/$PACKAGE_NAME -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP! P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs BUNDLE_TRUE BUNDLE_FALSE enable_pam_passthru_TRUE enable_pam_passthru_FALSE enable_dna_TRUE enable_dna_FALSE enable_ldapi_TRUE enable_ldapi_FALSE enable_bitwise_TRUE enable_bitwise_FALSE with_fhs_opt configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir perldir infdir mibdir defaultuser defaultgroup instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir perlexec initconfigdir HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG PACKAGE_BASE_VERSION nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir sasl_path svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link brand capbrand vendor LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CX! XCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs BUNDLE_TRUE BUNDLE_FALSE enable_pam_passthru_TRUE enable_pam_passthru_FALSE enable_dna_TRUE enable_dna_FALSE enable_ldapi_TRUE enable_ldapi_FALSE enable_autobind_TRUE enable_autobind_FALSE enable_bitwise_TRUE enable_bitwise_FALSE with_fhs_opt configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir perldir infdir mibdir defaultuser defaultgroup instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir perlexec initconfigdir HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG PACKAGE_BASE_VERSION nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir sasl_path svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link brand capbrand vendor LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1046,6 +1046,8 @@ plugin (default: yes) --enable-ldapi enable LDAP over unix domain socket (LDAPI) support (default: yes) + --enable-autobind enable auto bind over unix domain socket (LDAPI) + support (default: no) --enable-bitwise enable the bitwise matching rule plugin (default: yes) @@ -3836,7 +3838,6 @@ done done done -IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris @@ -3871,7 +3872,6 @@ fi SED=$lt_cv_path_SED - echo "$as_me:$LINENO: result: $SED" >&5 echo "${ECHO_T}$SED" >&6 @@ -8347,31 +8347,10 @@ # before this can be enabled. hardcode_into_libs=yes - # find out which ABI we are using - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) - echo '#line 8354 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - ;; - esac - fi - rm -rf conftest* - ;; - esac - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -9248,7 +9227,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:11670: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11698: \$? = $ac_status" >&5 + echo "$as_me:11674: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11795,11 +11771,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11798: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11774: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11802: \$? = $ac_status" >&5 + echo "$as_me:11778: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12327,31 +12303,10 @@ # before this can be enabled. hardcode_into_libs=yes - # find out which ABI we are using - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) - echo '#line 12334 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - ;; - esac - fi - rm -rf conftest* - ;; - esac - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -12735,9 +12690,6 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC_CXX -gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` -gcc_ver=\`gcc -dumpversion\` - # An ERE matcher. EGREP=$lt_EGREP @@ -12871,11 +12823,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +predep_objects=$lt_predep_objects_CXX # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +postdep_objects=$lt_postdep_objects_CXX # Dependencies to place before the objects being linked to create a # shared library. @@ -12887,7 +12839,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +compiler_lib_search_path=$lt_compiler_lib_search_path_CXX # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -12967,7 +12919,7 @@ link_all_deplibs=$link_all_deplibs_CXX # Compile-time system search path for libraries -sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -13389,11 +13341,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13392: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13344: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13396: \$? = $ac_status" >&5 + echo "$as_me:13348: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13493,11 +13445,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13496: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13448: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13500: \$? = $ac_status" >&5 + echo "$as_me:13452: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14938,31 +14890,10 @@ # before this can be enabled. hardcode_into_libs=yes - # find out which ABI we are using - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) - echo '#line 14945 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - ;; - esac - fi - rm -rf conftest* - ;; - esac - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -15346,9 +15277,6 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC_F77 -gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` -gcc_ver=\`gcc -dumpversion\` - # An ERE matcher. EGREP=$lt_EGREP @@ -15482,11 +15410,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +predep_objects=$lt_predep_objects_F77 # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +postdep_objects=$lt_postdep_objects_F77 # Dependencies to place before the objects being linked to create a # shared library. @@ -15498,7 +15426,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +compiler_lib_search_path=$lt_compiler_lib_search_path_F77 # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -15578,7 +15506,7 @@ link_all_deplibs=$link_all_deplibs_F77 # Compile-time system search path for libraries -sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -15720,11 +15648,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15723: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15651: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15727: \$? = $ac_status" >&5 + echo "$as_me:15655: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15988,11 +15916,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15991: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15919: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15995: \$? = $ac_status" >&5 + echo "$as_me:15923: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16092,11 +16020,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16095: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16023: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16099: \$? = $ac_status" >&5 + echo "$as_me:16027: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17557,31 +17485,10 @@ # before this can be enabled. hardcode_into_libs=yes - # find out which ABI we are using - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) - echo '#line 17564 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - ;; - esac - fi - rm -rf conftest* - ;; - esac - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -17965,9 +17872,6 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC_GCJ -gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` -gcc_ver=\`gcc -dumpversion\` - # An ERE matcher. EGREP=$lt_EGREP @@ -18101,11 +18005,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +predep_objects=$lt_predep_objects_GCJ # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +postdep_objects=$lt_postdep_objects_GCJ # Dependencies to place before the objects being linked to create a # shared library. @@ -18117,7 +18021,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -18197,7 +18101,7 @@ link_all_deplibs=$link_all_deplibs_GCJ # Compile-time system search path for libraries -sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -18449,9 +18353,6 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC_RC -gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` -gcc_ver=\`gcc -dumpversion\` - # An ERE matcher. EGREP=$lt_EGREP @@ -18585,11 +18486,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +predep_objects=$lt_predep_objects_RC # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +postdep_objects=$lt_postdep_objects_RC # Dependencies to place before the objects being linked to create a # shared library. @@ -18601,7 +18502,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +compiler_lib_search_path=$lt_compiler_lib_search_path_RC # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -18681,7 +18582,7 @@ link_all_deplibs=$link_all_deplibs_RC # Compile-time system search path for libraries -sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -23019,6 +22920,39 @@ fi +if test -z "$enable_autobind" ; then + enable_autobind=no # if not set on cmdline, set default +fi +echo "$as_me:$LINENO: checking for --enable-autobind" >&5 +echo $ECHO_N "checking for --enable-autobind... $ECHO_C" >&6 +# Check whether --enable-autobind or --disable-autobind was given. +if test "${enable_autobind+set}" = set; then + enableval="$enable_autobind" + +fi; +if test "$enable_ldapi" = yes -a "$enable_autobind" = yes ; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + +cat >>confdefs.h <<\_ACEOF +#define ENABLE_AUTOBIND 1 +_ACEOF + +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + +if test "$enable_autobind" = "yes"; then + enable_autobind_TRUE= + enable_autobind_FALSE='#' +else + enable_autobind_TRUE='#' + enable_autobind_FALSE= +fi + + if test -z "$enable_bitwise" ; then enable_bitwise=yes # if not set on cmdline, set default fi @@ -25447,6 +25381,13 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${enable_autobind_TRUE}" && test -z "${enable_autobind_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"enable_autobind\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"enable_autobind\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${enable_bitwise_TRUE}" && test -z "${enable_bitwise_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"enable_bitwise\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -26062,7 +26003,6 @@ s, at CCDEPMODE@,$CCDEPMODE,;t t s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t -s, at SED@,$SED,;t t s, at EGREP@,$EGREP,;t t s, at LN_S@,$LN_S,;t t s, at ECHO@,$ECHO,;t t @@ -26086,6 +26026,8 @@ s, at enable_dna_FALSE@,$enable_dna_FALSE,;t t s, at enable_ldapi_TRUE@,$enable_ldapi_TRUE,;t t s, at enable_ldapi_FALSE@,$enable_ldapi_FALSE,;t t +s, at enable_autobind_TRUE@,$enable_autobind_TRUE,;t t +s, at enable_autobind_FALSE@,$enable_autobind_FALSE,;t t s, at enable_bitwise_TRUE@,$enable_bitwise_TRUE,;t t s, at enable_bitwise_FALSE@,$enable_bitwise_FALSE,;t t s, at with_fhs_opt@,$with_fhs_opt,;t t Index: aclocal.m4 =================================================================== RCS file: /cvs/dirsec/ldapserver/aclocal.m4,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- aclocal.m4 27 Feb 2008 17:04:25 -0000 1.64 +++ aclocal.m4 16 May 2008 17:34:23 -0000 1.65 @@ -1578,27 +1578,10 @@ # before this can be enabled. hardcode_into_libs=yes - # find out which ABI we are using - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) - echo '[#]line __oline__ "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - ;; - esac - fi - rm -rf conftest* - ;; - esac - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -4305,9 +4288,6 @@ # Is the compiler the GNU C compiler? with_gcc=$_LT_AC_TAGVAR(GCC, $1) -gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` -gcc_ver=\`gcc -dumpversion\` - # An ERE matcher. EGREP=$lt_EGREP @@ -4441,11 +4421,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) # Dependencies to place before the objects being linked to create a # shared library. @@ -4457,7 +4437,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -4537,7 +4517,7 @@ link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) # Compile-time system search path for libraries -sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -6373,7 +6353,6 @@ done done done -IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris @@ -6406,7 +6385,6 @@ done ]) SED=$lt_cv_path_SED -AC_SUBST([SED]) AC_MSG_RESULT([$SED]) ]) Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.am,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- Makefile.am 19 Feb 2008 06:04:55 -0000 1.65 +++ Makefile.am 16 May 2008 17:34:23 -0000 1.66 @@ -938,6 +938,9 @@ GETSOCKETPEER=ldap/servers/slapd/getsocketpeer.c enable_ldapi = 1 endif +if enable_autobind + enable_autobind = 1 +endif ns_slapd_SOURCES = ldap/servers/slapd/abandon.c \ ldap/servers/slapd/auth.c \ Index: config.h.in =================================================================== RCS file: /cvs/dirsec/ldapserver/config.h.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- config.h.in 27 Feb 2008 16:59:11 -0000 1.14 +++ config.h.in 16 May 2008 17:34:23 -0000 1.15 @@ -12,6 +12,9 @@ /* cpu type sparc */ #undef CPU_sparc +/* enable ldapi auto bind support in the server */ +#undef ENABLE_AUTOBIND + /* enable the bitwise plugin */ #undef ENABLE_BITWISE Index: configure.ac =================================================================== RCS file: /cvs/dirsec/ldapserver/configure.ac,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- configure.ac 27 Feb 2008 16:59:11 -0000 1.46 +++ configure.ac 16 May 2008 17:34:23 -0000 1.47 @@ -121,6 +121,21 @@ fi AM_CONDITIONAL(enable_ldapi,test "$enable_ldapi" = "yes") +if test -z "$enable_autobind" ; then + enable_autobind=no # if not set on cmdline, set default +fi +AC_MSG_CHECKING(for --enable-autobind) +AC_ARG_ENABLE(autobind, + AS_HELP_STRING([--enable-autobind], + [enable auto bind over unix domain socket (LDAPI) support (default: no)])) +if test "$enable_ldapi" = yes -a "$enable_autobind" = yes ; then + AC_MSG_RESULT(yes) + AC_DEFINE([ENABLE_AUTOBIND], [1], [enable ldapi auto bind support in the server]) +else + AC_MSG_RESULT(no) +fi +AM_CONDITIONAL(enable_autobind,test "$enable_autobind" = "yes") + if test -z "$enable_bitwise" ; then enable_bitwise=yes # if not set on cmdline, set default fi From fedora-directory-commits at redhat.com Fri May 16 20:39:13 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 16 May 2008 16:39:13 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd daemon.c, 1.19, 1.20 Message-ID: <200805162039.m4GKdD1h025288@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25259 Modified Files: daemon.c Log Message: Resolves: #436390 Summary: LDAPI: support auto-bind Description: String representation of socktype was not set correctly when the socktype was PR_AF_LOCAL. Index: daemon.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/daemon.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- daemon.c 16 May 2008 16:46:49 -0000 1.19 +++ daemon.c 16 May 2008 20:39:11 -0000 1.20 @@ -2741,7 +2741,7 @@ char *logname = "createprlistensockets"; int sockcnt = 0; int socktype; - char *socktype_s = NULL; + char *socktype_str = NULL; PRNetAddr **lap; int i; @@ -2749,13 +2749,6 @@ PR_ASSERT( listenaddr != NULL ); -#if defined(ENABLE_LDAPI) - if(local) { /* ldapi */ - socktype = PR_AF_LOCAL; - socktype_s = "PR_AF_LOCAL"; - } -#endif - /* need to know the count */ sockcnt = 0; for (lap = listenaddr; lap && *lap; lap++) { @@ -2773,16 +2766,21 @@ for (i = 0, lap = listenaddr; lap && *lap && i < sockcnt; i++, lap++) { /* create TCP socket */ socktype = PR_NetAddrFamily(*lap); +#if defined(ENABLE_LDAPI) + if (PR_AF_LOCAL == socktype) { + socktype_str = "PR_AF_LOCAL"; + } else +#endif if (PR_AF_INET6 == socktype) { - socktype_s = "PR_AF_INET6"; + socktype_str = "PR_AF_INET6"; } else { - socktype_s = "PR_AF_INET"; + socktype_str = "PR_AF_INET"; } if ((sock[i] = PR_OpenTCPSocket(socktype)) == SLAPD_INVALID_SOCKET) { prerr = PR_GetError(); slapi_log_error(SLAPI_LOG_FATAL, logname, "PR_OpenTCPSocket(%s) failed: %s error %d (%s)\n", - socktype_s, + socktype_str, SLAPI_COMPONENT_NAME_NSPR, prerr, slapd_pr_strerror(prerr)); goto failed; } From fedora-directory-commits at redhat.com Wed May 28 03:00:35 2008 From: fedora-directory-commits at redhat.com (Jack Magne (jmagne)) Date: Tue, 27 May 2008 23:00:35 -0400 Subject: [Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc ESC.js, 1.16, 1.17 Message-ID: <200805280300.m4S30ZX1029806@cvs-int.fedora.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29771 Modified Files: ESC.js Log Message: ON Mac get cached phone home url if it can't be read off the token. Index: ESC.js =================================================================== RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/ESC.js,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ESC.js 4 Mar 2008 23:39:54 -0000 1.16 +++ ESC.js 28 May 2008 03:00:33 -0000 1.17 @@ -3639,7 +3639,7 @@ if(!url || url.length < 10) // Check for bogus junk { - recordMessage("Bogus url found ...."); + recordMessage("Bogus url found .... " + url); url = null; Sleep(250); recordMessage("Going to try again... "); @@ -3650,7 +3650,6 @@ tries ++; } - if(url) { var issuer_config_value = ConfigValueWithKeyID(keyID,KEY_ISSUER_URL); @@ -3684,10 +3683,25 @@ var issuer_config_value_exp = ConfigValueWithKeyID(keyID,KEY_ISSUER_URL); var result_exp = DoCoolKeySetConfigValue(issuer_config_value_exp,url); } + + if(isMac && !url) { + var phoneHomeUrl = GetCachedPhoneHomeURL(keyID); + if(phoneHomeUrl) { + url = phoneHomeUrl; + } + + } recordMessage("From exception returning " + url); return url; } + if(isMac && !url) { + var phoneHomeUrl = GetCachedPhoneHomeURL(keyID); + if(phoneHomeUrl) { + url = phoneHomeUrl; + } + } + return url; } From fedora-directory-commits at redhat.com Fri May 30 15:39:02 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 30 May 2008 11:39:02 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd slapi-plugin.h, 1.20, 1.21 Message-ID: <200805301539.m4UFd2Fj014981@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14919/ldapserver/ldap/servers/slapd Modified Files: slapi-plugin.h Log Message: bump version to 1.1.1 - add define for new public slapi task interface Index: slapi-plugin.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slapi-plugin.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- slapi-plugin.h 3 Apr 2008 16:52:46 -0000 1.20 +++ slapi-plugin.h 30 May 2008 15:39:00 -0000 1.21 @@ -151,6 +151,7 @@ typedef struct slapi_componentid Slapi_ComponentId; /* Online tasks interface (to support import, export, etc) */ +#define SLAPI_TASK_PUBLIC 1 /* tell old plugins that the task api is now public */ typedef struct slapi_task Slapi_Task; typedef void (*TaskCallbackFn)(Slapi_Task *task); From fedora-directory-commits at redhat.com Fri May 30 15:39:02 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 30 May 2008 11:39:02 -0400 Subject: [Fedora-directory-commits] ldapserver configure.ac, 1.47, 1.48 Makefile.am, 1.66, 1.67 config.h.in, 1.15, 1.16 aclocal.m4, 1.65, 1.66 configure, 1.82, 1.83 missing, 1.49, 1.50 install-sh, 1.49, 1.50 depcomp, 1.49, 1.50 compile, 1.46, 1.47 config.sub, 1.48, 1.49 config.guess, 1.48, 1.49 Makefile.in, 1.86, 1.87 Message-ID: <200805301539.m4UFd22k014970@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14919/ldapserver Modified Files: configure.ac Makefile.am config.h.in aclocal.m4 configure missing install-sh depcomp compile config.sub config.guess Makefile.in Log Message: bump version to 1.1.1 - add define for new public slapi task interface Index: configure.ac =================================================================== RCS file: /cvs/dirsec/ldapserver/configure.ac,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- configure.ac 16 May 2008 17:34:23 -0000 1.47 +++ configure.ac 30 May 2008 15:38:59 -0000 1.48 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) # This version is the version returned by ns-slapd -v -AC_INIT([dirsrv], [1.1.0], [http://bugzilla.redhat.com/]) +AC_INIT([dirsrv], [1.1.1], [http://bugzilla.redhat.com/]) # AC_CONFIG_HEADER must be called right after AC_INIT. AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([1.9 foreign subdir-objects]) Index: aclocal.m4 =================================================================== RCS file: /cvs/dirsec/ldapserver/aclocal.m4,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- aclocal.m4 16 May 2008 17:34:23 -0000 1.65 +++ aclocal.m4 30 May 2008 15:38:59 -0000 1.66 @@ -1578,10 +1578,27 @@ # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '[#]line __oline__ "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -4288,6 +4305,9 @@ # Is the compiler the GNU C compiler? with_gcc=$_LT_AC_TAGVAR(GCC, $1) +gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +gcc_ver=\`gcc -dumpversion\` + # An ERE matcher. EGREP=$lt_EGREP @@ -4421,11 +4441,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) +predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) +postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place before the objects being linked to create a # shared library. @@ -4437,7 +4457,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) +compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -4517,7 +4537,7 @@ link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) # Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -6353,6 +6373,7 @@ done done done +IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris @@ -6385,6 +6406,7 @@ done ]) SED=$lt_cv_path_SED +AC_SUBST([SED]) AC_MSG_RESULT([$SED]) ]) Index: configure =================================================================== RCS file: /cvs/dirsec/ldapserver/configure,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- configure 16 May 2008 17:34:23 -0000 1.82 +++ configure 30 May 2008 15:38:59 -0000 1.83 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for dirsrv 1.1.0. +# Generated by GNU Autoconf 2.59 for dirsrv 1.1.1. # # Report bugs to . # @@ -423,8 +423,8 @@ # Identity of this package. PACKAGE_NAME='dirsrv' PACKAGE_TARNAME='dirsrv' -PACKAGE_VERSION='1.1.0' -PACKAGE_STRING='dirsrv 1.1.0' +PACKAGE_VERSION='1.1.1' +PACKAGE_STRING='dirsrv 1.1.1' PACKAGE_BUGREPORT='http://bugzilla.redhat.com/' # Factoring default headers for most tests. @@ -465,7 +465,7 @@ #endif" ac_default_prefix=/opt/$PACKAGE_NAME -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CX! XCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs BUNDLE_TRUE BUNDLE_FALSE enable_pam_passthru_TRUE enable_pam_passthru_FALSE enable_dna_TRUE enable_dna_FALSE enable_ldapi_TRUE enable_ldapi_FALSE enable_autobind_TRUE enable_autobind_FALSE enable_bitwise_TRUE enable_bitwise_FALSE with_fhs_opt configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir perldir infdir mibdir defaultuser defaultgroup instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir perlexec initconfigdir HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG PACKAGE_BASE_VERSION nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir sasl_path svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link brand capbrand vendor LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP! P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs BUNDLE_TRUE BUNDLE_FALSE enable_pam_passthru_TRUE enable_pam_passthru_FALSE enable_dna_TRUE enable_dna_FALSE enable_ldapi_TRUE enable_ldapi_FALSE enable_autobind_TRUE enable_autobind_FALSE enable_bitwise_TRUE enable_bitwise_FALSE with_fhs_opt configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir perldir infdir mibdir defaultuser defaultgroup instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir perlexec initconfigdir HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG PACKAGE_BASE_VERSION nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir sasl_path svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link brand capbrand vendor LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -954,7 +954,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures dirsrv 1.1.0 to adapt to many kinds of systems. +\`configure' configures dirsrv 1.1.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1020,7 +1020,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dirsrv 1.1.0:";; + short | recursive ) echo "Configuration of dirsrv 1.1.1:";; esac cat <<\_ACEOF @@ -1203,7 +1203,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -dirsrv configure 1.1.0 +dirsrv configure 1.1.1 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1217,7 +1217,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by dirsrv $as_me 1.1.0, which was +It was created by dirsrv $as_me 1.1.1, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1863,7 +1863,7 @@ # Define the identity of the package. PACKAGE='dirsrv' - VERSION='1.1.0' + VERSION='1.1.1' cat >>confdefs.h <<_ACEOF @@ -3838,6 +3838,7 @@ done done done +IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris @@ -3872,6 +3873,7 @@ fi SED=$lt_cv_path_SED + echo "$as_me:$LINENO: result: $SED" >&5 echo "${ECHO_T}$SED" >&6 @@ -4312,7 +4314,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4315 "configure"' > conftest.$ac_ext + echo '#line 4317 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5447,7 +5449,7 @@ # Provide some information about the compiler. -echo "$as_me:5450:" \ +echo "$as_me:5452:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -6510,11 +6512,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6513: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6515: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6517: \$? = $ac_status" >&5 + echo "$as_me:6519: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6778,11 +6780,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6781: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6783: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6785: \$? = $ac_status" >&5 + echo "$as_me:6787: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6882,11 +6884,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6885: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6887: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6889: \$? = $ac_status" >&5 + echo "$as_me:6891: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8347,10 +8349,31 @@ # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 8356 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -9227,7 +9250,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:11696: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11674: \$? = $ac_status" >&5 + echo "$as_me:11700: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11771,11 +11797,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11774: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11800: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11778: \$? = $ac_status" >&5 + echo "$as_me:11804: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12303,10 +12329,31 @@ # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 12336 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -12690,6 +12737,9 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC_CXX +gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +gcc_ver=\`gcc -dumpversion\` + # An ERE matcher. EGREP=$lt_EGREP @@ -12823,11 +12873,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=$lt_predep_objects_CXX +predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=$lt_postdep_objects_CXX +postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place before the objects being linked to create a # shared library. @@ -12839,7 +12889,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_CXX +compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -12919,7 +12969,7 @@ link_all_deplibs=$link_all_deplibs_CXX # Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -13341,11 +13391,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13344: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13394: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13348: \$? = $ac_status" >&5 + echo "$as_me:13398: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13445,11 +13495,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13448: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13498: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13452: \$? = $ac_status" >&5 + echo "$as_me:13502: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14890,10 +14940,31 @@ # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 14947 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -15277,6 +15348,9 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC_F77 +gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +gcc_ver=\`gcc -dumpversion\` + # An ERE matcher. EGREP=$lt_EGREP @@ -15410,11 +15484,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=$lt_predep_objects_F77 +predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=$lt_postdep_objects_F77 +postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place before the objects being linked to create a # shared library. @@ -15426,7 +15500,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_F77 +compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -15506,7 +15580,7 @@ link_all_deplibs=$link_all_deplibs_F77 # Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -15648,11 +15722,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15651: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15725: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15655: \$? = $ac_status" >&5 + echo "$as_me:15729: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15916,11 +15990,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15919: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15993: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15923: \$? = $ac_status" >&5 + echo "$as_me:15997: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16020,11 +16094,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16023: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16097: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16027: \$? = $ac_status" >&5 + echo "$as_me:16101: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17485,10 +17559,31 @@ # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 17566 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -17872,6 +17967,9 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC_GCJ +gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +gcc_ver=\`gcc -dumpversion\` + # An ERE matcher. EGREP=$lt_EGREP @@ -18005,11 +18103,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=$lt_predep_objects_GCJ +predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=$lt_postdep_objects_GCJ +postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place before the objects being linked to create a # shared library. @@ -18021,7 +18119,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ +compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -18101,7 +18199,7 @@ link_all_deplibs=$link_all_deplibs_GCJ # Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -18353,6 +18451,9 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC_RC +gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +gcc_ver=\`gcc -dumpversion\` + # An ERE matcher. EGREP=$lt_EGREP @@ -18486,11 +18587,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=$lt_predep_objects_RC +predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=$lt_postdep_objects_RC +postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place before the objects being linked to create a # shared library. @@ -18502,7 +18603,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_RC +compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -18582,7 +18683,7 @@ link_all_deplibs=$link_all_deplibs_RC # Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -25687,7 +25788,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by dirsrv $as_me 1.1.0, which was +This file was extended by dirsrv $as_me 1.1.1, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25750,7 +25851,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -dirsrv config.status 1.1.0 +dirsrv config.status 1.1.1 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -26003,6 +26104,7 @@ s, at CCDEPMODE@,$CCDEPMODE,;t t s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t +s, at SED@,$SED,;t t s, at EGREP@,$EGREP,;t t s, at LN_S@,$LN_S,;t t s, at ECHO@,$ECHO,;t t Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.in,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- Makefile.in 16 May 2008 17:34:23 -0000 1.86 +++ Makefile.in 30 May 2008 15:38:59 -0000 1.87 @@ -855,6 +855,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_FALSE = @SOLARIS_FALSE@