r23784: use the GPLv3 boilerplate as recommended by the FSF and the license text

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

diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
index 396499bcb9e9905dcce2fceb45e6c21a5783054f..227c68dd6d9427da7ca222c5427e23cf133cba45 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,28 +14,21 @@
    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"
-#include "../web/swat_proto.h"
+#include "web/swat_proto.h"
 
-#ifdef WITH_WINBIND
+extern struct in_addr loopback_ip;
 
-NSS_STATUS winbindd_request(int req_type,
-                       struct winbindd_request *request,
-                       struct winbindd_response *response);
+#ifdef WITH_WINBIND
 
 /* check to see if winbind is running by pinging it */
 
 BOOL winbindd_running(void)
 {
-
-       if (winbindd_request(WINBINDD_PING, NULL, NULL))
-               return False;
-
-       return True;
+       return winbind_ping();
 }      
 #endif
 
@@ -43,7 +36,6 @@ BOOL winbindd_running(void)
    response */
 BOOL nmbd_running(void)
 {
-       extern struct in_addr loopback_ip;
        int fd, count, flags;
        struct in_addr *ip_list;
 
@@ -67,17 +59,18 @@ BOOL nmbd_running(void)
    then closing it */
 BOOL smbd_running(void)
 {
-       static struct cli_state cli;
-       extern struct in_addr loopback_ip;
+       NTSTATUS status;
+       struct cli_state *cli;
 
-       if (!cli_initialise(&cli))
+       if ((cli = cli_initialise()) == NULL)
                return False;
 
-       if (!cli_connect(&cli, "localhost", &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;
 }