file_server: Use samba4 auth module for guest logins as well

[nivanova/samba-autobuild/.git] / nsswitch / wins.c

diff --git a/nsswitch/wins.c b/nsswitch/wins.c
index d7beed5352688204a7f25768141c6d2256d6eead..d63968b2bc5a3a055de016ad666a1800544f7576 100644 (file)
--- a/nsswitch/wins.c
+++ b/nsswitch/wins.c
@@ -45,54 +45,10 @@ NSS_STATUS _nss_wins_gethostbyname_r(const char *hostname, struct hostent *he,
 NSS_STATUS _nss_wins_gethostbyname2_r(const char *name, int af, struct hostent *he,
                           char *buffer, size_t buflen, int *h_errnop);
 
-/* Use our own create socket code so we don't recurse.... */
-
-static int wins_lookup_open_socket_in(void)
-{
-       struct sockaddr_in sock;
-       int val=1;
-       int res;
-
-       memset((char *)&sock,'\0',sizeof(sock));
-
-#ifdef HAVE_SOCK_SIN_LEN
-       sock.sin_len = sizeof(sock);
-#endif
-       sock.sin_port = 0;
-       sock.sin_family = AF_INET;
-       sock.sin_addr.s_addr = interpret_addr("0.0.0.0");
-       res = socket(AF_INET, SOCK_DGRAM, 0);
-       if (res == -1)
-               return -1;
-
-       if (setsockopt(res,SOL_SOCKET,SO_REUSEADDR,(char *)&val,sizeof(val)) != 0) {
-               close(res);
-               return -1;
-       }
-#ifdef SO_REUSEPORT
-       if (setsockopt(res,SOL_SOCKET,SO_REUSEPORT,(char *)&val,sizeof(val)) != 0) {
-               close(res);
-               return -1;
-       }
-#endif /* SO_REUSEPORT */
-
-       /* now we've got a socket - we need to bind it */
-
-       if (bind(res, (struct sockaddr * ) &sock,sizeof(sock)) < 0) {
-               close(res);
-               return(-1);
-       }
-
-       set_socket_options(res,"SO_BROADCAST");
-
-       return res;
-}
-
-
 static void nss_wins_init(void)
 {
        initialised = 1;
-       load_case_tables();
+       load_case_tables_library();
        lp_set_cmdline("log level", "0");
 
        TimeInit();
@@ -103,10 +59,11 @@ static void nss_wins_init(void)
 
 static struct in_addr *lookup_byname_backend(const char *name, int *count)
 {
-       int fd = -1;
-       struct ip_service *address = NULL;
+       TALLOC_CTX *frame = talloc_stackframe();
+       struct sockaddr_storage *address = NULL;
        struct in_addr *ret = NULL;
-       int j, flags = 0;
+       NTSTATUS status;
+       int j;
 
        if (!initialised) {
                nss_wins_init();
@@ -115,47 +72,46 @@ static struct in_addr *lookup_byname_backend(const char *name, int *count)
        *count = 0;
 
        /* always try with wins first */
-       if (NT_STATUS_IS_OK(resolve_wins(name,0x00,&address,count))) {
+       status = resolve_wins(name, 0x00, talloc_tos(),
+                             &address, count);
+       if (NT_STATUS_IS_OK(status)) {
                if ( (ret = SMB_MALLOC_P(struct in_addr)) == NULL ) {
-                       free( address );
+                       TALLOC_FREE(frame);
                        return NULL;
                }
-               if (address[0].ss.ss_family != AF_INET) {
-                       free(address);
+               if (address[0].ss_family != AF_INET) {
                        free(ret);
+                       TALLOC_FREE(frame);
                        return NULL;
                }
-               *ret = ((struct sockaddr_in *)&address[0].ss)->sin_addr;
-               free( address );
+               *ret = ((struct sockaddr_in *)(void *)address)
+                       ->sin_addr;
+               TALLOC_FREE(frame);
                return ret;
        }
 
-       fd = wins_lookup_open_socket_in();
-       if (fd == -1) {
-               return NULL;
-       }
-
        /* uggh, we have to broadcast to each interface in turn */
        for (j=iface_count() - 1;j >= 0;j--) {
                const struct in_addr *bcast = iface_n_bcast_v4(j);
                struct sockaddr_storage ss;
                struct sockaddr_storage *pss;
+
                if (!bcast) {
                        continue;
                }
                in_addr_to_sockaddr_storage(&ss, *bcast);
-               pss = name_query(fd,name,0x00,True,True,&ss,count, &flags, NULL);
-               if (pss) {
+               status = name_query(name, 0x00, True, True, &ss,
+                                   talloc_tos(), &pss, count, NULL);
+               if (NT_STATUS_IS_OK(status) && (*count > 0)) {
                        if ((ret = SMB_MALLOC_P(struct in_addr)) == NULL) {
+                               TALLOC_FREE(frame);
                                return NULL;
                        }
                        *ret = ((struct sockaddr_in *)pss)->sin_addr;
-                       SAFE_FREE(pss);
                        break;
                }
        }
-
-       close(fd);
+       TALLOC_FREE(frame);
        return ret;
 }
 
@@ -163,27 +119,25 @@ static struct in_addr *lookup_byname_backend(const char *name, int *count)
 
 static struct node_status *lookup_byaddr_backend(char *addr, int *count)
 {
-       int fd;
        struct sockaddr_storage ss;
        struct nmb_name nname;
-       struct node_status *status;
+       struct node_status *result;
+       NTSTATUS status;
 
        if (!initialised) {
                nss_wins_init();
        }
 
-       fd = wins_lookup_open_socket_in();
-       if (fd == -1)
-               return NULL;
-
        make_nmb_name(&nname, "*", 0);
        if (!interpret_string_addr(&ss, addr, AI_NUMERICHOST)) {
                return NULL;
        }
-       status = node_status_query(fd, &nname, &ss, count, NULL);
+       status = node_status_query(NULL, &nname, &ss, &result, count, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               return NULL;
+       }
 
-       close(fd);
-       return status;
+       return result;
 }
 
 /* IRIX version */
@@ -229,11 +183,11 @@ int lookup(nsd_file_t *rq)
         * response needs to be a string of the following format
         * ip_address[ ip_address]*\tname[ alias]*
         */
-       if (StrCaseCmp(map,"hosts.byaddr") == 0) {
+       if (strcasecmp_m(map,"hosts.byaddr") == 0) {
                if ( status = lookup_byaddr_backend(key, &count)) {
                    size = strlen(key) + 1;
                    if (size > len) {
-                       free(status);
+                       talloc_free(status);
                        return NSD_ERROR;
                    }
                    len -= size;
@@ -245,7 +199,7 @@ int lookup(nsd_file_t *rq)
                        if (status[i].type == 0x20) {
                                size = sizeof(status[i].name) + 1;
                                if (size > len) {
-                                   free(status);
+                                   talloc_free(status);
                                    return NSD_ERROR;
                                }
                                len -= size;
@@ -255,9 +209,9 @@ int lookup(nsd_file_t *rq)
                        }
                    }
                    response[strlen(response)-1] = '\n';
-                   free(status);
+                   talloc_free(status);
                }
-       } else if (StrCaseCmp(map,"hosts.byname") == 0) {
+       } else if (strcasecmp_m(map,"hosts.byname") == 0) {
            if (ip_list = lookup_byname_backend(key, &count)) {
                for (i = count; i ; i--) {
                    addr = inet_ntoa(ip_list[i-1]);