From b96389d3e17013fd22a64b6ce54478bd912d06b3 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 3 May 2011 09:34:06 +1000 Subject: s4-socket: rename allow_access() to socket_allow_access() this prevents a symbol collision with s3 Pair-Programmed-With: Andrew Bartlett --- source4/lib/socket/socket.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source4/lib/socket/socket.h') diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h index 4a744797b3a..88360ac8f33 100644 --- a/source4/lib/socket/socket.h +++ b/source4/lib/socket/socket.h @@ -179,9 +179,9 @@ _PUBLIC_ void socket_address_set_port(struct socket_address *a, struct socket_address *socket_address_copy(TALLOC_CTX *mem_ctx, const struct socket_address *oaddr); const struct socket_ops *socket_getops_byname(const char *name, enum socket_type type); -bool allow_access(TALLOC_CTX *mem_ctx, - const char **deny_list, const char **allow_list, - const char *cname, const char *caddr); +bool socket_allow_access(TALLOC_CTX *mem_ctx, + const char **deny_list, const char **allow_list, + const char *cname, const char *caddr); bool socket_check_access(struct socket_context *sock, const char *service_name, const char **allow_list, const char **deny_list); -- cgit From 244137b10d511dedb1798b90aa2f4c354c50a44e Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 12 May 2011 12:29:21 +0200 Subject: s4-ipv6: added socket_address_from_sockaddr_storage() this converts a struct sockaddr_storage to a struct socket_address --- source4/lib/socket/socket.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source4/lib/socket/socket.h') diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h index 88360ac8f33..e00b61ba6cd 100644 --- a/source4/lib/socket/socket.h +++ b/source4/lib/socket/socket.h @@ -174,6 +174,10 @@ struct socket_address *socket_address_from_strings(TALLOC_CTX *mem_ctx, struct socket_address *socket_address_from_sockaddr(TALLOC_CTX *mem_ctx, struct sockaddr *sockaddr, size_t addrlen); +struct sockaddr_storage; +struct socket_address *socket_address_from_sockaddr_storage(TALLOC_CTX *mem_ctx, + const struct sockaddr_storage *sockaddr, + uint16_t port); _PUBLIC_ void socket_address_set_port(struct socket_address *a, uint16_t port); struct socket_address *socket_address_copy(TALLOC_CTX *mem_ctx, -- cgit