>From f1b5df047c0c3427d7f5524a972d48da2a14137f Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Fri, 1 Jul 2011 16:57:28 +0200 Subject: [PATCH 1/2] Move IP adress escaping from the LDAP namespace --- src/providers/ipa/ipa_common.c | 6 +++--- src/util/sss_ldap.c | 8 -------- src/util/sss_ldap.h | 3 --- src/util/util.c | 8 ++++++++ src/util/util.h | 3 +++ 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/providers/ipa/ipa_common.c b/src/providers/ipa/ipa_common.c index 9972c34..cb0b7ea 100644 --- a/src/providers/ipa/ipa_common.c +++ b/src/providers/ipa/ipa_common.c @@ -634,9 +634,9 @@ static void ipa_resolve_callback(void *private_data, struct fo_server *server) return; } - safe_address = sss_ldap_escape_ip_address(tmp_ctx, - srvaddr->family, - address); + safe_address = sss_escape_ip_address(tmp_ctx, + srvaddr->family, + address); if (safe_address == NULL) { DEBUG(1, ("sss_ldap_escape_ip_address failed.\n")); talloc_free(tmp_ctx); diff --git a/src/util/sss_ldap.c b/src/util/sss_ldap.c index e24ae82..2436fd4 100644 --- a/src/util/sss_ldap.c +++ b/src/util/sss_ldap.c @@ -18,7 +18,6 @@ along with this program. If not, see . */ #include -#include #include #include #include @@ -93,13 +92,6 @@ int sss_ldap_control_create(const char *oid, int iscritical, #endif } -inline const char * -sss_ldap_escape_ip_address(TALLOC_CTX *mem_ctx, int family, const char *addr) -{ - return family == AF_INET6 ? talloc_asprintf(mem_ctx, "[%s]", addr) : - talloc_strdup(mem_ctx, addr); -} - #ifdef HAVE_LDAP_INIT_FD struct sdap_async_sys_connect_state { long old_flags; diff --git a/src/util/sss_ldap.h b/src/util/sss_ldap.h index 14fff29..ab89029 100644 --- a/src/util/sss_ldap.h +++ b/src/util/sss_ldap.h @@ -49,9 +49,6 @@ int sss_ldap_control_create(const char *oid, int iscritical, struct berval *value, int dupval, LDAPControl **ctrlp); -inline const char * -sss_ldap_escape_ip_address(TALLOC_CTX *mem_ctx, int family, const char *addr); - struct tevent_req *sss_ldap_init_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, const char *uri, diff --git a/src/util/util.c b/src/util/util.c index 6c4a603..1a0f4eb 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -19,6 +19,7 @@ */ #include +#include #include "talloc.h" #include "util/util.h" @@ -589,3 +590,10 @@ errno_t sss_filter_sanitize(TALLOC_CTX *mem_ctx, return EOK; } + +inline char * +sss_escape_ip_address(TALLOC_CTX *mem_ctx, int family, const char *addr) +{ + return family == AF_INET6 ? talloc_asprintf(mem_ctx, "[%s]", addr) : + talloc_strdup(mem_ctx, addr); +} diff --git a/src/util/util.h b/src/util/util.h index 4b6f3b7..57ec370 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -405,4 +405,7 @@ errno_t sss_filter_sanitize(TALLOC_CTX *mem_ctx, const char *input, char **sanitized); +inline char * +sss_escape_ip_address(TALLOC_CTX *mem_ctx, int family, const char *addr); + #endif /* __SSSD_UTIL_H__ */ -- 1.7.5.4