RIP BOOL. Convert BOOL -> bool. I found a few interesting

[samba.git] / source3 / web / diagnose.c

diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
index 0c9c854df786dd8c547a0999f5c3f87be171c94d..df3b34dd16430d6281dacd776918e4fc536ea828 100644 (file)
--- a/source3/web/diagnose.c
+++ b/source3/web/diagnose.c
@@ -5,7 +5,7 @@
    
    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 2 of the License, or
+   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,
@@ -14,8 +14,7 @@
    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, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
@@ -23,15 +22,9 @@
 
 #ifdef WITH_WINBIND
 
-extern struct in_addr loopback_ip;
-
-NSS_STATUS winbindd_request(int req_type,
-                       struct winbindd_request *request,
-                       struct winbindd_response *response);
-
 /* check to see if winbind is running by pinging it */
 
-BOOL winbindd_running(void)
+bool winbindd_running(void)
 {
        return winbind_ping();
 }      
@@ -39,11 +32,14 @@ BOOL winbindd_running(void)
 
 /* check to see if nmbd is running on localhost by looking for a __SAMBA__
    response */
-BOOL nmbd_running(void)
+bool nmbd_running(void)
 {
+       struct in_addr loopback_ip;
        int fd, count, flags;
        struct in_addr *ip_list;
 
+       loopback_ip.s_addr = htonl(INADDR_LOOPBACK);
+
        if ((fd = open_socket_in(SOCK_DGRAM, 0, 3,
                                 interpret_addr("127.0.0.1"), True)) != -1) {
                if ((ip_list = name_query(fd, "__SAMBA__", 0, 
@@ -62,18 +58,23 @@ BOOL nmbd_running(void)
 
 /* check to see if smbd is running on localhost by trying to open a connection
    then closing it */
-BOOL smbd_running(void)
+bool smbd_running(void)
 {
-       static struct cli_state cli;
+       struct in_addr loopback_ip;
+       NTSTATUS status;
+       struct cli_state *cli;
+
+       loopback_ip.s_addr = htonl(INADDR_LOOPBACK);
 
-       if (!cli_initialise(&cli))
+       if ((cli = cli_initialise()) == NULL)
                return False;
 
-       if (!cli_connect(&cli, global_myname(), &loopback_ip)) {
-               cli_shutdown(&cli);
+       status = cli_connect(cli, global_myname(), &loopback_ip);
+       if (!NT_STATUS_IS_OK(status)) {
+               cli_shutdown(cli);
                return False;
        }
 
-       cli_shutdown(&cli);
+       cli_shutdown(cli);
        return True;
 }