* modules/ldap/util_ldap.c, modules/aaa/mod_authnz_ldap.c: Stop using (264efd47) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

modules/aaa/mod_authnz_ldap.c

+44 −44

Changes for modules/aaa/mod_authnz_ldap.c: 44 added lines, 44 removed lines.
Original line number	Diff line number	Diff line
		@@ -365,24 +365,24 @@ start_over:
		sec->secure);
		}
		else {
		ap_log_rerror(APLOG_MARK, APLOG_WARNING\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
		"[%d] auth_ldap authenticate: no sec->host - weird...?", getpid());
		return AUTH_GENERAL_ERROR;
		}

		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
		"[%d] auth_ldap authenticate: using URL %s", getpid(), sec->url);

		/* Get the password that the client sent */
		if (password == NULL) {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
		"[%d] auth_ldap authenticate: no password specified", getpid());
		util_ldap_connection_close(ldc);
		return AUTH_GENERAL_ERROR;
		}

		if (user == NULL) {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
		"[%d] auth_ldap authenticate: no user specified", getpid());
		util_ldap_connection_close(ldc);
		return AUTH_GENERAL_ERROR;
		@@ -405,7 +405,7 @@ start_over:

		/* handle bind failure */
		if (result != LDAP_SUCCESS) {
		ap_log_rerror(APLOG_MARK, APLOG_WARNING\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
		"[%d] auth_ldap authenticate: "
		"user %s authentication failed; URI %s [%s][%s]",
		getpid(), user, r->uri, ldc->reason, ldap_err2string(result));
		@@ -442,7 +442,7 @@ start_over:
		}
		}

		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
		"[%d] auth_ldap authenticate: accepting %s", getpid(), user);

		return AUTH_GRANTED;
		@@ -506,7 +506,7 @@ static int authz_ldap_check_user_access(request_rec *r)
		apr_pool_cleanup_null);
		}
		else {
		ap_log_rerror(APLOG_MARK, APLOG_WARNING\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
		"[%d] auth_ldap authorise: no sec->host - weird...?", getpid());
		return sec->auth_authoritative? HTTP_UNAUTHORIZED : DECLINED;
		}
		@@ -530,7 +530,7 @@ static int authz_ldap_check_user_access(request_rec *r)
		}

		if (!reqs_arr) {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
		"[%d] auth_ldap authorise: no requirements array", getpid());
		return sec->auth_authoritative? HTTP_UNAUTHORIZED : DECLINED;
		}
		@@ -543,13 +543,13 @@ static int authz_ldap_check_user_access(request_rec *r)

		/* Check that we have a userid to start with */
		if ((!r->user) \|\| (strlen(r->user) == 0)) {
		ap_log_rerror(APLOG_MARK, APLOG_WARNING\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
		"ldap authorize: Userid is blank, AuthType=%s",
		r->ap_auth_type);
		}

		if(!req) {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
		"ldap authorize: Creating LDAP req structure");

		/* Build the username filter */
		@@ -561,7 +561,7 @@ static int authz_ldap_check_user_access(request_rec *r)

		/* Search failed, log error and return failure */
		if(result != LDAP_SUCCESS) {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
		"auth_ldap authorise: User DN not found, %s", ldc->reason);
		return sec->auth_authoritative? HTTP_UNAUTHORIZED : DECLINED;
		}
		@@ -586,7 +586,7 @@ static int authz_ldap_check_user_access(request_rec *r)

		if (strcmp(w, "ldap-user") == 0) {
		if (req->dn == NULL \|\| strlen(req->dn) == 0) {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
		"[%d] auth_ldap authorise: "
		"require user: user's DN has not been defined; failing authorisation",
		getpid());
		@@ -599,13 +599,13 @@ static int authz_ldap_check_user_access(request_rec *r)
		result = util_ldap_cache_compare(r, ldc, sec->url, req->dn, sec->attribute, t);
		switch(result) {
		case LDAP_COMPARE_TRUE: {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
		"[%d] auth_ldap authorise: "
		"require user: authorisation successful", getpid());
		return OK;
		}
		default: {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
		"[%d] auth_ldap authorise: require user: "
		"authorisation failed [%s][%s]", getpid(),
		ldc->reason, ldap_err2string(result));
		@@ -619,13 +619,13 @@ static int authz_ldap_check_user_access(request_rec *r)
		result = util_ldap_cache_compare(r, ldc, sec->url, req->dn, sec->attribute, w);
		switch(result) {
		case LDAP_COMPARE_TRUE: {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
		"[%d] auth_ldap authorise: "
		"require user: authorisation successful", getpid());
		return OK;
		}
		default: {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
		"[%d] auth_ldap authorise: "
		"require user: authorisation failed [%s][%s]",
		getpid(), ldc->reason, ldap_err2string(result));
		@@ -635,7 +635,7 @@ static int authz_ldap_check_user_access(request_rec *r)
		}
		else if (strcmp(w, "ldap-dn") == 0) {
		if (req->dn == NULL \|\| strlen(req->dn) == 0) {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
		"[%d] auth_ldap authorise: "
		"require dn: user's DN has not been defined; failing authorisation",
		getpid());
		@@ -645,13 +645,13 @@ static int authz_ldap_check_user_access(request_rec *r)
		result = util_ldap_cache_comparedn(r, ldc, sec->url, req->dn, t, sec->compare_dn_on_server);
		switch(result) {
		case LDAP_COMPARE_TRUE: {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
		"[%d] auth_ldap authorise: "
		"require dn: authorisation successful", getpid());
		return OK;
		}
		default: {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
		"[%d] auth_ldap authorise: "
		"require dn \"%s\": LDAP error [%s][%s]",
		getpid(), t, ldc->reason, ldap_err2string(result));
		@@ -664,7 +664,7 @@ static int authz_ldap_check_user_access(request_rec *r)

		if (sec->group_attrib_is_dn) {
		if (req->dn == NULL \|\| strlen(req->dn) == 0) {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
		"[%d] auth_ldap authorise: require group: user's DN has not been defined; failing authorisation",
		getpid());
		return sec->auth_authoritative? HTTP_UNAUTHORIZED : DECLINED;
		@@ -678,12 +678,12 @@ static int authz_ldap_check_user_access(request_rec *r)
		}
		}

		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
		"[%d] auth_ldap authorise: require group: testing for group membership in \"%s\"",
		getpid(), t);

		for (i = 0; i < sec->groupattr->nelts; i++) {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
		"[%d] auth_ldap authorise: require group: testing for %s: %s (%s)", getpid(),
		ent[i].name, sec->group_attrib_is_dn ? req->dn : req->user, t);

		@@ -691,14 +691,14 @@ static int authz_ldap_check_user_access(request_rec *r)
		sec->group_attrib_is_dn ? req->dn : req->user);
		switch(result) {
		case LDAP_COMPARE_TRUE: {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
		"[%d] auth_ldap authorise: require group: "
		"authorisation successful (attribute %s) [%s][%s]",
		getpid(), ent[i].name, ldc->reason, ldap_err2string(result));
		return OK;
		}
		default: {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
		"[%d] auth_ldap authorise: require group \"%s\": "
		"authorisation failed [%s][%s]",
		getpid(), t, ldc->reason, ldap_err2string(result));
		@@ -711,21 +711,21 @@ static int authz_ldap_check_user_access(request_rec *r)
		w = ap_getword(r->pool, &t, '=');
		value = ap_getword_conf(r->pool, &t);

		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
		"[%d] auth_ldap authorise: checking attribute"
		" %s has value %s", getpid(), w, value);
		result = util_ldap_cache_compare(r, ldc, sec->url, req->dn,
		w, value);
		switch(result) {
		case LDAP_COMPARE_TRUE: {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG,
		0, r, "[%d] auth_ldap authorise: "
		"require attribute: authorisation "
		"successful", getpid());
		return OK;
		}
		default: {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG,
		0, r, "[%d] auth_ldap authorise: "
		"require attribute: authorisation "
		"failed [%s][%s]", getpid(),
		@@ -736,7 +736,7 @@ static int authz_ldap_check_user_access(request_rec *r)
		}
		else if (strcmp(w, "ldap-filter") == 0) {
		if (t[0]) {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
		"[%d] auth_ldap authorise: checking filter %s",
		getpid(), t);

		@@ -749,7 +749,7 @@ static int authz_ldap_check_user_access(request_rec *r)

		/* Make sure that the filtered search returned the correct user dn */
		if (result == LDAP_SUCCESS) {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
		"[%d] auth_ldap authorise: checking dn match %s",
		getpid(), dn);
		result = util_ldap_cache_comparedn(r, ldc, sec->url, req->dn, dn,
		@@ -758,14 +758,14 @@ static int authz_ldap_check_user_access(request_rec *r)

		switch(result) {
		case LDAP_COMPARE_TRUE: {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG,
		0, r, "[%d] auth_ldap authorise: "
		"require ldap-filter: authorisation "
		"successful", getpid());
		return OK;
		}
		case LDAP_FILTER_ERROR: {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG,
		0, r, "[%d] auth_ldap authorise: "
		"require ldap-filter: %s authorisation "
		"failed [%s][%s]", getpid(),
		@@ -773,7 +773,7 @@ static int authz_ldap_check_user_access(request_rec *r)
		break;
		}
		default: {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG,
		0, r, "[%d] auth_ldap authorise: "
		"require ldap-filter: authorisation "
		"failed [%s][%s]", getpid(),
		@@ -785,19 +785,19 @@ static int authz_ldap_check_user_access(request_rec *r)
		}

		if (!method_restricted) {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
		"[%d] auth_ldap authorise: agreeing because non-restricted",
		getpid());
		return OK;
		}

		if (!sec->auth_authoritative) {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
		"[%d] auth_ldap authorise: declining to authorise", getpid());
		return DECLINED;
		}

		ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
		"[%d] auth_ldap authorise: authorisation denied", getpid());
		ap_note_basic_auth_failure (r);

		@@ -820,7 +820,7 @@ static const char mod_auth_ldap_parse_url(cmd_parms cmd,

		authn_ldap_config_t *sec = config;

		ap_log_error(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0,
		ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,
		cmd->server, "[%d] auth_ldap url parse: `%s'", getpid(), url);

		rc = apr_ldap_url_parse(cmd->pool, url, &(urld), &(result));
		@@ -829,20 +829,20 @@ static const char mod_auth_ldap_parse_url(cmd_parms cmd,
		}
		sec->url = apr_pstrdup(cmd->pool, url);

		ap_log_error(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0,
		ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,
		cmd->server, "[%d] auth_ldap url parse: Host: %s", getpid(), urld->lud_host);
		ap_log_error(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0,
		ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,
		cmd->server, "[%d] auth_ldap url parse: Port: %d", getpid(), urld->lud_port);
		ap_log_error(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0,
		ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,
		cmd->server, "[%d] auth_ldap url parse: DN: %s", getpid(), urld->lud_dn);
		ap_log_error(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0,
		ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,
		cmd->server, "[%d] auth_ldap url parse: attrib: %s", getpid(), urld->lud_attrs? urld->lud_attrs[0] : "(null)");
		ap_log_error(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0,
		ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,
		cmd->server, "[%d] auth_ldap url parse: scope: %s", getpid(),
		(urld->lud_scope == LDAP_SCOPE_SUBTREE? "subtree" :
		urld->lud_scope == LDAP_SCOPE_BASE? "base" :
		urld->lud_scope == LDAP_SCOPE_ONELEVEL? "onelevel" : "unknown"));
		ap_log_error(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0,
		ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,
		cmd->server, "[%d] auth_ldap url parse: filter: %s", getpid(), urld->lud_filter);

		/* Set all the values, or at least some sane defaults */
		@@ -916,7 +916,7 @@ static const char mod_auth_ldap_parse_url(cmd_parms cmd,
		{
		sec->secure = APR_LDAP_SSL;
		sec->port = urld->lud_port? urld->lud_port : LDAPS_PORT;
		ap_log_error(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, cmd->server,
		ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, cmd->server,
		"LDAP: auth_ldap using SSL connections");
		}
		else
		@@ -1081,7 +1081,7 @@ static int authnz_ldap_post_config(apr_pool_t p, apr_pool_t plog, apr_pool_t *

		/* make sure that mod_ldap (util_ldap) is loaded */
		if (ap_find_linked_module("util_ldap.c") == NULL) {
		ap_log_error(APLOG_MARK, APLOG_ERR\|APLOG_NOERRNO, 0, s,
		ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
		"Module mod_ldap missing. Mod_ldap (aka. util_ldap) "
		"must be loaded in order for mod_auth_ldap to function properly");
		return HTTP_INTERNAL_SERVER_ERROR;

modules/ldap/util_ldap.c

+14 −15

Changes for modules/ldap/util_ldap.c: 14 added lines, 15 removed lines.
Original line number	Diff line number	Diff line
		@@ -73,8 +73,7 @@ static void util_ldap_strdup (char *str, const char newstr)
		}

		if (newstr) {
		*str = calloc(1, strlen(newstr)+1);
		strcpy (*str, newstr);
		*str = strdup(newstr);
		}
		}

		@@ -1299,7 +1298,7 @@ static const char util_ldap_set_cache_bytes(cmd_parms cmd, void *dummy,

		st->cache_bytes = atol(bytes);

		ap_log_error(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, cmd->server,
		ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, cmd->server,
		"[%" APR_PID_T_FMT "] ldap cache: Setting shared memory "
		" cache size to %" APR_SIZE_T_FMT " bytes.",
		getpid(), st->cache_bytes);
		@@ -1321,7 +1320,7 @@ static const char util_ldap_set_cache_file(cmd_parms cmd, void *dummy,
		st->cache_file = NULL;
		}

		ap_log_error(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, cmd->server,
		ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, cmd->server,
		"LDAP cache: Setting shared memory cache file to %s bytes.",
		st->cache_file);

		@@ -1337,7 +1336,7 @@ static const char util_ldap_set_cache_ttl(cmd_parms cmd, void *dummy,

		st->search_cache_ttl = atol(ttl) * 1000000;

		ap_log_error(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, cmd->server,
		ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, cmd->server,
		"[%d] ldap cache: Setting cache TTL to %ld microseconds.",
		getpid(), st->search_cache_ttl);

		@@ -1357,7 +1356,7 @@ static const char util_ldap_set_cache_entries(cmd_parms cmd, void *dummy,
		st->search_cache_size = 0;
		}

		ap_log_error(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, cmd->server,
		ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, cmd->server,
		"[%d] ldap cache: Setting search cache size to %ld entries.",
		getpid(), st->search_cache_size);

		@@ -1373,7 +1372,7 @@ static const char util_ldap_set_opcache_ttl(cmd_parms cmd, void *dummy,

		st->compare_cache_ttl = atol(ttl) * 1000000;

		ap_log_error(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, cmd->server,
		ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, cmd->server,
		"[%d] ldap cache: Setting operation cache TTL to %ld microseconds.",
		getpid(), st->compare_cache_ttl);

		@@ -1392,7 +1391,7 @@ static const char util_ldap_set_opcache_entries(cmd_parms cmd, void *dummy,
		st->compare_cache_size = 0;
		}

		ap_log_error(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, cmd->server,
		ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, cmd->server,
		"[%d] ldap cache: Setting operation cache size to %ld "
		"entries.", getpid(), st->compare_cache_size);

		@@ -1523,7 +1522,7 @@ static const char util_ldap_set_trusted_global_cert(cmd_parms cmd,
		return "Certificate type was not specified.";
		}

		ap_log_error(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, cmd->server,
		ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, cmd->server,
		"LDAP: SSL trusted global cert - %s (type %s)",
		file, type);

		@@ -1605,7 +1604,7 @@ static const char util_ldap_set_trusted_client_cert(cmd_parms cmd,
		return "Certificate type was not specified.";
		}

		ap_log_error(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, cmd->server,
		ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, cmd->server,
		"LDAP: SSL trusted client cert - %s (type %s)",
		file, type);

		@@ -1652,7 +1651,7 @@ static const char util_ldap_set_trusted_mode(cmd_parms cmd, void *dummy,
		(util_ldap_state_t *)ap_get_module_config(cmd->server->module_config,
		&ldap_module);

		ap_log_error(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, cmd->server,
		ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, cmd->server,
		"LDAP: SSL trusted mode - %s",
		mode);

		@@ -1683,7 +1682,7 @@ static const char util_ldap_set_verify_srv_cert(cmd_parms cmd,
		(util_ldap_state_t *)ap_get_module_config(cmd->server->module_config,
		&ldap_module);

		ap_log_error(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, cmd->server,
		ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, cmd->server,
		"LDAP: SSL verify server certificate - %s",
		mode?"TRUE":"FALSE");

		@@ -1709,7 +1708,7 @@ static const char util_ldap_set_connection_timeout(cmd_parms cmd,
		#ifdef LDAP_OPT_NETWORK_TIMEOUT
		st->connectionTimeout = atol(ttl);

		ap_log_error(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, cmd->server,
		ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, cmd->server,
		"[%d] ldap connection: Setting connection timeout to "
		"%ld seconds.", getpid(), st->connectionTimeout);
		#else
		@@ -1876,7 +1875,7 @@ static int util_ldap_post_config(apr_pool_t p, apr_pool_t plog,
		st_vhost->cache_shm = st->cache_shm;
		st_vhost->cache_rmm = st->cache_rmm;
		st_vhost->cache_file = st->cache_file;
		ap_log_error(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, result, s,
		ap_log_error(APLOG_MARK, APLOG_DEBUG, result, s,
		"LDAP merging Shared Cache conf: shm=0x%pp rmm=0x%pp "
		"for VHOST: %s", st->cache_shm, st->cache_rmm,
		s_vhost->server_hostname);
		@@ -1957,7 +1956,7 @@ static void util_ldap_child_init(apr_pool_t p, server_rec s)
		return;
		}
		else {
		ap_log_error(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, 0, s,
		ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
		"Initialisation of global mutex %s in child process %"
		APR_PID_T_FMT
		" successful.",