diff options
Diffstat (limited to 'source3/web')
-rw-r--r-- | source3/web/diagnose.c | 10 | ||||
-rw-r--r-- | source3/web/neg_lang.c | 4 | ||||
-rw-r--r-- | source3/web/swat.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c index d259717da0..b53e139ca9 100644 --- a/source3/web/diagnose.c +++ b/source3/web/diagnose.c @@ -60,16 +60,16 @@ BOOL nmbd_running(void) then closing it */ BOOL smbd_running(void) { - static struct cli_state cli; + struct cli_state *cli; - if (!cli_initialise(&cli)) + if ((cli = cli_initialise()) == NULL) return False; - if (!cli_connect(&cli, global_myname(), &loopback_ip)) { - cli_shutdown(&cli); + if (!cli_connect(cli, global_myname(), &loopback_ip)) { + cli_shutdown(cli); return False; } - cli_shutdown(&cli); + cli_shutdown(cli); return True; } diff --git a/source3/web/neg_lang.c b/source3/web/neg_lang.c index fb79f41f13..207614655d 100644 --- a/source3/web/neg_lang.c +++ b/source3/web/neg_lang.c @@ -57,8 +57,8 @@ static int qsort_cmp_list(const void *x, const void *y) { struct pri_list *a = (struct pri_list *)x; struct pri_list *b = (struct pri_list *)y; if (a->pri > b->pri) return -1; - if (a->pri == b->pri) return 0; - return 1; + if (a->pri < b->pri) return 1; + return 0; } /* diff --git a/source3/web/swat.c b/source3/web/swat.c index d1fd0b4f9b..d43f8941bc 100644 --- a/source3/web/swat.c +++ b/source3/web/swat.c @@ -432,7 +432,7 @@ static void write_config(FILE *f, BOOL show_defaults) { fprintf(f, "# Samba config file created using SWAT\n"); fprintf(f, "# from %s (%s)\n", cgi_remote_host(), cgi_remote_addr()); - fprintf(f, "# Date: %s\n\n", timestring(False)); + fprintf(f, "# Date: %s\n\n", current_timestring(False)); lp_dump(f, show_defaults, iNumNonAutoPrintServices); } |