s3-messages: only include messages.h where needed.

[amitay/samba.git] / source3 / lib / afs.c

diff --git a/source3/lib/afs.c b/source3/lib/afs.c
index 9f5d81f44280cf39a6027facb3a781e62c1568a0..d73e9df4c0eb16c5d3da242809eae94623313520 100644 (file)
--- a/source3/lib/afs.c
+++ b/source3/lib/afs.c
@@ -23,6 +23,7 @@
 
 #define NO_ASN1_TYPEDEFS 1
 
+#include <afs/param.h>
 #include <afs/stds.h>
 #include <afs/afs.h>
 #include <afs/auth.h>
@@ -213,14 +214,12 @@ 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;
        bool result;
        char *ticket_str = NULL;
-       const DOM_SID *user_sid;
+       const struct dom_sid *user_sid;
        TALLOC_CTX *ctx = talloc_tos();
 
        struct ClearToken ct;
@@ -232,16 +231,16 @@ 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,
+                               SNUM(conn), conn->session_info->unix_name,
+                               conn->connectpath, conn->session_info->utok.gid,
+                               conn->session_info->sanitized_username,
+                               pdb_get_domain(conn->session_info->sam_account),
                                afs_username);
        if (!afs_username) {
                return false;
        }
 
-       user_sid = &current_user.nt_user_token->user_sids[0];
+       user_sid = &conn->session_info->security_token->user_sids[0];
        afs_username = talloc_string_sub(talloc_tos(),
                                        afs_username,
                                        "%s",
@@ -294,7 +293,7 @@ bool afs_login(connection_struct *conn)
 
 char *afs_createtoken_str(const char *username, const char *cell)
 {
-       return False;
+       return NULL;
 }
 
 #endif /* WITH_FAKE_KASERVER */