diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-07-15 14:59:14 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-07-20 09:17:10 +1000 |
| commit | 6d741e918f145c6ec62c22358aabc8162db108fd (patch) | |
| tree | 4d562524b2ff71892911331d707e23045984b0d3 /source3/lib | |
| parent | f16d8f4eb86ecc4741c25e5ed87b2ea4c6717a31 (diff) | |
| download | samba-6d741e918f145c6ec62c22358aabc8162db108fd.tar.gz samba-6d741e918f145c6ec62c22358aabc8162db108fd.tar.bz2 samba-6d741e918f145c6ec62c22358aabc8162db108fd.zip | |
s3-auth Use *unix_token rather than utok in struct auth3_session_info
This brings this structure one step closer to the struct auth_session_info.
A few SMB_ASSERT calls are added in some key places to ensure that
this pointer is initialised, to make tracing any bugs here easier in
future.
NOTE: Many of the users of this structure should be reviewed, as unix
and NT access checks are mixed in a way that should just be done using
the NT ACL. This patch has not changed this behaviour however.
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/afs.c | 2 | ||||
| -rw-r--r-- | source3/lib/substitute.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source3/lib/afs.c b/source3/lib/afs.c index 61a588cfa3..11a930b8b9 100644 --- a/source3/lib/afs.c +++ b/source3/lib/afs.c @@ -232,7 +232,7 @@ bool afs_login(connection_struct *conn) afs_username = talloc_sub_advanced(ctx, SNUM(conn), conn->session_info->unix_name, - conn->connectpath, conn->session_info->utok.gid, + conn->connectpath, conn->session_info->unix_token->gid, conn->session_info->sanitized_username, pdb_get_domain(conn->session_info->sam_account), afs_username); diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c index df217bc03f..bf3cd5d51e 100644 --- a/source3/lib/substitute.c +++ b/source3/lib/substitute.c @@ -815,11 +815,13 @@ 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 */ + SMB_ASSERT(conn->session_info->unix_token); return talloc_sub_advanced(ctx, lp_servicename(SNUM(conn)), conn->session_info->unix_name, conn->connectpath, - conn->session_info->utok.gid, + conn->session_info->unix_token->gid, get_smb_user_name(), "", str); |