summaryrefslogtreecommitdiff
path: root/source3/smbd/uid.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-07-15 12:45:17 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-07-20 09:17:10 +1000
commitf16d8f4eb86ecc4741c25e5ed87b2ea4c6717a31 (patch)
treebd839288be389cbfe84852e0a114b3ee77589462 /source3/smbd/uid.c
parentd7d8a5ed94a2b572b6818008a858f8c6b529dd03 (diff)
downloadsamba-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/uid.c')
-rw-r--r--source3/smbd/uid.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c
index 8114144574..5d703e3a18 100644
--- a/source3/smbd/uid.c
+++ b/source3/smbd/uid.c
@@ -87,7 +87,7 @@ static void free_conn_session_info_if_unused(connection_struct *conn)
static bool check_user_ok(connection_struct *conn,
uint16_t vuid,
- const struct auth_serversupplied_info *session_info,
+ const struct auth3_session_info *session_info,
int snum)
{
bool valid_vuid = (vuid != UID_FIELD_INVALID);
@@ -158,7 +158,7 @@ static bool check_user_ok(connection_struct *conn,
* username-based faked one.
*/
- ent->session_info = copy_serverinfo(
+ ent->session_info = copy_session_info(
conn, conn->force_user ? conn->session_info : session_info);
if (ent->session_info == NULL) {
@@ -190,7 +190,7 @@ static bool check_user_ok(connection_struct *conn,
****************************************************************************/
static bool change_to_user_internal(connection_struct *conn,
- const struct auth_serversupplied_info *session_info,
+ const struct auth3_session_info *session_info,
uint16_t vuid)
{
int snum;
@@ -277,7 +277,7 @@ static bool change_to_user_internal(connection_struct *conn,
bool change_to_user(connection_struct *conn, uint16_t vuid)
{
- const struct auth_serversupplied_info *session_info = NULL;
+ const struct auth3_session_info *session_info = NULL;
user_struct *vuser;
int snum = SNUM(conn);
@@ -328,7 +328,7 @@ bool change_to_user(connection_struct *conn, uint16_t vuid)
}
bool change_to_user_by_session(connection_struct *conn,
- const struct auth_serversupplied_info *session_info)
+ const struct auth3_session_info *session_info)
{
SMB_ASSERT(conn != NULL);
SMB_ASSERT(session_info != NULL);
@@ -367,7 +367,7 @@ bool smbd_change_to_root_user(void)
user. Doesn't modify current_user.
****************************************************************************/
-bool become_authenticated_pipe_user(struct auth_serversupplied_info *session_info)
+bool become_authenticated_pipe_user(struct auth3_session_info *session_info)
{
if (!push_sec_ctx())
return False;
@@ -487,7 +487,7 @@ bool become_user(connection_struct *conn, uint16 vuid)
}
bool become_user_by_session(connection_struct *conn,
- const struct auth_serversupplied_info *session_info)
+ const struct auth3_session_info *session_info)
{
if (!push_sec_ctx())
return false;