diff options
| author | Ralph Boehme <slow@samba.org> | 2019-10-31 12:45:44 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2019-11-07 14:16:41 +0000 |
| commit | 4736623c24503b3ca09c76c9dbb134ef833b2f80 (patch) | |
| tree | 3e7c048663f78bc497ad8080fb1e3e2c5eb57e25 /source3/rpc_server | |
| parent | a591de28659919d2afd7ed55106cded6a0d9ab35 (diff) | |
| download | samba-4736623c24503b3ca09c76c9dbb134ef833b2f80.tar.gz | |
s3: rename talloc_sub_advanced() to talloc_sub_full()
We currently have the following substitution functions:
talloc_sub_basic()
talloc_sub_advanced()
talloc_sub_basic() currently substitutes a subset of talloc_sub_advanced().
We'll need a function X that only substitutes what talloc_sub_advanced()
substitutes *without* what talloc_sub_basic() does.
To get there rename talloc_sub_advanced() to talloc_sub_full(). A subsequent
commit will then bring back talloc_sub_advanced() as described above.
Examples with fictional replacement letters A and B. Currently:
talloc_sub_basic: A
talloc_sub_advanced: AB
New:
talloc_sub_basic: A
talloc_sub_advanced: B
talloc_sub_full: AB
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13745
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source3/rpc_server')
| -rw-r--r-- | source3/rpc_server/srvsvc/srv_srvsvc_nt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c index d4de3cdcfdd..34a227c76e9 100644 --- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c +++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c @@ -225,7 +225,7 @@ static void init_srv_share_info_1(struct pipes_struct *p, char *remark = lp_comment(p->mem_ctx, snum); if (remark) { - remark = talloc_sub_advanced( + remark = talloc_sub_full( p->mem_ctx, lp_servicename(talloc_tos(), snum), get_current_username(), lp_path(talloc_tos(), snum), p->session_info->unix_token->uid, get_current_username(), @@ -253,7 +253,7 @@ static void init_srv_share_info_2(struct pipes_struct *p, remark = lp_comment(p->mem_ctx, snum); if (remark) { - remark = talloc_sub_advanced( + remark = talloc_sub_full( p->mem_ctx, lp_servicename(talloc_tos(), snum), get_current_username(), lp_path(talloc_tos(), snum), p->session_info->unix_token->uid, get_current_username(), @@ -318,7 +318,7 @@ static void init_srv_share_info_501(struct pipes_struct *p, char *remark = lp_comment(p->mem_ctx, snum); if (remark) { - remark = talloc_sub_advanced( + remark = talloc_sub_full( p->mem_ctx, lp_servicename(talloc_tos(), snum), get_current_username(), lp_path(talloc_tos(), snum), p->session_info->unix_token->uid, get_current_username(), @@ -352,7 +352,7 @@ static void init_srv_share_info_502(struct pipes_struct *p, char *remark = lp_comment(ctx, snum); if (remark) { - remark = talloc_sub_advanced( + remark = talloc_sub_full( p->mem_ctx, lp_servicename(talloc_tos(), snum), get_current_username(), lp_path(talloc_tos(), snum), p->session_info->unix_token->uid, get_current_username(), @@ -393,7 +393,7 @@ static void init_srv_share_info_1004(struct pipes_struct *p, char *remark = lp_comment(p->mem_ctx, snum); if (remark) { - remark = talloc_sub_advanced( + remark = talloc_sub_full( p->mem_ctx, lp_servicename(talloc_tos(), snum), get_current_username(), lp_path(talloc_tos(), snum), p->session_info->unix_token->uid, get_current_username(), |