* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 2016 */
+/* Copyright (c) University of Cambridge 1995 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
/* Many thanks to Stuart Lynne for contributing the original code for this
uschar *attr;
uschar **attrp;
-uschar *data = NULL;
+gstring * data = NULL;
uschar *dn = NULL;
uschar *host;
uschar **values;
int msgid;
int rc, ldap_rc, ldap_parse_rc;
int port;
-int ptr = 0;
int rescount = 0;
-int size = 0;
BOOL attribute_found = FALSE;
BOOL ldapi = FALSE;
DEBUG(D_lookup)
debug_printf("perform_ldap_search: ldap%s URL = \"%s\" server=%s port=%d "
"sizelimit=%d timelimit=%d tcplimit=%d\n",
- (search_type == SEARCH_LDAP_MULTIPLE)? "m" :
- (search_type == SEARCH_LDAP_DN)? "dn" :
- (search_type == SEARCH_LDAP_AUTH)? "auth" : "",
+ search_type == SEARCH_LDAP_MULTIPLE ? "m" :
+ search_type == SEARCH_LDAP_DN ? "dn" :
+ search_type == SEARCH_LDAP_AUTH ? "auth" : "",
ldap_url, server, s_port, sizelimit, timelimit, tcplimit);
/* Check if LDAP thinks the URL is a valid LDAP URL. We assume that if the LDAP
expects NULL later in ldap_init() to mean "default", annoyingly. In OpenLDAP
2.0.11 this has changed (it uses NULL). */
-if ((ludp->lud_host == NULL || ludp->lud_host[0] == 0) && server != NULL)
+if ((!ludp->lud_host || !ludp->lud_host[0]) && server)
{
host = server;
port = s_port;
else
{
host = US ludp->lud_host;
- if (host != NULL && host[0] == 0) host = NULL;
+ if (host && !host[0]) host = NULL;
port = ludp->lud_port;
}
error, except in the default case. (But lud_scheme doesn't seem to exist in
older libraries.) */
-if (host != NULL)
+if (host)
{
if ((host[0] == '/' || Ustrncmp(host, "%2F", 3) == 0))
{
porttext[0] = 0; /* Remove port from messages */
}
- #if defined LDAP_LIB_OPENLDAP2
+#if defined LDAP_LIB_OPENLDAP2
else if (strncmp(ludp->lud_scheme, "ldapi", 5) == 0)
{
*errmsg = string_sprintf("ldapi requires an absolute path (\"%s\" given)",
host);
goto RETURN_ERROR;
}
- #endif
+#endif
}
/* Count the attributes; we need this later to tell us how to format results */
-for (attrp = USS ludp->lud_attrs; attrp != NULL && *attrp != NULL; attrp++)
+for (attrp = USS ludp->lud_attrs; attrp && *attrp; attrp++)
attrs_requested++;
/* See if we can find a cached connection to this host. The port is not
(implying the library default), rather than to the empty string. Note that in
this case, there is no difference between ldap and ldapi. */
-for (lcp = ldap_connections; lcp != NULL; lcp = lcp->next)
+for (lcp = ldap_connections; lcp; lcp = lcp->next)
{
if ((host == NULL) != (lcp->host == NULL) ||
(host != NULL && strcmpic(lcp->host, host) != 0))
requests connection via a Unix socket. However, as far as I know, only OpenLDAP
supports the use of sockets, and the use of ldap_initialize(). */
-if (lcp == NULL)
+if (!lcp)
{
LDAP *ld;
- #ifdef LDAP_OPT_X_TLS_NEWCTX
+#ifdef LDAP_OPT_X_TLS_NEWCTX
int am_server = 0;
LDAP *ldsetctx;
- #else
+#else
LDAP *ldsetctx = NULL;
- #endif
+#endif
/* --------------------------- OpenLDAP ------------------------ */
non-existent). So we handle OpenLDAP differently here. Also, support for
ldapi seems to be OpenLDAP-only at present. */
- #ifdef LDAP_LIB_OPENLDAP2
+#ifdef LDAP_LIB_OPENLDAP2
/* We now need an empty string for the default host. Get some store in which
to build a URL for ldap_initialize(). In the ldapi case, it can't be bigger
int ch;
init_ptr = init_url + 8;
Ustrcpy(init_url, "ldapi://");
- while ((ch = *shost++) != 0)
- {
+ while ((ch = *shost++))
if (ch == '/')
- {
- Ustrncpy(init_ptr, "%2F", 3);
- init_ptr += 3;
- }
- else *init_ptr++ = ch;
- }
+ { Ustrncpy(init_ptr, "%2F", 3); init_ptr += 3; }
+ else
+ *init_ptr++ = ch;
*init_ptr = 0;
}
/* Call ldap_initialize() and check the result */
DEBUG(D_lookup) debug_printf("ldap_initialize with URL %s\n", init_url);
- rc = ldap_initialize(&ld, CS init_url);
- if (rc != LDAP_SUCCESS)
+ if ((rc = ldap_initialize(&ld, CS init_url)) != LDAP_SUCCESS)
{
*errmsg = string_sprintf("ldap_initialize: (error %d) URL \"%s\"\n",
rc, init_url);
/* For libraries other than OpenLDAP, use ldap_init(). */
- #else /* LDAP_LIB_OPENLDAP2 */
+#else /* LDAP_LIB_OPENLDAP2 */
ld = ldap_init(CS host, port);
- #endif /* LDAP_LIB_OPENLDAP2 */
+#endif /* LDAP_LIB_OPENLDAP2 */
/* -------------------------------------------------------------- */
/* Handle failure to initialize */
- if (ld == NULL)
+ if (!ld)
{
*errmsg = string_sprintf("failed to initialize for LDAP server %s%s - %s",
host, porttext, strerror(errno));
goto RETURN_ERROR;
}
- #ifdef LDAP_OPT_X_TLS_NEWCTX
+#ifdef LDAP_OPT_X_TLS_NEWCTX
ldsetctx = ld;
- #endif
+#endif
/* Set the TCP connect time limit if available. This is something that is
in Netscape SDK v4.1; I don't know about other libraries. */
- #ifdef LDAP_X_OPT_CONNECT_TIMEOUT
+#ifdef LDAP_X_OPT_CONNECT_TIMEOUT
if (tcplimit > 0)
{
int timeout1000 = tcplimit*1000;
int notimeout = LDAP_X_IO_TIMEOUT_NO_TIMEOUT;
ldap_set_option(ld, LDAP_X_OPT_CONNECT_TIMEOUT, (void *)¬imeout);
}
- #endif
+#endif
/* Set the TCP connect timeout. This works with OpenLDAP 2.2.14. */
- #ifdef LDAP_OPT_NETWORK_TIMEOUT
+#ifdef LDAP_OPT_NETWORK_TIMEOUT
if (tcplimit > 0)
ldap_set_option(ld, LDAP_OPT_NETWORK_TIMEOUT, (void *)timeoutptr);
- #endif
+#endif
/* I could not get TLS to work until I set the version to 3. That version
seems to be the default nowadays. The RFC is dated 1997, so I would hope
if (eldap_version < 0)
{
- #ifdef LDAP_VERSION3
+#ifdef LDAP_VERSION3
eldap_version = LDAP_VERSION3;
- #else
+#else
eldap_version = 2;
- #endif
+#endif
}
- #ifdef LDAP_OPT_PROTOCOL_VERSION
+#ifdef LDAP_OPT_PROTOCOL_VERSION
ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION, (void *)&eldap_version);
- #endif
+#endif
DEBUG(D_lookup) debug_printf("initialized for LDAP (v%d) server %s%s\n",
eldap_version, host, porttext);
/* If not using ldapi and TLS is available, set appropriate TLS options: hard
for "ldaps" and soft otherwise. */
- #ifdef LDAP_OPT_X_TLS
+#ifdef LDAP_OPT_X_TLS
if (!ldapi)
{
int tls_option;
- #ifdef LDAP_OPT_X_TLS_REQUIRE_CERT
- if (eldap_require_cert != NULL)
+# ifdef LDAP_OPT_X_TLS_REQUIRE_CERT
+ if (eldap_require_cert)
{
- tls_option = LDAP_OPT_X_TLS_NEVER;
- if (Ustrcmp(eldap_require_cert, "hard") == 0)
- {
- tls_option = LDAP_OPT_X_TLS_HARD;
- }
- else if (Ustrcmp(eldap_require_cert, "demand") == 0)
- {
- tls_option = LDAP_OPT_X_TLS_DEMAND;
- }
- else if (Ustrcmp(eldap_require_cert, "allow") == 0)
- {
- tls_option = LDAP_OPT_X_TLS_ALLOW;
- }
- else if (Ustrcmp(eldap_require_cert, "try") == 0)
- {
- tls_option = LDAP_OPT_X_TLS_TRY;
- }
+ tls_option =
+ Ustrcmp(eldap_require_cert, "hard") == 0 ? LDAP_OPT_X_TLS_HARD
+ : Ustrcmp(eldap_require_cert, "demand") == 0 ? LDAP_OPT_X_TLS_DEMAND
+ : Ustrcmp(eldap_require_cert, "allow") == 0 ? LDAP_OPT_X_TLS_ALLOW
+ : Ustrcmp(eldap_require_cert, "try") == 0 ? LDAP_OPT_X_TLS_TRY
+ : LDAP_OPT_X_TLS_NEVER;
+
DEBUG(D_lookup)
debug_printf("Require certificate overrides LDAP_OPT_X_TLS option (%d)\n",
tls_option);
}
else
- #endif /* LDAP_OPT_X_TLS_REQUIRE_CERT */
+# endif /* LDAP_OPT_X_TLS_REQUIRE_CERT */
if (strncmp(ludp->lud_scheme, "ldaps", 5) == 0)
{
tls_option = LDAP_OPT_X_TLS_HARD;
}
ldap_set_option(ld, LDAP_OPT_X_TLS, (void *)&tls_option);
}
- #endif /* LDAP_OPT_X_TLS */
+#endif /* LDAP_OPT_X_TLS */
- #ifdef LDAP_OPT_X_TLS_CACERTFILE
- if (eldap_ca_cert_file != NULL)
- {
+#ifdef LDAP_OPT_X_TLS_CACERTFILE
+ if (eldap_ca_cert_file)
ldap_set_option(ldsetctx, LDAP_OPT_X_TLS_CACERTFILE, eldap_ca_cert_file);
- }
- #endif
- #ifdef LDAP_OPT_X_TLS_CACERTDIR
- if (eldap_ca_cert_dir != NULL)
- {
+#endif
+#ifdef LDAP_OPT_X_TLS_CACERTDIR
+ if (eldap_ca_cert_dir)
ldap_set_option(ldsetctx, LDAP_OPT_X_TLS_CACERTDIR, eldap_ca_cert_dir);
- }
- #endif
- #ifdef LDAP_OPT_X_TLS_CERTFILE
- if (eldap_cert_file != NULL)
- {
+#endif
+#ifdef LDAP_OPT_X_TLS_CERTFILE
+ if (eldap_cert_file)
ldap_set_option(ldsetctx, LDAP_OPT_X_TLS_CERTFILE, eldap_cert_file);
- }
- #endif
- #ifdef LDAP_OPT_X_TLS_KEYFILE
- if (eldap_cert_key != NULL)
- {
+#endif
+#ifdef LDAP_OPT_X_TLS_KEYFILE
+ if (eldap_cert_key)
ldap_set_option(ldsetctx, LDAP_OPT_X_TLS_KEYFILE, eldap_cert_key);
- }
- #endif
- #ifdef LDAP_OPT_X_TLS_CIPHER_SUITE
- if (eldap_cipher_suite != NULL)
- {
+#endif
+#ifdef LDAP_OPT_X_TLS_CIPHER_SUITE
+ if (eldap_cipher_suite)
ldap_set_option(ldsetctx, LDAP_OPT_X_TLS_CIPHER_SUITE, eldap_cipher_suite);
- }
- #endif
- #ifdef LDAP_OPT_X_TLS_REQUIRE_CERT
- if (eldap_require_cert != NULL)
+#endif
+#ifdef LDAP_OPT_X_TLS_REQUIRE_CERT
+ if (eldap_require_cert)
{
- int cert_option = LDAP_OPT_X_TLS_NEVER;
- if (Ustrcmp(eldap_require_cert, "hard") == 0)
- {
- cert_option = LDAP_OPT_X_TLS_HARD;
- }
- else if (Ustrcmp(eldap_require_cert, "demand") == 0)
- {
- cert_option = LDAP_OPT_X_TLS_DEMAND;
- }
- else if (Ustrcmp(eldap_require_cert, "allow") == 0)
- {
- cert_option = LDAP_OPT_X_TLS_ALLOW;
- }
- else if (Ustrcmp(eldap_require_cert, "try") == 0)
- {
- cert_option = LDAP_OPT_X_TLS_TRY;
- }
+ int cert_option =
+ Ustrcmp(eldap_require_cert, "hard") == 0 ? LDAP_OPT_X_TLS_HARD
+ : Ustrcmp(eldap_require_cert, "demand") == 0 ? LDAP_OPT_X_TLS_DEMAND
+ : Ustrcmp(eldap_require_cert, "allow") == 0 ? LDAP_OPT_X_TLS_ALLOW
+ : Ustrcmp(eldap_require_cert, "try") == 0 ? LDAP_OPT_X_TLS_TRY
+ : LDAP_OPT_X_TLS_NEVER;
+
/* This ldap handle is set at compile time based on client libs. Older
* versions want it to be global and newer versions can force a reload
* of the TLS context (to reload these settings we are changing from the
* default that loaded at instantiation). */
rc = ldap_set_option(ldsetctx, LDAP_OPT_X_TLS_REQUIRE_CERT, &cert_option);
if (rc)
- {
DEBUG(D_lookup)
debug_printf("Unable to set TLS require cert_option(%d) globally: %s\n",
cert_option, ldap_err2string(rc));
- }
}
- #endif
- #ifdef LDAP_OPT_X_TLS_NEWCTX
- rc = ldap_set_option(ldsetctx, LDAP_OPT_X_TLS_NEWCTX, &am_server);
- if (rc)
- {
+#endif
+#ifdef LDAP_OPT_X_TLS_NEWCTX
+ if ((rc = ldap_set_option(ldsetctx, LDAP_OPT_X_TLS_NEWCTX, &am_server)))
DEBUG(D_lookup)
debug_printf("Unable to reload TLS context %d: %s\n",
rc, ldap_err2string(rc));
- }
#endif
/* Now add this connection to the chain of cached connections */
/* Found cached connection */
else
- {
DEBUG(D_lookup)
debug_printf("re-using cached connection to LDAP server %s%s\n",
host, porttext);
- }
/* Bind with the user/password supplied, or an anonymous bind if these values
are NULL, unless a cached connection is already bound with the same values. */
-if (!lcp->bound ||
- (lcp->user == NULL && user != NULL) ||
- (lcp->user != NULL && user == NULL) ||
- (lcp->user != NULL && user != NULL && Ustrcmp(lcp->user, user) != 0) ||
- (lcp->password == NULL && password != NULL) ||
- (lcp->password != NULL && password == NULL) ||
- (lcp->password != NULL && password != NULL &&
- Ustrcmp(lcp->password, password) != 0))
+if ( !lcp->bound
+ || !lcp->user && user
+ || lcp->user && !user
+ || lcp->user && user && Ustrcmp(lcp->user, user) != 0
+ || !lcp->password && password
+ || lcp->password && !password
+ || lcp->password && password && Ustrcmp(lcp->password, password) != 0
+ )
{
DEBUG(D_lookup) debug_printf("%sbinding with user=%s password=%s\n",
- (lcp->bound)? "re-" : "", user, password);
+ lcp->bound ? "re-" : "", user, password);
+
if (eldap_start_tls && !lcp->is_start_tls_called && !ldapi)
{
#if defined(LDAP_OPT_X_TLS) && !defined(LDAP_LIB_SOLARIS)
}
lcp->is_start_tls_called = TRUE;
#else
- DEBUG(D_lookup)
- debug_printf("TLS initiation not supported with this Exim and your LDAP library.\n");
+ DEBUG(D_lookup) debug_printf("TLS initiation not supported with this Exim"
+ " and your LDAP library.\n");
#endif
}
if ((msgid = ldap_bind(lcp->ld, CS user, CS password, LDAP_AUTH_SIMPLE))
goto RETURN_ERROR;
}
- if ((rc = ldap_result( lcp->ld, msgid, 1, timeoutptr, &result )) <= 0)
+ if ((rc = ldap_result(lcp->ld, msgid, 1, timeoutptr, &result)) <= 0)
{
*errmsg = string_sprintf("failed to bind the LDAP connection to server "
"%s%s - LDAP error: %s", host, porttext,
goto RETURN_ERROR;
}
- rc = ldap_result2error( lcp->ld, result, 0 );
+ rc = ldap_result2error(lcp->ld, result, 0);
/* Invalid credentials when just checking credentials returns FAIL. This
stops any further servers being tried. */
/* Successful bind */
lcp->bound = TRUE;
- lcp->user = (user == NULL)? NULL : string_copy(user);
- lcp->password = (password == NULL)? NULL : string_copy(password);
+ lcp->user = !user ? NULL : string_copy(user);
+ lcp->password = !password ? NULL : string_copy(password);
ldap_msgfree(result);
result = NULL;
if (msgid == -1)
{
- #if defined LDAP_LIB_SOLARIS || defined LDAP_LIB_OPENLDAP2
+#if defined LDAP_LIB_SOLARIS || defined LDAP_LIB_OPENLDAP2
int err;
ldap_get_option(lcp->ld, LDAP_OPT_ERROR_NUMBER, &err);
*errmsg = string_sprintf("ldap_search failed: %d, %s", err,
ldap_err2string(err));
-
- #else
+#else
*errmsg = string_sprintf("ldap_search failed");
- #endif
+#endif
goto RETURN_ERROR;
}
DEBUG(D_lookup) debug_printf("LDAP result loop\n");
for(e = ldap_first_entry(lcp->ld, result), valuecount = 0;
- e != NULL;
+ e;
e = ldap_next_entry(lcp->ld, e))
{
uschar *new_dn;
/* Results for multiple entries values are separated by newlines. */
- if (data != NULL) data = string_catn(data, &size, &ptr, US"\n", 1);
+ if (data) data = string_catn(data, US"\n", 1);
/* Get the DN from the last result. */
- new_dn = US ldap_get_dn(lcp->ld, e);
- if (new_dn != NULL)
+ if ((new_dn = US ldap_get_dn(lcp->ld, e)))
{
- if (dn != NULL)
+ if (dn)
{
- #if defined LDAP_LIB_NETSCAPE || defined LDAP_LIB_OPENLDAP2
+#if defined LDAP_LIB_NETSCAPE || defined LDAP_LIB_OPENLDAP2
ldap_memfree(dn);
- #else /* OPENLDAP 1, UMich, Solaris */
+#else /* OPENLDAP 1, UMich, Solaris */
free(dn);
- #endif
+#endif
}
/* Save for later */
dn = new_dn;
entries, the DNs will be concatenated, but we test for this case below, as
for SEARCH_LDAP_SINGLE, and give an error. */
- if (search_type == SEARCH_LDAP_DN) /* Do not amalgamate these into one */
- { /* condition, because of the else */
- if (new_dn != NULL) /* below, that's for the first only */
+ if (search_type == SEARCH_LDAP_DN) /* Do not amalgamate these into one */
+ { /* condition, because of the else */
+ if (new_dn) /* below, that's for the first only */
{
- data = string_cat(data, &size, &ptr, new_dn);
- data[ptr] = 0;
+ data = string_cat(data, new_dn);
+ (void) string_from_gstring(data);
attribute_found = TRUE;
}
}
If there are multiple values, they are given within the quotes, comma separated. */
else for (attr = US ldap_first_attribute(lcp->ld, e, &ber);
- attr != NULL;
- attr = US ldap_next_attribute(lcp->ld, e, ber))
+ attr; attr = US ldap_next_attribute(lcp->ld, e, ber))
{
DEBUG(D_lookup) debug_printf("LDAP attr loop\n");
{
/* Get array of values for this attribute. */
- if ((firstval = values = USS ldap_get_values(lcp->ld, e, CS attr))
- != NULL)
+ if ((firstval = values = USS ldap_get_values(lcp->ld, e, CS attr)))
{
-
if (attrs_requested != 1)
{
if (insert_space)
- data = string_catn(data, &size, &ptr, US" ", 1);
+ data = string_catn(data, US" ", 1);
else
insert_space = TRUE;
- data = string_cat(data, &size, &ptr, attr);
- data = string_catn(data, &size, &ptr, US"=\"", 2);
+ data = string_cat(data, attr);
+ data = string_catn(data, US"=\"", 2);
}
- while (*values != NULL)
+ while (*values)
{
uschar *value = *values;
int len = Ustrlen(value);
attribute and append only every non first value. */
if (data && valuecount > 1)
- data = string_catn(data, &size, &ptr, US",", 1);
+ data = string_catn(data, US",", 1);
/* For multiple attributes, the data is in quotes. We must escape
internal quotes, backslashes, newlines, and must double commas. */
for (j = 0; j < len; j++)
{
if (value[j] == '\n')
- data = string_catn(data, &size, &ptr, US"\\n", 2);
+ data = string_catn(data, US"\\n", 2);
else if (value[j] == ',')
- data = string_catn(data, &size, &ptr, US",,", 2);
+ data = string_catn(data, US",,", 2);
else
{
if (value[j] == '\"' || value[j] == '\\')
- data = string_catn(data, &size, &ptr, US"\\", 1);
- data = string_catn(data, &size, &ptr, value+j, 1);
+ data = string_catn(data, US"\\", 1);
+ data = string_catn(data, value+j, 1);
}
}
}
int j;
for (j = 0; j < len; j++)
if (value[j] == ',')
- data = string_catn(data, &size, &ptr, US",,", 2);
+ data = string_catn(data, US",,", 2);
else
- data = string_catn(data, &size, &ptr, value+j, 1);
+ data = string_catn(data, value+j, 1);
}
/* Closing quote at the end of the data for a named attribute. */
if (attrs_requested != 1)
- data = string_catn(data, &size, &ptr, US"\"", 1);
+ data = string_catn(data, US"\"", 1);
/* Free the values */
}
}
- #if defined LDAP_LIB_NETSCAPE || defined LDAP_LIB_OPENLDAP2
+#if defined LDAP_LIB_NETSCAPE || defined LDAP_LIB_OPENLDAP2
/* Netscape and OpenLDAP2 LDAP's attrs are dynamically allocated and need
to be freed. UMich LDAP stores them in static storage and does not require
this. */
ldap_memfree(attr);
- #endif
+#endif
} /* End "for" loop for extracting attributes from an entry */
} /* End "for" loop for extracting entries from a result */
result = NULL;
} /* End "while" loop for multiple results */
-/* Terminate the dynamic string that we have built and reclaim unused store */
+/* Terminate the dynamic string that we have built and reclaim unused store.
+In the odd case of a single attribute with zero-length value, allocate
+an empty string. */
-if (data != NULL)
- {
- data[ptr] = 0;
- store_reset(data + ptr + 1);
- }
+if (!data) data = string_get(1);
+(void) string_from_gstring(data);
+gstring_reset_unused(data);
/* Copy the last dn into eldap_dn */
-if (dn != NULL)
+if (dn)
{
eldap_dn = string_copy(dn);
- #if defined LDAP_LIB_NETSCAPE || defined LDAP_LIB_OPENLDAP2
+#if defined LDAP_LIB_NETSCAPE || defined LDAP_LIB_OPENLDAP2
ldap_memfree(dn);
- #else /* OPENLDAP 1, UMich, Solaris */
+#else /* OPENLDAP 1, UMich, Solaris */
free(dn);
- #endif
+#endif
}
DEBUG(D_lookup) debug_printf("search ended by ldap_result yielding %d\n",rc);
Annoyingly, the different implementations of LDAP have gone for different
methods of handling error codes and generating error messages. */
-if (rc == -1 || result == NULL)
+if (rc == -1 || !result)
{
int err;
DEBUG(D_lookup) debug_printf("ldap_result failed\n");
- #if defined LDAP_LIB_SOLARIS || defined LDAP_LIB_OPENLDAP2
+#if defined LDAP_LIB_SOLARIS || defined LDAP_LIB_OPENLDAP2
ldap_get_option(lcp->ld, LDAP_OPT_ERROR_NUMBER, &err);
*errmsg = string_sprintf("ldap_result failed: %d, %s",
err, ldap_err2string(err));
- #elif defined LDAP_LIB_NETSCAPE
+#elif defined LDAP_LIB_NETSCAPE
/* Dubious (surely 'matched' is spurious here?) */
(void)ldap_get_lderrno(lcp->ld, &matched, &error1);
*errmsg = string_sprintf("ldap_result failed: %s (%s)", error1, matched);
- #else /* UMich LDAP aka OpenLDAP 1.x */
+#else /* UMich LDAP aka OpenLDAP 1.x */
*errmsg = string_sprintf("ldap_result failed: %d, %s",
lcp->ld->ld_errno, ldap_err2string(lcp->ld->ld_errno));
- #endif
+#endif
goto RETURN_ERROR;
}
{
*errmsg = string_sprintf("LDAP search failed - error %d: %s%s%s%s%s",
rc,
- (error1 != NULL)? error1 : US"",
- (error2 != NULL && error2[0] != 0)? US"/" : US"",
- (error2 != NULL)? error2 : US"",
- (matched != NULL && matched[0] != 0)? US"/" : US"",
- (matched != NULL)? matched : US"");
+ error1 ? error1 : US"",
+ error2 && error2[0] ? US"/" : US"",
+ error2 ? error2 : US"",
+ matched && matched[0] ? US"/" : US"",
+ matched ? matched : US"");
- #if defined LDAP_NAME_ERROR
+#if defined LDAP_NAME_ERROR
if (LDAP_NAME_ERROR(rc))
- #elif defined NAME_ERROR /* OPENLDAP1 calls it this */
+#elif defined NAME_ERROR /* OPENLDAP1 calls it this */
if (NAME_ERROR(rc))
- #else
+#else
if (rc == LDAP_NO_SUCH_OBJECT)
- #endif
+#endif
{
DEBUG(D_lookup) debug_printf("lookup failure forced\n");
/* Otherwise, it's all worked */
-DEBUG(D_lookup) debug_printf("LDAP search: returning: %s\n", data);
-*res = data;
+DEBUG(D_lookup) debug_printf("LDAP search: returning: %s\n", data->s);
+*res = data->s;
RETURN_OK:
-if (result != NULL) ldap_msgfree(result);
+if (result) ldap_msgfree(result);
ldap_free_urldesc(ludp);
return OK;
DEBUG(D_lookup) debug_printf("%s\n", *errmsg);
RETURN_ERROR_NOMSG:
-if (result != NULL) ldap_msgfree(result);
-if (ludp != NULL) ldap_free_urldesc(ludp);
+if (result) ldap_msgfree(result);
+if (ludp) ldap_free_urldesc(ludp);
#if defined LDAP_LIB_OPENLDAP2
- if (error2 != NULL) ldap_memfree(error2);
- if (matched != NULL) ldap_memfree(matched);
+ if (error2) ldap_memfree(error2);
+ if (matched) ldap_memfree(matched);
#endif
return error_yield;
HCoop / hcoop / debian / exim4.git / blobdiff