diff options
| author | Ralph Boehme <slow@samba.org> | 2019-10-31 12:45:44 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2019-11-18 09:18:14 +0000 |
| commit | 3a9fa54ca0eb8102c04689d5c3924610353711de (patch) | |
| tree | e2c31b11c4037f4f1e96731a16071a09d61415c7 /source3/modules | |
| parent | eb30462529983cdd5cf30ec9385f2191e8ba2b3b (diff) | |
| download | samba-3a9fa54ca0eb8102c04689d5c3924610353711de.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>
(backported from commit 4736623c24503b3ca09c76c9dbb134ef833b2f80)
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/vfs_expand_msdfs.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_full_audit.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_recycle.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_virusfilter_utils.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/source3/modules/vfs_expand_msdfs.c b/source3/modules/vfs_expand_msdfs.c index 598da08c0c8..ccd124ac617 100644 --- a/source3/modules/vfs_expand_msdfs.c +++ b/source3/modules/vfs_expand_msdfs.c @@ -154,7 +154,7 @@ static char *expand_msdfs_target(TALLOC_CTX *ctx, return NULL; } - targethost = talloc_sub_advanced(ctx, + targethost = talloc_sub_full(ctx, lp_servicename(talloc_tos(), SNUM(conn)), conn->session_info->unix_info->unix_name, conn->connectpath, diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c index fcfb024d493..8b04e55444e 100644 --- a/source3/modules/vfs_full_audit.c +++ b/source3/modules/vfs_full_audit.c @@ -485,7 +485,7 @@ static char *audit_prefix(TALLOC_CTX *ctx, connection_struct *conn) if (!prefix) { return NULL; } - result = talloc_sub_advanced(ctx, + result = talloc_sub_full(ctx, lp_servicename(talloc_tos(), SNUM(conn)), conn->session_info->unix_info->unix_name, conn->connectpath, diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c index e84f0351c87..0b7b820f18b 100644 --- a/source3/modules/vfs_recycle.c +++ b/source3/modules/vfs_recycle.c @@ -460,7 +460,7 @@ static int recycle_unlink(vfs_handle_struct *handle, bool exist; int rc = -1; - repository = talloc_sub_advanced(NULL, lp_servicename(talloc_tos(), SNUM(conn)), + repository = talloc_sub_full(NULL, lp_servicename(talloc_tos(), SNUM(conn)), conn->session_info->unix_info->unix_name, conn->connectpath, conn->session_info->unix_token->gid, diff --git a/source3/modules/vfs_virusfilter_utils.c b/source3/modules/vfs_virusfilter_utils.c index f56fc6ed5d8..8ec61a0c8f2 100644 --- a/source3/modules/vfs_virusfilter_utils.c +++ b/source3/modules/vfs_virusfilter_utils.c @@ -35,7 +35,7 @@ char *virusfilter_string_sub( connection_struct *conn, const char *str) { - return talloc_sub_advanced(mem_ctx, + return talloc_sub_full(mem_ctx, lp_servicename(mem_ctx, SNUM(conn)), conn->session_info->unix_info->unix_name, conn->connectpath, |