summaryrefslogtreecommitdiff
path: root/source3/smbd/lanman.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-07-15 15:55:31 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-07-20 09:17:11 +1000
commit92895379934b660affa70cd406e40719d429ae2a (patch)
tree6a6185b2e0476a7045535332fad6201caeda2424 /source3/smbd/lanman.c
parenta39187f0f5e6f99ce8a38cba997e4ad15353e09e (diff)
downloadsamba-92895379934b660affa70cd406e40719d429ae2a.tar.gz
samba-92895379934b660affa70cd406e40719d429ae2a.tar.bz2
samba-92895379934b660affa70cd406e40719d429ae2a.zip
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 <tridge@samba.org>
Diffstat (limited to 'source3/smbd/lanman.c')
-rw-r--r--source3/smbd/lanman.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index f84540fbec..b8fcc3022d 100644
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -117,10 +117,10 @@ static int CopyExpanded(connection_struct *conn,
}
buf = 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,
- conn->session_info->sanitized_username,
+ conn->session_info->unix_info->sanitized_username,
conn->session_info->info3->base.domain.string,
buf);
if (!buf) {
@@ -168,10 +168,10 @@ static int StrlenExpanded(connection_struct *conn, int snum, char *s)
}
buf = 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,
- conn->session_info->sanitized_username,
+ conn->session_info->unix_info->sanitized_username,
conn->session_info->info3->base.domain.string,
buf);
if (!buf) {
@@ -4011,7 +4011,7 @@ static bool api_NetWkstaGetInfo(struct smbd_server_connection *sconn,
p += 4;
SIVAL(p,0,PTR_DIFF(p2,*rdata));
- strlcpy(p2,conn->session_info->sanitized_username,PTR_DIFF(endp,p2));
+ strlcpy(p2,conn->session_info->unix_info->sanitized_username,PTR_DIFF(endp,p2));
p2 = skip_string(*rdata,*rdata_len,p2);
if (!p2) {
return False;
@@ -4636,7 +4636,7 @@ static bool api_WWkstaUserLogon(struct smbd_server_connection *sconn,
if(vuser != NULL) {
DEBUG(3,(" Username of UID %d is %s\n",
(int)vuser->session_info->unix_token->uid,
- vuser->session_info->unix_name));
+ vuser->session_info->unix_info->unix_name));
}
uLevel = get_safe_SVAL(param,tpscnt,p,0,-1);