diff options
| author | Jeremy Allison <jra@samba.org> | 2005-12-12 22:07:36 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:05:49 -0500 |
| commit | 7d2771e758d4e8ef0adb45e55775b524de4dba9a (patch) | |
| tree | f9886027f65a557ce7d76659f638591c55f17fdf /source3/utils | |
| parent | 3f6d9a7b9d35331992fdd069b7752f3082fe0b1b (diff) | |
| download | samba-7d2771e758d4e8ef0adb45e55775b524de4dba9a.tar.gz samba-7d2771e758d4e8ef0adb45e55775b524de4dba9a.tar.bz2 samba-7d2771e758d4e8ef0adb45e55775b524de4dba9a.zip | |
r12203: Add the share path into the sharemode db. This involves
revving the minor version number for libsmbsharemodes (we
now have a new _ex interface that takes the share path
as well as the filename). Needed for #3303. Some code written
by SATOH Fumiyasu <fumiya@samba.gr.jp> included in the changes
to locking/locking.c. The smbstatus output is a bit of a mess
and needs overhauling...
Jeremy.
(This used to be commit 9d93af713f8520ca506730dd32aa2b994937eaba)
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/status.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/utils/status.c b/source3/utils/status.c index a495d07f04..2c5756106a 100644 --- a/source3/utils/status.c +++ b/source3/utils/status.c @@ -98,13 +98,13 @@ static BOOL Ucrit_addPid( pid_t pid ) return True; } -static void print_share_mode(const struct share_mode_entry *e, char *fname) +static void print_share_mode(const struct share_mode_entry *e, const char *sharepath, const char *fname) { static int count; if (count==0) { d_printf("Locked files:\n"); - d_printf("Pid DenyMode Access R/W Oplock Name\n"); - d_printf("--------------------------------------------------------------\n"); + d_printf("Pid DenyMode Access R/W Oplock SharePath Name\n"); + d_printf("----------------------------------------------------------------------------------\n"); } count++; @@ -150,7 +150,7 @@ static void print_share_mode(const struct share_mode_entry *e, char *fname) d_printf("NONE "); } - d_printf(" %s %s",fname, asctime(localtime((time_t *)&e->time.tv_sec))); + d_printf(" %s %s %s",sharepath, fname, asctime(localtime((time_t *)&e->time.tv_sec))); } } |