Changeset 740 for vendor/current/source3/web/diagnose.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/source3/web/diagnose.c (modified) (3 diffs)

vendor/current/source3/web/diagnose.c

@@ -3 +3 @@
    diagnosis tools for web admin
    Copyright (C) Andrew Tridgell 1998
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -20 +20 @@
 #include "includes.h"
 #include "web/swat_proto.h"
+#include "lib/winbind_util.h"
+#include "libsmb/libsmb.h"
 
 #ifdef WITH_WINBIND
@@ -36 +38 @@
 {
         struct in_addr loopback_ip;
-        int fd, count, flags;
+        int count;
         struct sockaddr_storage *ss_list;
         struct sockaddr_storage ss;
+        NTSTATUS status;
 
         loopback_ip.s_addr = htonl(INADDR_LOOPBACK);
         in_addr_to_sockaddr_storage(&ss, loopback_ip);
 
-        if ((fd = open_socket_in(SOCK_DGRAM, 0, 3,
-                                 &ss, True)) != -1) {
-                if ((ss_list = name_query(fd, "__SAMBA__", 0, 
-                                          True, True, &ss,
-                                          &count, &flags, NULL)) != NULL) {
-                        SAFE_FREE(ss_list);
-                        close(fd);
-                        return True;
-                }
-                close (fd);
+        status = name_query("__SAMBA__", 0,
+                            True, True, &ss,
+                            talloc_tos(), &ss_list, &count,
+                            NULL);
+        if (NT_STATUS_IS_OK(status)) {
+                TALLOC_FREE(ss_list);
+                return True;
         }