From 4736623c24503b3ca09c76c9dbb134ef833b2f80 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Thu, 31 Oct 2019 12:45:44 +0100 Subject: 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 Reviewed-by: Andreas Schneider --- source3/printing/printing.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/printing/printing.c') diff --git a/source3/printing/printing.c b/source3/printing/printing.c index 0ad07046850..c6bf6ec69dd 100644 --- a/source3/printing/printing.c +++ b/source3/printing/printing.c @@ -1724,7 +1724,7 @@ static void print_queue_update(struct messaging_context *msg_ctx, if (!lpqcommand) { return; } - lpqcommand = talloc_sub_advanced(ctx, + lpqcommand = talloc_sub_full(ctx, lp_servicename(talloc_tos(), snum), current_user_info.unix_name, "", @@ -1744,7 +1744,7 @@ static void print_queue_update(struct messaging_context *msg_ctx, if (!lprmcommand) { return; } - lprmcommand = talloc_sub_advanced(ctx, + lprmcommand = talloc_sub_full(ctx, lp_servicename(talloc_tos(), snum), current_user_info.unix_name, "", @@ -2866,7 +2866,7 @@ WERROR print_job_start(const struct auth_session_info *server_info, fstrcpy(pjob.clientmachine, clientmachine); - userstr = talloc_sub_advanced(talloc_tos(), + userstr = talloc_sub_full(talloc_tos(), sharename, server_info->unix_info->sanitized_username, path, server_info->unix_token->gid, @@ -3035,7 +3035,7 @@ NTSTATUS print_job_end(struct messaging_context *msg_ctx, int snum, status = NT_STATUS_PRINT_CANCELLED; goto fail; } - lpq_cmd = talloc_sub_advanced(tmp_ctx, + lpq_cmd = talloc_sub_full(tmp_ctx, lp_servicename(talloc_tos(), snum), current_user_info.unix_name, "", -- cgit v1.2.1