From 571711431885e8e556822c14b3d117025860bf81 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 28 Dec 2010 12:53:12 +0100 Subject: [PATCH] s3: Make node_status_query return NTSTATUS Also make the result talloc'ed Autobuild-User: Volker Lendecke Autobuild-Date: Tue Dec 28 13:46:59 CET 2010 on sn-devel-104 --- source3/include/proto.h | 12 ++++---- source3/libsmb/namequery.c | 51 +++++++++++++++++++------------- source3/utils/nmblookup.c | 16 +++++----- source3/winbindd/winbindd_wins.c | 24 +++++++++------ 4 files changed, 62 insertions(+), 41 deletions(-) diff --git a/source3/include/proto.h b/source3/include/proto.h index af2b3595311..8278ffbcd5f 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -2699,11 +2699,13 @@ bool saf_store( const char *domain, const char *servername ); bool saf_join_store( const char *domain, const char *servername ); bool saf_delete( const char *domain ); char *saf_fetch( const char *domain ); -struct node_status *node_status_query(int fd, - struct nmb_name *name, - const struct sockaddr_storage *to_ss, - int *num_names, - struct node_status_extra *extra); +NTSTATUS node_status_query(int fd, + struct nmb_name *name, + const struct sockaddr_storage *to_ss, + TALLOC_CTX *mem_ctx, + struct node_status **names, + int *num_names, + struct node_status_extra *extra); bool name_status_find(const char *q_name, int q_type, int type, diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c index e20945177e5..a283038c32f 100644 --- a/source3/libsmb/namequery.c +++ b/source3/libsmb/namequery.c @@ -212,7 +212,7 @@ static int generate_trn_id(void) Parse a node status response into an array of structures. ****************************************************************************/ -static struct node_status *parse_node_status(char *p, +static struct node_status *parse_node_status(TALLOC_CTX *mem_ctx, char *p, int *num_names, struct node_status_extra *extra) { @@ -224,7 +224,7 @@ static struct node_status *parse_node_status(char *p, if (*num_names == 0) return NULL; - ret = SMB_MALLOC_ARRAY(struct node_status,*num_names); + ret = TALLOC_ARRAY(mem_ctx, struct node_status,*num_names); if (!ret) return NULL; @@ -278,11 +278,13 @@ static bool send_packet_request(struct packet_struct *p) structures holding the returned names or NULL if the query failed. **************************************************************************/ -struct node_status *node_status_query(int fd, - struct nmb_name *name, - const struct sockaddr_storage *to_ss, - int *num_names, - struct node_status_extra *extra) +NTSTATUS node_status_query(int fd, + struct nmb_name *name, + const struct sockaddr_storage *to_ss, + TALLOC_CTX *mem_ctx, + struct node_status **names, + int *num_names, + struct node_status_extra *extra) { bool found=False; int retries = 2; @@ -297,7 +299,7 @@ struct node_status *node_status_query(int fd, if (to_ss->ss_family != AF_INET) { /* Can't do node status to IPv6 */ - return NULL; + return NT_STATUS_INVALID_ADDRESS; } nmb->header.name_trn_id = generate_trn_id(); nmb->header.opcode = 0; @@ -326,7 +328,7 @@ struct node_status *node_status_query(int fd, clock_gettime_mono(&tp); if (!send_packet_request(&p)) - return NULL; + return NT_STATUS_NOT_FOUND; retries--; @@ -337,7 +339,7 @@ struct node_status *node_status_query(int fd, if (!retries) break; if (!found && !send_packet_request(&p)) - return NULL; + return NT_STATUS_NOT_FOUND; clock_gettime_mono(&tp); retries--; } @@ -358,14 +360,20 @@ struct node_status *node_status_query(int fd, continue; } - ret = parse_node_status(&nmb2->answers->rdata[0], - num_names, extra); + ret = parse_node_status( + mem_ctx, &nmb2->answers->rdata[0], num_names, + extra); free_packet(p2); - return ret; + + if (ret == NULL) { + return NT_STATUS_NO_MEMORY; + } + *names = ret; + return NT_STATUS_OK; } } - return NULL; + return NT_STATUS_IO_TIMEOUT; } /**************************************************************************** @@ -381,11 +389,12 @@ bool name_status_find(const char *q_name, { char addr[INET6_ADDRSTRLEN]; struct sockaddr_storage ss; - struct node_status *status = NULL; + struct node_status *addrs = NULL; struct nmb_name nname; int count, i; int sock; bool result = false; + NTSTATUS status; if (lp_disable_netbios()) { DEBUG(5,("name_status_find(%s#%02x): netbios is disabled\n", @@ -420,20 +429,22 @@ bool name_status_find(const char *q_name, /* W2K PDC's seem not to respond to '*'#0. JRA */ make_nmb_name(&nname, q_name, q_type); - status = node_status_query(sock, &nname, to_ss, &count, NULL); + status = node_status_query(sock, &nname, to_ss, talloc_tos(), + &addrs, &count, NULL); close(sock); - if (!status) + if (!NT_STATUS_IS_OK(status)) { goto done; + } for (i=0;i - %s\n", - cleanname,status[i].type, - node_status_flags(status[i].flags)); + cleanname,addrs[i].type, + node_status_flags(addrs[i].flags)); } d_printf("\n\tMAC Address = %02X-%02X-%02X-%02X-%02X-%02X\n", extra.mac_addr[0], extra.mac_addr[1], extra.mac_addr[2], extra.mac_addr[3], extra.mac_addr[4], extra.mac_addr[5]); d_printf("\n"); - SAFE_FREE(status); + TALLOC_FREE(addrs); } else { d_printf("No reply from %s\n\n",addr); } diff --git a/source3/winbindd/winbindd_wins.c b/source3/winbindd/winbindd_wins.c index 1326fbc0a32..484b39342a6 100644 --- a/source3/winbindd/winbindd_wins.c +++ b/source3/winbindd/winbindd_wins.c @@ -70,12 +70,14 @@ static int wins_lookup_open_socket_in(void) } -static struct node_status *lookup_byaddr_backend(const char *addr, int *count) +static struct node_status *lookup_byaddr_backend(TALLOC_CTX *mem_ctx, + const char *addr, int *count) { int fd; struct sockaddr_storage ss; struct nmb_name nname; - struct node_status *status; + struct node_status *result; + NTSTATUS status; fd = wins_lookup_open_socket_in(); if (fd == -1) @@ -85,10 +87,13 @@ static struct node_status *lookup_byaddr_backend(const char *addr, int *count) if (!interpret_string_addr(&ss, addr, AI_NUMERICHOST)) { return NULL; } - status = node_status_query(fd, &nname, &ss, count, NULL); - + status = node_status_query(fd, &nname, &ss, mem_ctx, + &result, count, NULL); close(fd); - return status; + if (!NT_STATUS_IS_OK(status)) { + return NULL; + } + return result; } static struct sockaddr_storage *lookup_byname_backend(const char *name, @@ -158,10 +163,11 @@ void winbindd_wins_byip(struct winbindd_cli_state *state) *response = '\0'; maxlen = sizeof(response) - 1; - if ((status = lookup_byaddr_backend(state->request->data.winsreq, &count))){ + if ((status = lookup_byaddr_backend( + state->mem_ctx, state->request->data.winsreq, &count))) { size = strlen(state->request->data.winsreq); if (size > maxlen) { - SAFE_FREE(status); + TALLOC_FREE(status); request_error(state); return; } @@ -173,7 +179,7 @@ void winbindd_wins_byip(struct winbindd_cli_state *state) if (status[i].type == 0x20) { size = sizeof(status[i].name) + strlen(response); if (size > maxlen) { - SAFE_FREE(status); + TALLOC_FREE(status); request_error(state); return; } @@ -183,7 +189,7 @@ void winbindd_wins_byip(struct winbindd_cli_state *state) } /* make last character a newline */ response[strlen(response)-1] = '\n'; - SAFE_FREE(status); + TALLOC_FREE(status); } fstrcpy(state->response->data.winsresp,response); request_ok(state);