diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-05-03 09:34:06 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-05-03 07:37:07 +0200 |
| commit | b96389d3e17013fd22a64b6ce54478bd912d06b3 (patch) | |
| tree | acb87a3e14212376e93c6554423f8233af0999be | |
| parent | 80f1d49b61560f326fb55f2df09cc4f30e7a85ea (diff) | |
| download | samba-b96389d3e17013fd22a64b6ce54478bd912d06b3.tar.gz samba-b96389d3e17013fd22a64b6ce54478bd912d06b3.tar.xz samba-b96389d3e17013fd22a64b6ce54478bd912d06b3.zip | |
s4-socket: rename allow_access() to socket_allow_access()
this prevents a symbol collision with s3
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | source4/dsdb/common/util.c | 2 | ||||
| -rw-r--r-- | source4/lib/socket/access.c | 8 | ||||
| -rw-r--r-- | source4/lib/socket/socket.h | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c index 0c920d7d855..0cba20b4654 100644 --- a/source4/dsdb/common/util.c +++ b/source4/dsdb/common/util.c @@ -1762,7 +1762,7 @@ const char *samdb_client_site_name(struct ldb_context *ldb, TALLOC_CTX *mem_ctx, allow_list[0] = l_subnet_name; - if (allow_access(mem_ctx, NULL, allow_list, "", ip_address)) { + if (socket_allow_access(mem_ctx, NULL, allow_list, "", ip_address)) { sites_dn = ldb_msg_find_attr_as_dn(ldb, mem_ctx, res->msgs[i], "siteObject"); diff --git a/source4/lib/socket/access.c b/source4/lib/socket/access.c index ab39d63ef5b..589797763fc 100644 --- a/source4/lib/socket/access.c +++ b/source4/lib/socket/access.c @@ -249,9 +249,9 @@ static bool allow_access_internal(TALLOC_CTX *mem_ctx, } /* return true if access should be allowed */ -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 ret; char *nc_cname = talloc_strdup(mem_ctx, cname); @@ -346,7 +346,7 @@ bool socket_check_access(struct socket_context *sock, return false; } - ret = allow_access(mem_ctx, deny_list, allow_list, name, addr->addr); + ret = socket_allow_access(mem_ctx, deny_list, allow_list, name, addr->addr); if (ret) { DEBUG(2,("socket_check_access: Allowed connection to '%s' from %s (%s)\n", 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); |