Changeset 740 for vendor/current/nsswitch/wins.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/nsswitch/wins.c (modified) (12 diffs)

vendor/current/nsswitch/wins.c

@@ -20 +20 @@
 
 #include "includes.h"
+#include "nsswitch/winbind_nss.h"
+
 #ifdef HAVE_NS_API_H
 
@@ -38 +40 @@
 
 static int initialised;
-
-extern bool AllowDebugChange;
 
 NSS_STATUS _nss_wins_gethostbyname_r(const char *hostname, struct hostent *he,
@@ -46 +46 @@
                            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;
-        DEBUGLEVEL = 0;
-        AllowDebugChange = False;
+        load_case_tables_library();
+        lp_set_cmdline("log level", "0");
 
         TimeInit();
         setup_logging("nss_wins",False);
-        load_case_tables();
         lp_load(get_dyn_CONFIGFILE(),True,False,False,True);
         load_interfaces();
@@ -105 +60 @@
 static struct in_addr *lookup_byname_backend(const char *name, int *count)
 {
-        int fd = -1;
         struct ip_service *address = NULL;
         struct in_addr *ret = NULL;
-        int j, flags = 0;
+        int j;
 
         if (!initialised) {
@@ -127 +81 @@
                         return NULL;
                 }
-                *ret = ((struct sockaddr_in *)&address[0].ss)->sin_addr;
+                *ret = ((struct sockaddr_in *)(void *)&address[0].ss)
+                        ->sin_addr;
                 free( address );
                 return ret;
-        }
-
-        fd = wins_lookup_open_socket_in();
-        if (fd == -1) {
-                return NULL;
         }
 
@@ -142 +92 @@
                 struct sockaddr_storage ss;
                 struct sockaddr_storage *pss;
+                NTSTATUS status;
+
                 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,
+                                    NULL, &pss, count, NULL);
+                if (NT_STATUS_IS_OK(status) && (*count > 0)) {
                         if ((ret = SMB_MALLOC_P(struct in_addr)) == NULL) {
                                 return NULL;
                         }
                         *ret = ((struct sockaddr_in *)pss)->sin_addr;
+                        TALLOC_FREE(pss);
                         break;
                 }
         }
 
-        close(fd);
         return ret;
 }
@@ -162 +115 @@
 #ifdef HAVE_NS_API_H
 
-static NODE_STATUS_STRUCT *lookup_byaddr_backend(char *addr, int *count)
-{
-        int fd;
+static struct node_status *lookup_byaddr_backend(char *addr, int *count)
+{
         struct sockaddr_storage ss;
         struct nmb_name nname;
-        NODE_STATUS_STRUCT *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);
@@ -181 +130 @@
                 return NULL;
         }
-        status = node_status_query(fd, &nname, &ss, count, NULL);
-
-        close(fd);
-        return status;
+        status = node_status_query(NULL, &nname, &ss, &result, count, NULL);
+        if (!NT_STATUS_IS_OK(status)) {
+                return NULL;
+        }
+
+        return result;
 }
 
@@ -202 +153 @@
         char *addr;
         struct in_addr *ip_list;
-        NODE_STATUS_STRUCT *status;
+        struct node_status *status;
         int i, count, len, size;
         char response[1024];
@@ -234 +185 @@
                     size = strlen(key) + 1;
                     if (size > len) {
-                        free(status);
+                        talloc_free(status);
                         return NSD_ERROR;
                     }
@@ -246 +197 @@
                                 size = sizeof(status[i].name) + 1;
                                 if (size > len) {
-                                    free(status);
+                                    talloc_free(status);
                                     return NSD_ERROR;
                                 }
@@ -256 +207 @@
                     }
                     response[strlen(response)-1] = '\n';
-                    free(status);
+                    talloc_free(status);
                 }
         } else if (StrCaseCmp(map,"hosts.byname") == 0) {