From 50ab871813d8281760e0c70d454cba996e0b67d8 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 11 May 2008 11:26:33 +0200 Subject: Remove some references to get_current_username() and current_user_info (This used to be commit 344d69f95e217d16213eaa6b53141af6ab459708) --- source3/lib/afs.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'source3/lib/afs.c') diff --git a/source3/lib/afs.c b/source3/lib/afs.c index c4569d97bb..7193f0e46d 100644 --- a/source3/lib/afs.c +++ b/source3/lib/afs.c @@ -213,8 +213,6 @@ char *afs_createtoken_str(const char *username, const char *cell) bool afs_login(connection_struct *conn) { - extern userdom_struct current_user_info; - extern struct current_user current_user; DATA_BLOB ticket; char *afs_username = NULL; char *cell = NULL; @@ -234,14 +232,14 @@ bool afs_login(connection_struct *conn) afs_username = talloc_sub_advanced(ctx, SNUM(conn), conn->user, conn->connectpath, conn->gid, - get_current_username(), - current_user_info.domain, + conn->server_info->sanitized_username, + pdb_get_domain(conn->server_info->sam_account), afs_username); if (!afs_username) { return false; } - user_sid = ¤t_user.nt_user_token->user_sids[0]; + user_sid = &conn->server_info->ptok->user_sids[0]; afs_username = talloc_string_sub(talloc_tos(), afs_username, "%s", -- cgit