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/smbd | |
| 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/smbd')
| -rw-r--r-- | source3/smbd/lanman.c | 4 | ||||
| -rw-r--r-- | source3/smbd/service.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c index 50451b2778d..ee6e9a481e2 100644 --- a/source3/smbd/lanman.c +++ b/source3/smbd/lanman.c @@ -115,7 +115,7 @@ static int CopyExpanded(connection_struct *conn, *p_space_remaining = 0; return 0; } - buf = talloc_sub_advanced(ctx, + buf = talloc_sub_full(ctx, lp_servicename(ctx, SNUM(conn)), conn->session_info->unix_info->unix_name, conn->connectpath, @@ -166,7 +166,7 @@ static int StrlenExpanded(connection_struct *conn, int snum, char *s) if (!buf) { return 0; } - buf = talloc_sub_advanced(ctx, + buf = talloc_sub_full(ctx, lp_servicename(ctx, SNUM(conn)), conn->session_info->unix_info->unix_name, conn->connectpath, diff --git a/source3/smbd/service.c b/source3/smbd/service.c index 7e252a459b3..1a708fc622c 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -611,7 +611,7 @@ static NTSTATUS make_connection_snum(struct smbXsrv_connection *xconn, conn->vuid = vuser->vuid; { - char *s = talloc_sub_advanced(talloc_tos(), + char *s = talloc_sub_full(talloc_tos(), lp_const_servicename(SNUM(conn)), conn->session_info->unix_info->unix_name, conn->connectpath, @@ -727,7 +727,7 @@ static NTSTATUS make_connection_snum(struct smbXsrv_connection *xconn, * to below */ /* execute any "root preexec = " line */ if (*lp_root_preexec(talloc_tos(), snum)) { - char *cmd = talloc_sub_advanced(talloc_tos(), + char *cmd = talloc_sub_full(talloc_tos(), lp_const_servicename(SNUM(conn)), conn->session_info->unix_info->unix_name, conn->connectpath, @@ -765,7 +765,7 @@ static NTSTATUS make_connection_snum(struct smbXsrv_connection *xconn, /* execute any "preexec = " line */ if (*lp_preexec(talloc_tos(), snum)) { - char *cmd = talloc_sub_advanced(talloc_tos(), + char *cmd = talloc_sub_full(talloc_tos(), lp_const_servicename(SNUM(conn)), conn->session_info->unix_info->unix_name, conn->connectpath, @@ -1163,7 +1163,7 @@ void close_cnum(connection_struct *conn, uint64_t vuid) /* execute any "postexec = " line */ if (*lp_postexec(talloc_tos(), SNUM(conn)) && change_to_user_and_service(conn, vuid)) { - char *cmd = talloc_sub_advanced(talloc_tos(), + char *cmd = talloc_sub_full(talloc_tos(), lp_const_servicename(SNUM(conn)), conn->session_info->unix_info->unix_name, conn->connectpath, @@ -1179,7 +1179,7 @@ void close_cnum(connection_struct *conn, uint64_t vuid) change_to_root_user(); /* execute any "root postexec = " line */ if (*lp_root_postexec(talloc_tos(), SNUM(conn))) { - char *cmd = talloc_sub_advanced(talloc_tos(), + char *cmd = talloc_sub_full(talloc_tos(), lp_const_servicename(SNUM(conn)), conn->session_info->unix_info->unix_name, conn->connectpath, |