diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-07-15 12:45:17 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-07-20 09:17:10 +1000 |
| commit | f16d8f4eb86ecc4741c25e5ed87b2ea4c6717a31 (patch) | |
| tree | bd839288be389cbfe84852e0a114b3ee77589462 /source3/smbd/service.c | |
| parent | d7d8a5ed94a2b572b6818008a858f8c6b529dd03 (diff) | |
| download | samba-f16d8f4eb86ecc4741c25e5ed87b2ea4c6717a31.tar.gz samba-f16d8f4eb86ecc4741c25e5ed87b2ea4c6717a31.tar.bz2 samba-f16d8f4eb86ecc4741c25e5ed87b2ea4c6717a31.zip | |
s3-auth Use struct auth3_session_info outside the auth subsystem
This seperation between the structure used inside the auth modules and
in the wider codebase allows for a gradual migration from struct
auth_serversupplied_info -> struct auth_session_info (from auth.idl)
The idea here is that we keep a clear seperation between the structure
before and after the local groups, local user lookup and the session
key modifications have been processed, as the lack of this seperation
has caused issues in the past.
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source3/smbd/service.c')
| -rw-r--r-- | source3/smbd/service.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/smbd/service.c b/source3/smbd/service.c index 5c410be02a..c772b8a069 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -373,22 +373,22 @@ static NTSTATUS find_forced_group(bool force_user, } /**************************************************************************** - Create an auth_serversupplied_info structure for a connection_struct + Create an auth3_session_info structure for a connection_struct ****************************************************************************/ static NTSTATUS create_connection_session_info(struct smbd_server_connection *sconn, TALLOC_CTX *mem_ctx, int snum, - struct auth_serversupplied_info *vuid_serverinfo, + struct auth3_session_info *vuid_serverinfo, DATA_BLOB password, - struct auth_serversupplied_info **presult) + struct auth3_session_info **presult) { if (lp_guest_only(snum)) { - return make_server_info_guest(mem_ctx, presult); + return make_session_info_guest(mem_ctx, presult); } if (vuid_serverinfo != NULL) { - struct auth_serversupplied_info *result; + struct auth3_session_info *result; /* * This is the normal security != share case where we have a @@ -414,7 +414,7 @@ static NTSTATUS create_connection_session_info(struct smbd_server_connection *sc } } - result = copy_serverinfo(mem_ctx, vuid_serverinfo); + result = copy_session_info(mem_ctx, vuid_serverinfo); if (result == NULL) { return NT_STATUS_NO_MEMORY; } @@ -466,7 +466,7 @@ NTSTATUS set_conn_force_user_group(connection_struct *conn, int snum) */ char *fuser; - struct auth_serversupplied_info *forced_serverinfo; + struct auth3_session_info *forced_serverinfo; fuser = talloc_string_sub(conn, lp_force_user(snum), "%S", lp_const_servicename(snum)); |