summaryrefslogtreecommitdiff
path: root/lib/afs
diff options
context:
space:
mode:
authorRalph Boehme <slow@samba.org>2019-11-07 11:01:05 +0100
committerStefan Metzmacher <metze@samba.org>2019-11-27 10:25:37 +0000
commitb5c6964a50be03999432fa5620be39dcb7093ad8 (patch)
tree3933192064a7df757929b2f12b204e94746e4ef5 /lib/afs
parenteddc63be868434d3aa5a66b514b692f4d7b8833a (diff)
downloadsamba-b5c6964a50be03999432fa5620be39dcb7093ad8.tar.gz
s3:param: make "servicename" a substituted option
Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'lib/afs')
-rw-r--r--lib/afs/afs_funcs.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/afs/afs_funcs.c b/lib/afs/afs_funcs.c
index 66451665462..c7b263c7e73 100644
--- a/lib/afs/afs_funcs.c
+++ b/lib/afs/afs_funcs.c
@@ -221,6 +221,8 @@ char *afs_createtoken_str(const char *username, const char *cell)
bool afs_login(connection_struct *conn)
{
+ const struct loadparm_substitution *lp_sub =
+ loadparm_s3_global_substitution();
DATA_BLOB ticket;
char *afs_username = NULL;
char *cell = NULL;
@@ -239,7 +241,7 @@ bool afs_login(connection_struct *conn)
}
afs_username = talloc_sub_advanced(ctx,
- lp_servicename(ctx, SNUM(conn)),
+ lp_servicename(ctx, lp_sub, SNUM(conn)),
conn->session_info->unix_info->unix_name,
conn->connectpath,
conn->session_info->unix_token->gid,