diff options
| author | Jeremy Allison <jra@samba.org> | 2006-01-31 21:54:24 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:06:20 -0500 |
| commit | 0e551cd5a2f468ad297f1bfbccbc9f91579dc794 (patch) | |
| tree | 781b12f55294896c9a8a70ba9c4dd78015f3201e | |
| parent | a2cfc56befc5d6db66f394f750f2f945b746dcb3 (diff) | |
| download | samba-0e551cd5a2f468ad297f1bfbccbc9f91579dc794.tar.gz samba-0e551cd5a2f468ad297f1bfbccbc9f91579dc794.tar.bz2 samba-0e551cd5a2f468ad297f1bfbccbc9f91579dc794.zip | |
r13262: Arrgggg. Fix smbstatus and swat status to ignore
bloody placeholder share mode entries (I hate
these - I've had to add this filter code now to too
many places :-).
Jeremy.
(This used to be commit 815340e1a413f98c1c36aacc1c34041e9160d0e3)
| -rw-r--r-- | source3/utils/status.c | 5 | ||||
| -rw-r--r-- | source3/web/statuspage.c | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/source3/utils/status.c b/source3/utils/status.c index 2aed68be89..c334fe6982 100644 --- a/source3/utils/status.c +++ b/source3/utils/status.c @@ -101,6 +101,11 @@ static BOOL Ucrit_addPid( pid_t pid ) static void print_share_mode(const struct share_mode_entry *e, const char *sharepath, const char *fname) { static int count; + + if (!is_valid_share_mode_entry(e)) { + return; + } + if (count==0) { d_printf("Locked files:\n"); d_printf("Pid DenyMode Access R/W Oplock SharePath Name\n"); diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c index 24d7eaf72e..7430f4ebf5 100644 --- a/source3/web/statuspage.c +++ b/source3/web/statuspage.c @@ -109,7 +109,13 @@ static char *tstring(time_t t) static void print_share_mode(const struct share_mode_entry *e, const char *sharepath, const char *fname) { char *utf8_fname; - int deny_mode = map_share_mode_to_deny_mode(e->share_access, + int deny_mode; + + if (!is_valid_share_mode_entry(e)) { + return; + } + + deny_mode = map_share_mode_to_deny_mode(e->share_access, e->private_options); printf("<tr><td>%s</td>",_(mapPid2Machine(e->pid))); |