From 92895379934b660affa70cd406e40719d429ae2a Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 15 Jul 2011 15:55:31 +1000 Subject: s3-auth Use struct auth_user_info_unix for unix_name and sanitized_username This is closer to the layout of struct auth_session_info in auth.idl Andrew Bartlett Signed-off-by: Andrew Tridgell --- source3/lib/afs.c | 4 ++-- source3/lib/substitute.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'source3/lib') diff --git a/source3/lib/afs.c b/source3/lib/afs.c index 11a930b8b9..7a49c5772e 100644 --- a/source3/lib/afs.c +++ b/source3/lib/afs.c @@ -231,9 +231,9 @@ bool afs_login(connection_struct *conn) } afs_username = talloc_sub_advanced(ctx, - SNUM(conn), conn->session_info->unix_name, + SNUM(conn), conn->session_info->unix_info->unix_name, conn->connectpath, conn->session_info->unix_token->gid, - conn->session_info->sanitized_username, + conn->session_info->unix_info->sanitized_username, pdb_get_domain(conn->session_info->sam_account), afs_username); if (!afs_username) { diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c index bf3cd5d51e..eae6d15f7c 100644 --- a/source3/lib/substitute.c +++ b/source3/lib/substitute.c @@ -815,11 +815,12 @@ void standard_sub_advanced(const char *servicename, const char *user, char *standard_sub_conn(TALLOC_CTX *ctx, connection_struct *conn, const char *str) { - /* Make clear that we require the optional unix_token in the source3 code */ + /* Make clear that we require the optional unix_token and unix_info in the source3 code */ SMB_ASSERT(conn->session_info->unix_token); + SMB_ASSERT(conn->session_info->unix_info); return talloc_sub_advanced(ctx, lp_servicename(SNUM(conn)), - conn->session_info->unix_name, + conn->session_info->unix_info->unix_name, conn->connectpath, conn->session_info->unix_token->gid, get_smb_user_name(), -- cgit