summaryrefslogtreecommitdiffstats
path: root/src/util/sss_ldap.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/util/sss_ldap.c')
-rw-r--r--src/util/sss_ldap.c72
1 files changed, 36 insertions, 36 deletions
diff --git a/src/util/sss_ldap.c b/src/util/sss_ldap.c
index e1a05e8f6..7c13f4371 100644
--- a/src/util/sss_ldap.c
+++ b/src/util/sss_ldap.c
@@ -129,14 +129,14 @@ static struct tevent_req *sdap_async_sys_connect_send(TALLOC_CTX *mem_ctx,
flags = fcntl(fd, F_GETFL, 0);
if (flags == -1) {
- DEBUG(1, ("fcntl F_GETFL failed.\n"));
+ DEBUG(1, "fcntl F_GETFL failed.\n");
return NULL;
}
req = tevent_req_create(mem_ctx, &state,
struct sdap_async_sys_connect_state);
if (req == NULL) {
- DEBUG(1, ("tevent_req_create failed.\n"));
+ DEBUG(1, "tevent_req_create failed.\n");
return NULL;
}
@@ -147,7 +147,7 @@ static struct tevent_req *sdap_async_sys_connect_send(TALLOC_CTX *mem_ctx,
ret = fcntl(fd, F_SETFL, flags | O_NONBLOCK);
if (ret != EOK) {
- DEBUG(1, ("fcntl F_SETFL failed.\n"));
+ DEBUG(1, "fcntl F_SETFL failed.\n");
goto done;
}
@@ -164,7 +164,7 @@ static struct tevent_req *sdap_async_sys_connect_send(TALLOC_CTX *mem_ctx,
TEVENT_FD_READ | TEVENT_FD_WRITE,
sdap_async_sys_connect_done, req);
if (state->fde == NULL) {
- DEBUG(1, ("tevent_add_fd failed.\n"));
+ DEBUG(1, "tevent_add_fd failed.\n");
ret = ENOMEM;
goto done;
}
@@ -173,13 +173,13 @@ static struct tevent_req *sdap_async_sys_connect_send(TALLOC_CTX *mem_ctx,
break;
default:
- DEBUG(1, ("connect failed [%d][%s].\n", ret, strerror(ret)));
+ DEBUG(1, "connect failed [%d][%s].\n", ret, strerror(ret));
}
done:
fret = fcntl(fd, F_SETFL, flags);
if (fret != EOK) {
- DEBUG(1, ("fcntl F_SETFL failed.\n"));
+ DEBUG(1, "fcntl F_SETFL failed.\n");
}
if (ret == EOK) {
@@ -210,14 +210,14 @@ static void sdap_async_sys_connect_done(struct tevent_context *ev,
if (ret == EINPROGRESS || ret == EINTR) {
return; /* Try again later */
}
- DEBUG(1, ("connect failed [%d][%s].\n", ret, strerror(ret)));
+ DEBUG(1, "connect failed [%d][%s].\n", ret, strerror(ret));
}
talloc_zfree(fde);
fret = fcntl(state->fd, F_SETFL, state->old_flags);
if (fret != EOK) {
- DEBUG(1, ("fcntl F_SETFL failed.\n"));
+ DEBUG(1, "fcntl F_SETFL failed.\n");
}
if (ret == EOK) {
@@ -245,14 +245,14 @@ static errno_t set_fd_flags_and_opts(int fd)
flags = fcntl(fd, F_GETFD, 0);
if (flags == -1) {
ret = errno;
- DEBUG(1, ("fcntl F_GETFD failed [%d][%s].\n", ret, strerror(ret)));
+ DEBUG(1, "fcntl F_GETFD failed [%d][%s].\n", ret, strerror(ret));
return ret;
}
flags = fcntl(fd, F_SETFD, flags| FD_CLOEXEC);
if (flags == -1) {
ret = errno;
- DEBUG(1, ("fcntl F_SETFD failed [%d][%s].\n", ret, strerror(ret)));
+ DEBUG(1, "fcntl F_SETFD failed [%d][%s].\n", ret, strerror(ret));
return ret;
}
@@ -261,15 +261,15 @@ static errno_t set_fd_flags_and_opts(int fd)
ret = setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &dummy, sizeof(dummy));
if (ret != 0) {
ret = errno;
- DEBUG(5, ("setsockopt SO_KEEPALIVE failed.[%d][%s].\n", ret,
- strerror(ret)));
+ DEBUG(5, "setsockopt SO_KEEPALIVE failed.[%d][%s].\n", ret,
+ strerror(ret));
}
ret = setsockopt(fd, SOL_TCP, TCP_NODELAY, &dummy, sizeof(dummy));
if (ret != 0) {
ret = errno;
- DEBUG(5, ("setsockopt TCP_NODELAY failed.[%d][%s].\n", ret,
- strerror(ret)));
+ DEBUG(5, "setsockopt TCP_NODELAY failed.[%d][%s].\n", ret,
+ strerror(ret));
}
return EOK;
@@ -311,7 +311,7 @@ struct tevent_req *sss_ldap_init_send(TALLOC_CTX *mem_ctx,
req = tevent_req_create(mem_ctx, &state, struct sss_ldap_init_state);
if (req == NULL) {
- DEBUG(1, ("tevent_req_create failed.\n"));
+ DEBUG(1, "tevent_req_create failed.\n");
return NULL;
}
@@ -325,34 +325,34 @@ struct tevent_req *sss_ldap_init_send(TALLOC_CTX *mem_ctx,
state->sd = socket(addr->ss_family, SOCK_STREAM, 0);
if (state->sd == -1) {
ret = errno;
- DEBUG(1, ("socket failed [%d][%s].\n", ret, strerror(ret)));
+ DEBUG(1, "socket failed [%d][%s].\n", ret, strerror(ret));
goto fail;
}
ret = set_fd_flags_and_opts(state->sd);
if (ret != EOK) {
- DEBUG(1, ("set_fd_flags_and_opts failed.\n"));
+ DEBUG(1, "set_fd_flags_and_opts failed.\n");
goto fail;
}
- DEBUG(9, ("Using file descriptor [%d] for LDAP connection.\n", state->sd));
+ DEBUG(9, "Using file descriptor [%d] for LDAP connection.\n", state->sd);
subreq = sdap_async_sys_connect_send(state, ev, state->sd,
(struct sockaddr *) addr, addr_len);
if (subreq == NULL) {
ret = ENOMEM;
- DEBUG(1, ("sdap_async_sys_connect_send failed.\n"));
+ DEBUG(1, "sdap_async_sys_connect_send failed.\n");
goto fail;
}
- DEBUG(6, ("Setting %d seconds timeout for connecting\n", timeout));
+ DEBUG(6, "Setting %d seconds timeout for connecting\n", timeout);
tv = tevent_timeval_current_ofs(timeout, 0);
state->connect_timeout = tevent_add_timer(ev, subreq, tv,
sdap_async_sys_connect_timeout,
subreq);
if (state->connect_timeout == NULL) {
- DEBUG(1, ("tevent_add_timer failed.\n"));
+ DEBUG(1, "tevent_add_timer failed.\n");
ret = ENOMEM;
goto fail;
}
@@ -366,14 +366,14 @@ fail:
}
tevent_req_error(req, ret);
#else
- DEBUG(3, ("ldap_init_fd not available, "
- "will use ldap_initialize with uri [%s].\n", uri));
+ DEBUG(3, "ldap_init_fd not available, "
+ "will use ldap_initialize with uri [%s].\n", uri);
state->sd = -1;
ret = ldap_initialize(&state->ldap, uri);
if (ret == LDAP_SUCCESS) {
tevent_req_done(req);
} else {
- DEBUG(1, ("ldap_initialize failed [%s].\n", sss_ldap_err2string(ret)));
+ DEBUG(1, "ldap_initialize failed [%s].\n", sss_ldap_err2string(ret));
if (ret == LDAP_SERVER_DOWN) {
tevent_req_error(req, ETIMEDOUT);
} else {
@@ -393,7 +393,7 @@ static void sdap_async_sys_connect_timeout(struct tevent_context *ev,
{
struct tevent_req *connection_request;
- DEBUG(4, ("The LDAP connection timed out\n"));
+ DEBUG(4, "The LDAP connection timed out\n");
connection_request = talloc_get_type(pvt, struct tevent_req);
tevent_req_error(connection_request, ETIMEDOUT);
@@ -413,7 +413,7 @@ static void sss_ldap_init_sys_connect_done(struct tevent_req *subreq)
ret = sdap_async_sys_connect_recv(subreq);
talloc_zfree(subreq);
if (ret != EOK) {
- DEBUG(1, ("sdap_async_sys_connect request failed.\n"));
+ DEBUG(1, "sdap_async_sys_connect request failed.\n");
goto fail;
}
/* Initialize LDAP handler */
@@ -421,8 +421,8 @@ static void sss_ldap_init_sys_connect_done(struct tevent_req *subreq)
lret = ldap_init_fd(state->sd, LDAP_PROTO_TCP, state->uri, &state->ldap);
if (lret != LDAP_SUCCESS) {
DEBUG(SSSDBG_CRIT_FAILURE,
- ("ldap_init_fd failed: %s. [%d][%s]\n",
- sss_ldap_err2string(lret), state->sd, state->uri));
+ "ldap_init_fd failed: %s. [%d][%s]\n",
+ sss_ldap_err2string(lret), state->sd, state->uri);
ret = lret == LDAP_SERVER_DOWN ? ETIMEDOUT : EIO;
goto fail;
}
@@ -431,10 +431,10 @@ static void sss_ldap_init_sys_connect_done(struct tevent_req *subreq)
lret = ldap_install_tls(state->ldap);
if (lret != LDAP_SUCCESS) {
if (lret == LDAP_LOCAL_ERROR) {
- DEBUG(5, ("TLS/SSL already in place.\n"));
+ DEBUG(5, "TLS/SSL already in place.\n");
} else {
- DEBUG(1, ("ldap_install_tls failed: %s\n",
- sss_ldap_err2string(lret)));
+ DEBUG(1, "ldap_install_tls failed: %s\n",
+ sss_ldap_err2string(lret));
ret = EIO;
goto fail;
}
@@ -490,13 +490,13 @@ bool sss_ldap_dn_in_search_bases_len(TALLOC_CTX *mem_ctx,
int match_len;
if (dn == NULL) {
- DEBUG(SSSDBG_FUNC_DATA, ("dn is NULL\n"));
+ DEBUG(SSSDBG_FUNC_DATA, "dn is NULL\n");
ret = false;
goto done;
}
if (search_bases == NULL) {
- DEBUG(SSSDBG_FUNC_DATA, ("search_bases is NULL\n"));
+ DEBUG(SSSDBG_FUNC_DATA, "search_bases is NULL\n");
ret = false;
goto done;
}
@@ -553,7 +553,7 @@ bool sss_ldap_dn_in_search_bases_len(TALLOC_CTX *mem_ctx,
/* dn length >= base dn length && base_confirmed == true */
break;
default:
- DEBUG(SSSDBG_FUNC_DATA, ("Unsupported scope: %d\n", base->scope));
+ DEBUG(SSSDBG_FUNC_DATA, "Unsupported scope: %d\n", base->scope);
continue;
}
@@ -572,7 +572,7 @@ bool sss_ldap_dn_in_search_bases_len(TALLOC_CTX *mem_ctx,
} else {
filter = talloc_strdup_append(filter, base->filter);
if (filter == NULL) {
- DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_strdup_append() failed\n"));
+ DEBUG(SSSDBG_CRIT_FAILURE, "talloc_strdup_append() failed\n");
ret = false;
goto done;
}
@@ -584,7 +584,7 @@ bool sss_ldap_dn_in_search_bases_len(TALLOC_CTX *mem_ctx,
*_filter = talloc_asprintf(mem_ctx, "(|%s)", filter);
if (*_filter == NULL) {
DEBUG(SSSDBG_CRIT_FAILURE,
- ("talloc_asprintf_append() failed\n"));
+ "talloc_asprintf_append() failed\n");
ret = false;
goto done;
}