s3-auth Use *unix_token rather than utok in struct auth3_session_info

[amitay/samba.git] / source3 / smbd / msg_idmap.c

diff --git a/source3/smbd/msg_idmap.c b/source3/smbd/msg_idmap.c
index 6819a6eb0e7035e394d296371799d726f50f6e74..b534ac38462be6bc37194ddbdac48456a4479533 100644 (file)
--- a/source3/smbd/msg_idmap.c
+++ b/source3/smbd/msg_idmap.c
@@ -27,13 +27,12 @@
 
 #include "includes.h"
 #include "smbd/smbd.h"
-#include "memcache.h"
 #include "globals.h"
 #include "../libcli/security/dom_sid.h"
-#include "../librpc/gen_ndr/messaging.h"
-#include "../librpc/gen_ndr/ndr_security.h"
 #include "idmap_cache.h"
 #include "passdb/lookup_sid.h"
+#include "auth.h"
+#include "messages.h"
 
 struct id {
        union {
@@ -74,7 +73,7 @@ static bool parse_id(const char* str, struct id* id)
 static bool uid_in_use(const struct user_struct* user, uid_t uid)
 {
        while (user) {
-               if (user->session_info && (user->session_info->utok.uid == uid)) {
+               if (user->session_info && (user->session_info->unix_token->uid == uid)) {
                        return true;
                }
                user = user->next;
@@ -87,12 +86,12 @@ static bool gid_in_use(const struct user_struct* user, gid_t gid)
        while (user) {
                if (user->session_info != NULL) {
                        int i;
-                       struct security_unix_token utok = user->session_info->utok;
-                       if (utok.gid == gid) {
+                       struct security_unix_token *utok = user->session_info->unix_token;
+                       if (utok->gid == gid) {
                                return true;
                        }
-                       for(i=0; i<utok.ngroups; i++) {
-                               if (utok.groups[i] == gid) {
+                       for(i=0; i<utok->ngroups; i++) {
+                               if (utok->groups[i] == gid) {
                                        return true;
                                }
                        }