diff options
| author | Volker Lendecke <vl@samba.org> | 2008-06-23 08:33:04 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-06-24 10:31:35 +0200 |
| commit | c5401a2a46da9a7523f4363be14805eb893ea0f4 (patch) | |
| tree | 82e7f05d0a9329e8710a20044b293a0a7f36dc45 | |
| parent | 344941bb49d91e6b382196c347e5259e133f506d (diff) | |
| download | samba-c5401a2a46da9a7523f4363be14805eb893ea0f4.tar.gz samba-c5401a2a46da9a7523f4363be14805eb893ea0f4.tar.bz2 samba-c5401a2a46da9a7523f4363be14805eb893ea0f4.zip | |
Correct calculation of "remark" in srv_srvsvc_nt.c
Very likely the client is not interested in the values for the IPC$ share :-)
(This used to be commit 40ca5764cf4310769c002b8cb6041fe2af4e6d0b)
| -rw-r--r-- | source3/rpc_server/srv_srvsvc_nt.c | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c index 6f7b232071..57f2fe7f65 100644 --- a/source3/rpc_server/srv_srvsvc_nt.c +++ b/source3/rpc_server/srv_srvsvc_nt.c @@ -259,9 +259,11 @@ static void init_srv_share_info_1(pipes_struct *p, struct srvsvc_NetShareInfo1 * char *remark = talloc_strdup(p->mem_ctx, lp_comment(snum)); if (remark) { - remark = standard_sub_conn(p->mem_ctx, - p->conn, - remark); + remark = talloc_sub_advanced( + p->mem_ctx, lp_servicename(snum), + get_current_username(), lp_pathname(snum), + p->pipe_user.ut.uid, get_current_username(), + "", remark); } init_srvsvc_NetShareInfo1(r, net_name, @@ -284,9 +286,11 @@ static void init_srv_share_info_2(pipes_struct *p, struct srvsvc_NetShareInfo2 * remark = talloc_strdup(p->mem_ctx, lp_comment(snum)); if (remark) { - remark = standard_sub_conn(p->mem_ctx, - p->conn, - remark); + remark = talloc_sub_advanced( + p->mem_ctx, lp_servicename(snum), + get_current_username(), lp_pathname(snum), + p->pipe_user.ut.uid, get_current_username(), + "", remark); } path = talloc_asprintf(p->mem_ctx, "C:%s", lp_pathname(snum)); @@ -348,7 +352,11 @@ static void init_srv_share_info_501(pipes_struct *p, struct srvsvc_NetShareInfo5 char *remark = talloc_strdup(p->mem_ctx, lp_comment(snum)); if (remark) { - remark = standard_sub_conn(p->mem_ctx, p->conn, remark); + remark = talloc_sub_advanced( + p->mem_ctx, lp_servicename(snum), + get_current_username(), lp_pathname(snum), + p->pipe_user.ut.uid, get_current_username(), + "", remark); } init_srvsvc_NetShareInfo501(r, net_name, @@ -372,7 +380,11 @@ static void init_srv_share_info_502(pipes_struct *p, struct srvsvc_NetShareInfo5 char *remark = talloc_strdup(ctx, lp_comment(snum));; if (remark) { - remark = standard_sub_conn(ctx, p->conn, remark); + remark = talloc_sub_advanced( + p->mem_ctx, lp_servicename(snum), + get_current_username(), lp_pathname(snum), + p->pipe_user.ut.uid, get_current_username(), + "", remark); } path = talloc_asprintf(ctx, "C:%s", lp_pathname(snum)); if (path) { @@ -407,7 +419,11 @@ static void init_srv_share_info_1004(pipes_struct *p, struct srvsvc_NetShareInfo char *remark = talloc_strdup(p->mem_ctx, lp_comment(snum)); if (remark) { - remark = standard_sub_conn(p->mem_ctx, p->conn, remark); + remark = talloc_sub_advanced( + p->mem_ctx, lp_servicename(snum), + get_current_username(), lp_pathname(snum), + p->pipe_user.ut.uid, get_current_username(), + "", remark); } init_srvsvc_NetShareInfo1004(r, remark ? remark : ""); |