diff options
| author | Ralph Boehme <slow@samba.org> | 2015-10-11 09:38:18 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2015-10-12 22:13:19 +0200 |
| commit | cd0c2a5eca43cea76491ae0d820414287c234c1a (patch) | |
| tree | dcafa8f35f23b3765a00d9fff3fcb2a3f3043e3b /source3/rpc_server/srvsvc/srv_srvsvc_nt.c | |
| parent | d643aafe59738890cb8b71e2e865c56ea1fe6539 (diff) | |
| download | samba-cd0c2a5eca43cea76491ae0d820414287c234c1a.tar.gz | |
s3:smbstatus: add stream name to share_entry_forall()
Add stream name argument to share_entry_forall machinery so smbstatus
can print the stream name of a file.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=11550
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/rpc_server/srvsvc/srv_srvsvc_nt.c')
| -rw-r--r-- | source3/rpc_server/srvsvc/srv_srvsvc_nt.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c index be79e6ab2ae..96c022beaa0 100644 --- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c +++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c @@ -80,7 +80,9 @@ struct share_conn_stat { ********************************************************************/ static int enum_file_fn(const struct share_mode_entry *e, - const char *sharepath, const char *fname, + const char *sharepath, + const char *fname, + const char *sname, void *private_data) { struct file_enum_count *fenum = @@ -129,8 +131,9 @@ static int enum_file_fn(const struct share_mode_entry *e, if ( strcmp( fname, "." ) == 0 ) { fullpath = talloc_asprintf(fenum->ctx, "C:%s", sharepath ); } else { - fullpath = talloc_asprintf(fenum->ctx, "C:%s/%s", - sharepath, fname ); + fullpath = talloc_asprintf(fenum->ctx, "C:%s/%s%s", + sharepath, fname, + sname ? sname : ""); } if (!fullpath) { return 0; @@ -829,7 +832,9 @@ static WERROR init_srv_sess_info_0(struct pipes_struct *p, **********************************************************************/ static int count_sess_files_fn(const struct share_mode_entry *e, - const char *sharepath, const char *fname, + const char *sharepath, + const char *fname, + const char *sname, void *data) { struct sess_file_info *info = data; @@ -954,7 +959,9 @@ static WERROR init_srv_sess_info_1(struct pipes_struct *p, ********************************************************************/ static int share_file_fn(const struct share_mode_entry *e, - const char *sharepath, const char *fname, + const char *sharepath, + const char *fname, + const char *sname, void *data) { struct share_file_stat *sfs = data; @@ -2692,7 +2699,9 @@ struct enum_file_close_state { }; static int enum_file_close_fn(const struct share_mode_entry *e, - const char *sharepath, const char *fname, + const char *sharepath, + const char *fname, + const char *sname, void *private_data) { char msg[MSG_SMB_SHARE_MODE_ENTRY_SIZE]; |