From 13de233fc6a562387791281b3b0cc1bcbe56b9ef Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sun, 29 Jul 2012 23:25:12 +0200 Subject: [PATCH] s3:smbd: move smbd_register_ips() next to release_ip() metze --- source3/smbd/process.c | 50 +++++++++++++++++++++++--------------------------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/source3/smbd/process.c b/source3/smbd/process.c index adb773d7497..f09150d19cc 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -2491,6 +2491,29 @@ static void release_ip(const char *ip, void *priv) } } +static NTSTATUS smbd_register_ips(struct smbd_server_connection *sconn, + struct sockaddr_storage *srv, + struct sockaddr_storage *clnt) +{ + struct ctdbd_connection *cconn; + char tmp_addr[INET6_ADDRSTRLEN]; + char *addr; + + cconn = messaging_ctdbd_connection(); + if (cconn == NULL) { + return NT_STATUS_NO_MEMORY; + } + + if (client_socket_addr(sconn->sock, tmp_addr, sizeof(tmp_addr)) == NULL) { + return NT_STATUS_NO_MEMORY; + } + addr = talloc_strdup(cconn, tmp_addr); + if (addr == NULL) { + return NT_STATUS_NO_MEMORY; + } + return ctdbd_register_ips(cconn, srv, clnt, release_ip, addr); +} + static int client_get_tcp_info(int sock, struct sockaddr_storage *server, struct sockaddr_storage *client) { @@ -3067,33 +3090,6 @@ fail: return false; } -#if CLUSTER_SUPPORT - -static NTSTATUS smbd_register_ips(struct smbd_server_connection *sconn, - struct sockaddr_storage *srv, - struct sockaddr_storage *clnt) -{ - struct ctdbd_connection *cconn; - char tmp_addr[INET6_ADDRSTRLEN]; - char *addr; - - cconn = messaging_ctdbd_connection(); - if (cconn == NULL) { - return NT_STATUS_NO_MEMORY; - } - - if (client_socket_addr(sconn->sock, tmp_addr, sizeof(tmp_addr)) == NULL) { - return NT_STATUS_NO_MEMORY; - } - addr = talloc_strdup(cconn, tmp_addr); - if (addr == NULL) { - return NT_STATUS_NO_MEMORY; - } - return ctdbd_register_ips(cconn, srv, clnt, release_ip, addr); -} - -#endif - static bool uid_in_use(const struct user_struct *user, uid_t uid) { while (user) { -- 2.11.4.GIT