diff options
| author | Jeremy Allison <jra@samba.org> | 2006-07-11 18:01:26 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:19:14 -0500 |
| commit | fbdcf2663b56007a438ac4f0d8d82436b1bfe688 (patch) | |
| tree | 4e42c1f061391cea3d640152fd240682cbf4fd9a /source3/web | |
| parent | 5bf62a0c3cc95abe918f3e772bb10e0a90fdce22 (diff) | |
| download | samba-fbdcf2663b56007a438ac4f0d8d82436b1bfe688.tar.gz samba-fbdcf2663b56007a438ac4f0d8d82436b1bfe688.tar.bz2 samba-fbdcf2663b56007a438ac4f0d8d82436b1bfe688.zip | |
r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need
to do the upper layer directories but this is what
everyone is waiting for....
Jeremy.
(This used to be commit 9dafb7f48ca3e7af956b0a7d1720c2546fc4cfb8)
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); } |