diff options
| author | Jakub Hrozek <jhrozek@redhat.com> | 2011-07-01 16:57:28 +0200 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2011-07-11 16:52:52 -0400 |
| commit | 2e1973b90ea87b343d39fef1f6393cc201989ecd (patch) | |
| tree | 0a3849264e36ac94b3c336ab5f69dc7032dc8479 /src/util | |
| parent | d9e5e97c90b31b84c3abf6e7ce92176afa950f61 (diff) | |
| download | sssd_unused-2e1973b90ea87b343d39fef1f6393cc201989ecd.tar.gz sssd_unused-2e1973b90ea87b343d39fef1f6393cc201989ecd.tar.xz sssd_unused-2e1973b90ea87b343d39fef1f6393cc201989ecd.zip | |
Move IP adress escaping from the LDAP namespace
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/sss_ldap.c | 8 | ||||
| -rw-r--r-- | src/util/sss_ldap.h | 3 | ||||
| -rw-r--r-- | src/util/util.c | 8 | ||||
| -rw-r--r-- | src/util/util.h | 3 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/util/sss_ldap.c b/src/util/sss_ldap.c index 1394b4d6..601885b4 100644 --- a/src/util/sss_ldap.c +++ b/src/util/sss_ldap.c @@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <stdlib.h> -#include <netdb.h> #include <unistd.h> #include <fcntl.h> #include <sys/socket.h> @@ -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 14fff29e..ab890293 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 6c4a6033..649d58ea 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -19,6 +19,7 @@ */ #include <ctype.h> +#include <netdb.h> #include "talloc.h" #include "util/util.h" @@ -589,3 +590,10 @@ errno_t sss_filter_sanitize(TALLOC_CTX *mem_ctx, return EOK; } + +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 4b6f3b78..a59603d0 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); +char * +sss_escape_ip_address(TALLOC_CTX *mem_ctx, int family, const char *addr); + #endif /* __SSSD_UTIL_H__ */ |