View | Details | Raw Unified | Return to bug 43459
Collapse All | Expand All

(-)a/bin/named/ldapdb.c (-4 / +15 lines)
 Lines 282-290   ldapdb_bind(const char *zone, struct ldapdb_data *data, LDAP **ldp) { Link Here 
282
	/* -- Start TLS. -- */
282
	/* -- Start TLS. -- */
283
#ifdef LDAPDB_TLS
283
#ifdef LDAPDB_TLS
284
	if (data->tls) {
284
	if (data->tls) {
285
	  ldap_start_tls_s(*ldp, NULL, NULL);
285
	  if ((rc = ldap_start_tls_s(*ldp, NULL, NULL)) == LDAP_SUCCESS) {
286
	  isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_CONTROL, ISC_LOG_DEBUG(2),
286
		isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_CONTROL, ISC_LOG_DEBUG(2),
287
					"LDAP sdb zone '%s': ldapdb_bind(): Started TLS", zone);
287
					  "LDAP sdb zone '%s': ldapdb_bind(): Started TLS", zone);
288
	  } else {
289
		char *msg = NULL;
290
		ldap_get_option(*ldp, LDAP_OPT_DIAGNOSTIC_MESSAGE, (void *)&msg);
291
		isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_CONTROL, ISC_LOG_ERROR,
292
					  "LDAP sdb zone '%s': ldapdb_bind(): ldap_start_tls_s() failed: %s",
293
					  zone, msg);
294
		ldap_memfree(msg);
295
296
		ldap_unbind_ext(*ldp, NULL, NULL);
297
		*ldp = NULL;
298
		goto try_bind_again;
299
	  }
288
	}
300
	}
289
#endif
301
#endif
290
	
302
	
291
- 

Return to bug 43459