s3: auth: Move the declaration of struct dom_sid tmp_sid to function level scope.
[samba.git] / source3 / auth / token_util.c
index 7634e76f1c98148ce163ca28c059662a6ef3b2cc..f6ce1315c0825ca8de01f9dec26079e2aabf3eaa 100644 (file)
 /* functions moved from auth/auth_util.c to minimize linker deps */
 
 #include "includes.h"
+#include "system/passwd.h"
+#include "auth.h"
 #include "secrets.h"
+#include "../lib/util/memcache.h"
+#include "../librpc/gen_ndr/netlogon.h"
+#include "../libcli/security/security.h"
+#include "../lib/util/util_pw.h"
+#include "passdb.h"
+#include "lib/privileges.h"
 
 /****************************************************************************
- Check for a SID in an NT_USER_TOKEN
+ Check for a SID in an struct security_token
 ****************************************************************************/
 
-bool nt_token_check_sid ( const struct dom_sid *sid, const NT_USER_TOKEN *token )
+bool nt_token_check_sid ( const struct dom_sid *sid, const struct security_token *token )
 {
-       int i;
-
        if ( !sid || !token )
                return False;
 
-       for ( i=0; i<token->num_sids; i++ ) {
-               if ( sid_equal( sid, &token->user_sids[i] ) )
-                       return True;
-       }
-
-       return False;
+       return security_token_has_sid(token, sid);
 }
 
-bool nt_token_check_domain_rid( NT_USER_TOKEN *token, uint32 rid )
+bool nt_token_check_domain_rid( struct security_token *token, uint32 rid )
 {
        struct dom_sid domain_sid;
 
@@ -73,12 +74,12 @@ bool nt_token_check_domain_rid( NT_USER_TOKEN *token, uint32 rid )
  Create a token for the root user to be used internally by smbd.
  This is similar to running under the context of the LOCAL_SYSTEM account
  in Windows.  This is a read-only token.  Do not modify it or free() it.
- Create a copy if your need to change it.
+ Create a copy if you need to change it.
 ******************************************************************************/
 
-NT_USER_TOKEN *get_root_nt_token( void )
+struct security_token *get_root_nt_token( void )
 {
-       struct nt_user_token *token, *for_cache;
+       struct security_token *token, *for_cache;
        struct dom_sid u_sid, g_sid;
        struct passwd *pw;
        void *cache_data;
@@ -89,13 +90,13 @@ NT_USER_TOKEN *get_root_nt_token( void )
 
        if (cache_data != NULL) {
                return talloc_get_type_abort(
-                       cache_data, struct nt_user_token);
+                       cache_data, struct security_token);
        }
 
-       if ( !(pw = sys_getpwuid(0)) ) {
-               if ( !(pw = sys_getpwnam("root")) ) {
-                       DEBUG(0,("get_root_nt_token: both sys_getpwuid(0) "
-                               "and sys_getpwnam(\"root\") failed!\n"));
+       if ( !(pw = getpwuid(0)) ) {
+               if ( !(pw = getpwnam("root")) ) {
+                       DEBUG(0,("get_root_nt_token: both getpwuid(0) "
+                               "and getpwnam(\"root\") failed!\n"));
                        return NULL;
                }
        }
@@ -106,10 +107,10 @@ NT_USER_TOKEN *get_root_nt_token( void )
        uid_to_sid(&u_sid, pw->pw_uid);
        gid_to_sid(&g_sid, pw->pw_gid);
 
-       token = create_local_nt_token(talloc_autofree_context(), &u_sid, False,
+       token = create_local_nt_token(talloc_tos(), &u_sid, False,
                                      1, &global_sid_Builtin_Administrators);
 
-       token->privileges = se_disk_operators;
+       security_token_set_privilege(token, SEC_PRIV_DISK_OPERATOR);
 
        for_cache = token;
 
@@ -126,7 +127,7 @@ NT_USER_TOKEN *get_root_nt_token( void )
  */
 
 NTSTATUS add_aliases(const struct dom_sid *domain_sid,
-                    struct nt_user_token *token)
+                    struct security_token *token)
 {
        uint32 *aliases;
        size_t i, num_aliases;
@@ -141,7 +142,7 @@ NTSTATUS add_aliases(const struct dom_sid *domain_sid,
        num_aliases = 0;
 
        status = pdb_enum_alias_memberships(tmp_ctx, domain_sid,
-                                           token->user_sids,
+                                           token->sids,
                                            token->num_sids,
                                            &aliases, &num_aliases);
 
@@ -155,7 +156,7 @@ NTSTATUS add_aliases(const struct dom_sid *domain_sid,
                struct dom_sid alias_sid;
                sid_compose(&alias_sid, domain_sid, aliases[i]);
                status = add_sid_to_array_unique(token, &alias_sid,
-                                                &token->user_sids,
+                                                &token->sids,
                                                 &token->num_sids);
                if (!NT_STATUS_IS_OK(status)) {
                        DEBUG(0, ("add_sid_to_array failed\n"));
@@ -171,7 +172,7 @@ done:
 /*******************************************************************
 *******************************************************************/
 
-static NTSTATUS add_builtin_administrators(struct nt_user_token *token,
+static NTSTATUS add_builtin_administrators(struct security_token *token,
                                           const struct dom_sid *dom_sid)
 {
        struct dom_sid domadm;
@@ -197,7 +198,7 @@ static NTSTATUS add_builtin_administrators(struct nt_user_token *token,
        if ( nt_token_check_sid( &domadm, token ) ) {
                status = add_sid_to_array(token,
                                          &global_sid_Builtin_Administrators,
-                                         &token->user_sids, &token->num_sids);
+                                         &token->sids, &token->num_sids);
        if (!NT_STATUS_IS_OK(status)) {
                        return status;
                }
@@ -206,153 +207,23 @@ static NTSTATUS add_builtin_administrators(struct nt_user_token *token,
        return NT_STATUS_OK;
 }
 
-/**
- * Create the requested BUILTIN if it doesn't already exist.  This requires
- * winbindd to be running.
- *
- * @param[in] rid BUILTIN rid to create
- * @return Normal NTSTATUS return.
- */
-static NTSTATUS create_builtin(uint32 rid)
-{
-       NTSTATUS status = NT_STATUS_OK;
-       struct dom_sid sid;
-       gid_t gid;
-
-       if (!sid_compose(&sid, &global_sid_Builtin, rid)) {
-               return NT_STATUS_NO_SUCH_ALIAS;
-       }
-
-       if (!sid_to_gid(&sid, &gid)) {
-               if (!lp_winbind_nested_groups() || !winbind_ping()) {
-                       return NT_STATUS_PROTOCOL_UNREACHABLE;
-               }
-               status = pdb_create_builtin_alias(rid);
-       }
-       return status;
-}
-
-/**
- * Add sid as a member of builtin_sid.
- *
- * @param[in] builtin_sid      An existing builtin group.
- * @param[in] dom_sid          sid to add as a member of builtin_sid.
- * @return Normal NTSTATUS return
- */
-static NTSTATUS add_sid_to_builtin(const struct dom_sid *builtin_sid,
-                                  const struct dom_sid *dom_sid)
-{
-       NTSTATUS status = NT_STATUS_OK;
-
-       if (!dom_sid || !builtin_sid) {
-               return NT_STATUS_INVALID_PARAMETER;
-       }
-
-       status = pdb_add_aliasmem(builtin_sid, dom_sid);
-
-       if (NT_STATUS_EQUAL(status, NT_STATUS_MEMBER_IN_ALIAS)) {
-               DEBUG(5, ("add_sid_to_builtin %s is already a member of %s\n",
-                         sid_string_dbg(dom_sid),
-                         sid_string_dbg(builtin_sid)));
-               return NT_STATUS_OK;
-       }
-
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(4, ("add_sid_to_builtin %s could not be added to %s: "
-                         "%s\n", sid_string_dbg(dom_sid),
-                         sid_string_dbg(builtin_sid), nt_errstr(status)));
-       }
-       return status;
-}
-
-/*******************************************************************
-*******************************************************************/
-
-NTSTATUS create_builtin_users(const struct dom_sid *dom_sid)
-{
-       NTSTATUS status;
-       struct dom_sid dom_users;
-
-       status = create_builtin(BUILTIN_RID_USERS);
-       if ( !NT_STATUS_IS_OK(status) ) {
-               DEBUG(5,("create_builtin_users: Failed to create Users\n"));
-               return status;
-       }
-
-       /* add domain users */
-       if ((IS_DC || (lp_server_role() == ROLE_DOMAIN_MEMBER))
-               && sid_compose(&dom_users, dom_sid, DOMAIN_RID_USERS))
-       {
-               status = add_sid_to_builtin(&global_sid_Builtin_Users,
-                                           &dom_users);
-       }
-
-       return status;
-}
-
-/*******************************************************************
-*******************************************************************/
-
-NTSTATUS create_builtin_administrators(const struct dom_sid *dom_sid)
-{
-       NTSTATUS status;
-       struct dom_sid dom_admins, root_sid;
-       fstring root_name;
-       enum lsa_SidType type;
-       TALLOC_CTX *ctx;
-       bool ret;
-
-       status = create_builtin(BUILTIN_RID_ADMINISTRATORS);
-       if ( !NT_STATUS_IS_OK(status) ) {
-               DEBUG(5,("create_builtin_administrators: Failed to create Administrators\n"));
-               return status;
-       }
-
-       /* add domain admins */
-       if ((IS_DC || (lp_server_role() == ROLE_DOMAIN_MEMBER))
-               && sid_compose(&dom_admins, dom_sid, DOMAIN_RID_ADMINS))
-       {
-               status = add_sid_to_builtin(&global_sid_Builtin_Administrators,
-                                           &dom_admins);
-               if (!NT_STATUS_IS_OK(status)) {
-                       return status;
-               }
-       }
-
-       /* add root */
-       if ( (ctx = talloc_init("create_builtin_administrators")) == NULL ) {
-               return NT_STATUS_NO_MEMORY;
-       }
-       fstr_sprintf( root_name, "%s\\root", get_global_sam_name() );
-       ret = lookup_name(ctx, root_name, LOOKUP_NAME_DOMAIN, NULL, NULL,
-                         &root_sid, &type);
-       TALLOC_FREE( ctx );
-
-       if ( ret ) {
-               status = add_sid_to_builtin(&global_sid_Builtin_Administrators,
-                                           &root_sid);
-       }
-
-       return status;
-}
-
-static NTSTATUS finalize_local_nt_token(struct nt_user_token *result,
+static NTSTATUS finalize_local_nt_token(struct security_token *result,
                                        bool is_guest);
 
 NTSTATUS create_local_nt_token_from_info3(TALLOC_CTX *mem_ctx,
                                          bool is_guest,
-                                         struct netr_SamInfo3 *info3,
-                                         struct extra_auth_info *extra,
-                                         struct nt_user_token **ntok)
+                                         const struct netr_SamInfo3 *info3,
+                                         const struct extra_auth_info *extra,
+                                         struct security_token **ntok)
 {
-       struct nt_user_token *usrtok = NULL;
+       struct security_token *usrtok = NULL;
        NTSTATUS status;
        int i;
 
        DEBUG(10, ("Create local NT token for %s\n",
                   info3->base.account_name.string));
 
-       usrtok = talloc_zero(mem_ctx, struct nt_user_token);
+       usrtok = talloc_zero(mem_ctx, struct security_token);
        if (!usrtok) {
                DEBUG(0, ("talloc failed\n"));
                return NT_STATUS_NO_MEMORY;
@@ -362,8 +233,8 @@ NTSTATUS create_local_nt_token_from_info3(TALLOC_CTX *mem_ctx,
        /* check if the user rid is the special "Domain Guests" rid.
         * If so pick the first sid for the extra sids instead as it
         * is a local fake account */
-       usrtok->user_sids = talloc_array(usrtok, struct dom_sid, 2);
-       if (!usrtok->user_sids) {
+       usrtok->sids = talloc_array(usrtok, struct dom_sid, 2);
+       if (!usrtok->sids) {
                TALLOC_FREE(usrtok);
                return NT_STATUS_NO_MEMORY;
        }
@@ -380,10 +251,10 @@ NTSTATUS create_local_nt_token_from_info3(TALLOC_CTX *mem_ctx,
                        TALLOC_FREE(usrtok);
                        return NT_STATUS_UNSUCCESSFUL;
                }
-               sid_copy(&usrtok->user_sids[0], &extra->user_sid);
+               sid_copy(&usrtok->sids[0], &extra->user_sid);
        } else {
-               sid_copy(&usrtok->user_sids[0], info3->base.domain_sid);
-               sid_append_rid(&usrtok->user_sids[0], info3->base.rid);
+               sid_copy(&usrtok->sids[0], info3->base.domain_sid);
+               sid_append_rid(&usrtok->sids[0], info3->base.rid);
        }
 
        /* GROUP SID */
@@ -397,10 +268,10 @@ NTSTATUS create_local_nt_token_from_info3(TALLOC_CTX *mem_ctx,
                        TALLOC_FREE(usrtok);
                        return NT_STATUS_UNSUCCESSFUL;
                }
-               sid_copy(&usrtok->user_sids[1], &extra->pgid_sid);
+               sid_copy(&usrtok->sids[1], &extra->pgid_sid);
        } else {
-               sid_copy(&usrtok->user_sids[1], info3->base.domain_sid);
-               sid_append_rid(&usrtok->user_sids[1],
+               sid_copy(&usrtok->sids[1], info3->base.domain_sid);
+               sid_append_rid(&usrtok->sids[1],
                                info3->base.primary_gid);
        }
 
@@ -417,7 +288,7 @@ NTSTATUS create_local_nt_token_from_info3(TALLOC_CTX *mem_ctx,
                sid_append_rid(&tmp_sid, info3->base.groups.rids[i].rid);
 
                status = add_sid_to_array_unique(usrtok, &tmp_sid,
-                                                &usrtok->user_sids,
+                                                &usrtok->sids,
                                                 &usrtok->num_sids);
                if (!NT_STATUS_IS_OK(status)) {
                        DEBUG(3, ("Failed to add SID to nt token\n"));
@@ -431,7 +302,7 @@ NTSTATUS create_local_nt_token_from_info3(TALLOC_CTX *mem_ctx,
        for (i = 0; i < info3->sidcount; i++) {
                status = add_sid_to_array_unique(usrtok,
                                                 info3->sids[i].sid,
-                                                &usrtok->user_sids,
+                                                &usrtok->sids,
                                                 &usrtok->num_sids);
                if (!NT_STATUS_IS_OK(status)) {
                        DEBUG(3, ("Failed to add SID to nt token\n"));
@@ -455,20 +326,20 @@ NTSTATUS create_local_nt_token_from_info3(TALLOC_CTX *mem_ctx,
  Create a NT token for the user, expanding local aliases
 *******************************************************************/
 
-struct nt_user_token *create_local_nt_token(TALLOC_CTX *mem_ctx,
+struct security_token *create_local_nt_token(TALLOC_CTX *mem_ctx,
                                            const struct dom_sid *user_sid,
                                            bool is_guest,
                                            int num_groupsids,
                                            const struct dom_sid *groupsids)
 {
-       struct nt_user_token *result = NULL;
+       struct security_token *result = NULL;
        int i;
        NTSTATUS status;
 
        DEBUG(10, ("Create local NT token for %s\n",
                   sid_string_dbg(user_sid)));
 
-       if (!(result = TALLOC_ZERO_P(mem_ctx, struct nt_user_token))) {
+       if (!(result = talloc_zero(mem_ctx, struct security_token))) {
                DEBUG(0, ("talloc failed\n"));
                return NULL;
        }
@@ -476,7 +347,7 @@ struct nt_user_token *create_local_nt_token(TALLOC_CTX *mem_ctx,
        /* Add the user and primary group sid */
 
        status = add_sid_to_array(result, user_sid,
-                                 &result->user_sids, &result->num_sids);
+                                 &result->sids, &result->num_sids);
        if (!NT_STATUS_IS_OK(status)) {
                TALLOC_FREE(result);
                return NULL;
@@ -485,7 +356,7 @@ struct nt_user_token *create_local_nt_token(TALLOC_CTX *mem_ctx,
        /* For guest, num_groupsids may be zero. */
        if (num_groupsids) {
                status = add_sid_to_array(result, &groupsids[0],
-                                         &result->user_sids,
+                                         &result->sids,
                                          &result->num_sids);
                if (!NT_STATUS_IS_OK(status)) {
                        TALLOC_FREE(result);
@@ -501,7 +372,7 @@ struct nt_user_token *create_local_nt_token(TALLOC_CTX *mem_ctx,
 
        for (i=1; i<num_groupsids; i++) {
                status = add_sid_to_array_unique(result, &groupsids[i],
-                                                &result->user_sids,
+                                                &result->sids,
                                                 &result->num_sids);
                if (!NT_STATUS_IS_OK(status)) {
                        TALLOC_FREE(result);
@@ -518,29 +389,130 @@ struct nt_user_token *create_local_nt_token(TALLOC_CTX *mem_ctx,
        return result;
 }
 
-static NTSTATUS finalize_local_nt_token(struct nt_user_token *result,
+/***************************************************
+ Merge in any groups from /etc/group.
+***************************************************/
+
+static NTSTATUS add_local_groups(struct security_token *result,
+                                bool is_guest)
+{
+       gid_t *gids = NULL;
+       uint32_t getgroups_num_group_sids = 0;
+       struct passwd *pass = NULL;
+       TALLOC_CTX *tmp_ctx = talloc_stackframe();
+       int i;
+
+       if (is_guest) {
+               /*
+                * Guest is a special case. It's always
+                * a user that can be looked up, but
+                * result->sids[0] is set to DOMAIN\Guest.
+                * Lookup by account name instead.
+                */
+               pass = Get_Pwnam_alloc(tmp_ctx, lp_guest_account());
+       } else {
+               uid_t uid;
+
+               /* For non-guest result->sids[0] is always the user sid. */
+               if (!sid_to_uid(&result->sids[0], &uid)) {
+                       /*
+                        * Non-mappable SID like SYSTEM.
+                        * Can't be in any /etc/group groups.
+                        */
+                       TALLOC_FREE(tmp_ctx);
+                       return NT_STATUS_OK;
+               }
+
+               pass = getpwuid_alloc(tmp_ctx, uid);
+               if (pass == NULL) {
+                       DEBUG(1, ("SID %s -> getpwuid(%u) failed\n",
+                               sid_string_dbg(&result->sids[0]),
+                               (unsigned int)uid));
+               }
+       }
+
+       if (!pass) {
+               TALLOC_FREE(tmp_ctx);
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       /*
+        * Now we must get any groups this user has been
+        * added to in /etc/group and merge them in.
+        * This has to be done in every code path
+        * that creates an NT token, as remote users
+        * may have been added to the local /etc/group
+        * database. Tokens created merely from the
+        * info3 structs (via the DC or via the krb5 PAC)
+        * won't have these local groups. Note the
+        * groups added here will only be UNIX groups
+        * (S-1-22-2-XXXX groups) as getgroups_unix_user()
+        * turns off winbindd before calling getgroups().
+        *
+        * NB. This is duplicating work already
+        * done in the 'unix_user:' case of
+        * create_token_from_sid() but won't
+        * do anything other than be inefficient
+        * in that case.
+        */
+
+       if (!getgroups_unix_user(tmp_ctx, pass->pw_name, pass->pw_gid,
+                       &gids, &getgroups_num_group_sids)) {
+               DEBUG(1, ("getgroups_unix_user for user %s failed\n",
+                       pass->pw_name));
+               TALLOC_FREE(tmp_ctx);
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       for (i=0; i<getgroups_num_group_sids; i++) {
+               NTSTATUS status;
+               struct dom_sid grp_sid;
+               gid_to_sid(&grp_sid, gids[i]);
+
+               status = add_sid_to_array_unique(result,
+                                        &grp_sid,
+                                        &result->sids,
+                                        &result->num_sids);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(3, ("Failed to add UNIX SID to nt token\n"));
+                       TALLOC_FREE(tmp_ctx);
+                       return status;
+               }
+       }
+       TALLOC_FREE(tmp_ctx);
+       return NT_STATUS_OK;
+}
+
+static NTSTATUS finalize_local_nt_token(struct security_token *result,
                                        bool is_guest)
 {
        struct dom_sid dom_sid;
-       gid_t gid;
        NTSTATUS status;
+       struct acct_info *info;
+
+       /* Add any local groups. */
+
+       status = add_local_groups(result, is_guest);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
 
        /* Add in BUILTIN sids */
 
        status = add_sid_to_array(result, &global_sid_World,
-                                 &result->user_sids, &result->num_sids);
+                                 &result->sids, &result->num_sids);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
        status = add_sid_to_array(result, &global_sid_Network,
-                                 &result->user_sids, &result->num_sids);
+                                 &result->sids, &result->num_sids);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
 
        if (is_guest) {
                status = add_sid_to_array(result, &global_sid_Builtin_Guests,
-                                         &result->user_sids,
+                                         &result->sids,
                                          &result->num_sids);
                if (!NT_STATUS_IS_OK(status)) {
                        return status;
@@ -548,18 +520,25 @@ static NTSTATUS finalize_local_nt_token(struct nt_user_token *result,
        } else {
                status = add_sid_to_array(result,
                                          &global_sid_Authenticated_Users,
-                                         &result->user_sids,
+                                         &result->sids,
                                          &result->num_sids);
                if (!NT_STATUS_IS_OK(status)) {
                        return status;
                }
        }
 
+       info = talloc_zero(talloc_tos(), struct acct_info);
+       if (info == NULL) {
+               DEBUG(0, ("talloc failed!\n"));
+               return NT_STATUS_NO_MEMORY;
+       }
+
        /* Deal with the BUILTIN\Administrators group.  If the SID can
           be resolved then assume that the add_aliasmem( S-1-5-32 )
           handled it. */
 
-       if (!sid_to_gid(&global_sid_Builtin_Administrators, &gid)) {
+       status = pdb_get_aliasinfo(&global_sid_Builtin_Administrators, info);
+       if (!NT_STATUS_IS_OK(status)) {
 
                become_root();
                if (!secrets_fetch_domain_sid(lp_workgroup(), &dom_sid)) {
@@ -590,7 +569,8 @@ static NTSTATUS finalize_local_nt_token(struct nt_user_token *result,
           be resolved then assume that the add_aliasmem( S-1-5-32 )
           handled it. */
 
-       if (!sid_to_gid(&global_sid_Builtin_Users, &gid)) {
+       status = pdb_get_aliasinfo(&global_sid_Builtin_Users, info);
+       if (!NT_STATUS_IS_OK(status)) {
 
                become_root();
                if (!secrets_fetch_domain_sid(lp_workgroup(), &dom_sid)) {
@@ -610,6 +590,8 @@ static NTSTATUS finalize_local_nt_token(struct nt_user_token *result,
                }
        }
 
+       TALLOC_FREE(info);
+
        /* Deal with local groups */
 
        if (lp_winbind_nested_groups()) {
@@ -639,38 +621,12 @@ static NTSTATUS finalize_local_nt_token(struct nt_user_token *result,
 
        /* Add privileges based on current user sids */
 
-       get_privileges_for_sids(&result->privileges, result->user_sids,
+       get_privileges_for_sids(&result->privilege_mask, result->sids,
                                result->num_sids);
 
        return NT_STATUS_OK;
 }
 
-/****************************************************************************
- prints a NT_USER_TOKEN to debug output.
-****************************************************************************/
-
-void debug_nt_user_token(int dbg_class, int dbg_lev, NT_USER_TOKEN *token)
-{
-       size_t     i;
-
-       if (!token) {
-               DEBUGC(dbg_class, dbg_lev, ("NT user token: (NULL)\n"));
-               return;
-       }
-
-       DEBUGC(dbg_class, dbg_lev,
-              ("NT user token of user %s\n",
-               sid_string_dbg(&token->user_sids[0]) ));
-       DEBUGADDC(dbg_class, dbg_lev,
-                 ("contains %lu SIDs\n", (unsigned long)token->num_sids));
-       for (i = 0; i < token->num_sids; i++)
-               DEBUGADDC(dbg_class, dbg_lev,
-                         ("SID[%3lu]: %s\n", (unsigned long)i,
-                          sid_string_dbg(&token->user_sids[i])));
-
-       dump_se_priv( dbg_class, dbg_lev, &token->privileges );
-}
-
 /****************************************************************************
  prints a UNIX 'token' to debug output.
 ****************************************************************************/
@@ -691,11 +647,7 @@ void debug_unix_user_token(int dbg_class, int dbg_lev, uid_t uid, gid_t gid,
 }
 
 /*
- * Create an artificial NT token given just a username. (Initially intended
- * for force user)
- *
- * We go through lookup_name() to avoid problems we had with 'winbind use
- * default domain'.
+ * Create an artificial NT token given just a domain SID.
  *
  * We have 3 cases:
  *
@@ -709,38 +661,28 @@ void debug_unix_user_token(int dbg_class, int dbg_lev, uid_t uid, gid_t gid,
  * http://lists.samba.org/archive/samba-technical/2006-January/044803.html.
  */
 
-NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
-                                   bool is_guest,
-                                   uid_t *uid, gid_t *gid,
-                                   char **found_username,
-                                   struct nt_user_token **token)
+static NTSTATUS create_token_from_sid(TALLOC_CTX *mem_ctx,
+                                     const struct dom_sid *user_sid,
+                                     bool is_guest,
+                                     uid_t *uid, gid_t *gid,
+                                     char **found_username,
+                                     struct security_token **token)
 {
        NTSTATUS result = NT_STATUS_NO_SUCH_USER;
        TALLOC_CTX *tmp_ctx = talloc_stackframe();
-       struct dom_sid user_sid;
-       enum lsa_SidType type;
        gid_t *gids;
        struct dom_sid *group_sids;
        struct dom_sid unix_group_sid;
-       size_t num_group_sids;
-       size_t num_gids;
-       size_t i;
-
-       if (!lookup_name_smbconf(tmp_ctx, username, LOOKUP_NAME_ALL,
-                        NULL, NULL, &user_sid, &type)) {
-               DEBUG(1, ("lookup_name_smbconf for %s failed\n", username));
-               goto done;
-       }
-
-       if (type != SID_NAME_USER) {
-               DEBUG(1, ("%s is a %s, not a user\n", username,
-                         sid_type_lookup(type)));
-               goto done;
-       }
-
-       if (sid_check_is_in_our_domain(&user_sid)) {
+       struct dom_sid tmp_sid;
+       uint32_t num_group_sids;
+       uint32_t num_gids;
+       uint32_t i;
+       uint32_t high, low;
+       bool range_ok;
+
+       if (sid_check_is_in_our_sam(user_sid)) {
                bool ret;
-
+               uint32_t pdb_num_group_sids;
                /* This is a passdb user, so ask passdb */
 
                struct samu *sam_acct = NULL;
@@ -751,26 +693,27 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
                }
 
                become_root();
-               ret = pdb_getsampwsid(sam_acct, &user_sid);
+               ret = pdb_getsampwsid(sam_acct, user_sid);
                unbecome_root();
 
                if (!ret) {
-                       DEBUG(1, ("pdb_getsampwsid(%s) for user %s failed\n",
-                                 sid_string_dbg(&user_sid), username));
-                       DEBUGADD(1, ("Fall back to unix user %s\n", username));
+                       DEBUG(1, ("pdb_getsampwsid(%s) failed\n",
+                                 sid_string_dbg(user_sid)));
+                       DEBUGADD(1, ("Fall back to unix user\n"));
                        goto unix_user;
                }
 
                result = pdb_enum_group_memberships(tmp_ctx, sam_acct,
                                                    &group_sids, &gids,
-                                                   &num_group_sids);
+                                                   &pdb_num_group_sids);
                if (!NT_STATUS_IS_OK(result)) {
-                       DEBUG(1, ("enum_group_memberships failed for %s (%s): "
-                                 "%s\n", username, sid_string_dbg(&user_sid),
+                       DEBUG(1, ("enum_group_memberships failed for %s: "
+                                 "%s\n", sid_string_dbg(user_sid),
                                  nt_errstr(result)));
-                       DEBUGADD(1, ("Fall back to unix user %s\n", username));
+                       DEBUGADD(1, ("Fall back to unix uid lookup\n"));
                        goto unix_user;
                }
+               num_group_sids = pdb_num_group_sids;
 
                /* see the smb_panic() in pdb_default_enum_group_memberships */
                SMB_ASSERT(num_group_sids > 0);
@@ -781,19 +724,24 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
                *found_username = talloc_strdup(mem_ctx,
                                                pdb_get_username(sam_acct));
 
+               if (*found_username == NULL) {
+                       result = NT_STATUS_NO_MEMORY;
+                       goto done;
+               }
+
                /*
                 * If the SID from lookup_name() was the guest sid, passdb knows
-                * about the mapping of guest sid to lp_guestaccount()
+                * about the mapping of guest sid to lp_guest_account()
                 * username and will return the unix_pw info for a guest
                 * user. Use it if it's there, else lookup the *uid details
-                * using getpwnam_alloc(). See bug #6291 for details. JRA.
+                * using Get_Pwnam_alloc(). See bug #6291 for details. JRA.
                 */
 
                /* We must always assign the *uid. */
                if (sam_acct->unix_pw == NULL) {
-                       struct passwd *pwd = getpwnam_alloc(sam_acct, *found_username );
+                       struct passwd *pwd = Get_Pwnam_alloc(sam_acct, *found_username );
                        if (!pwd) {
-                               DEBUG(10, ("getpwnam_alloc failed for %s\n",
+                               DEBUG(10, ("Get_Pwnam_alloc failed for %s\n",
                                        *found_username));
                                result = NT_STATUS_NO_SUCH_USER;
                                goto done;
@@ -808,8 +756,8 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
                }
                *uid = sam_acct->unix_pw->pw_uid;
 
-       } else  if (sid_check_is_in_unix_users(&user_sid)) {
-
+       } else  if (sid_check_is_in_unix_users(user_sid)) {
+               uint32_t getgroups_num_group_sids;
                /* This is a unix user not in passdb. We need to ask nss
                 * directly, without consulting passdb */
 
@@ -823,33 +771,35 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
 
        unix_user:
 
-               if (!sid_to_uid(&user_sid, uid)) {
-                       DEBUG(1, ("unix_user case, sid_to_uid for %s (%s) failed\n",
-                                 username, sid_string_dbg(&user_sid)));
+               if (!sid_to_uid(user_sid, uid)) {
+                       DEBUG(1, ("unix_user case, sid_to_uid for %s failed\n",
+                                 sid_string_dbg(user_sid)));
                        result = NT_STATUS_NO_SUCH_USER;
                        goto done;
                }
 
-               uid_to_unix_users_sid(*uid, &user_sid);
+               uid_to_unix_users_sid(*uid, &tmp_sid);
+               user_sid = &tmp_sid;
 
                pass = getpwuid_alloc(tmp_ctx, *uid);
                if (pass == NULL) {
-                       DEBUG(1, ("getpwuid(%u) for user %s failed\n",
-                                 (unsigned int)*uid, username));
+                       DEBUG(1, ("getpwuid(%u) failed\n",
+                                 (unsigned int)*uid));
                        goto done;
                }
 
-               if (!getgroups_unix_user(tmp_ctx, username, pass->pw_gid,
-                                        &gids, &num_group_sids)) {
+               if (!getgroups_unix_user(tmp_ctx, pass->pw_name, pass->pw_gid,
+                                        &gids, &getgroups_num_group_sids)) {
                        DEBUG(1, ("getgroups_unix_user for user %s failed\n",
-                                 username));
+                                 pass->pw_name));
                        goto done;
                }
+               num_group_sids = getgroups_num_group_sids;
 
                if (num_group_sids) {
-                       group_sids = TALLOC_ARRAY(tmp_ctx, struct dom_sid, num_group_sids);
+                       group_sids = talloc_array(tmp_ctx, struct dom_sid, num_group_sids);
                        if (group_sids == NULL) {
-                               DEBUG(1, ("TALLOC_ARRAY failed\n"));
+                               DEBUG(1, ("talloc_array failed\n"));
                                result = NT_STATUS_NO_MEMORY;
                                goto done;
                        }
@@ -868,6 +818,10 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
 
                /* Ensure we're returning the found_username on the right context. */
                *found_username = talloc_strdup(mem_ctx, pass->pw_name);
+               if (*found_username == NULL) {
+                       result = NT_STATUS_NO_MEMORY;
+                       goto done;
+               }
        } else {
 
                /* This user is from winbind, force the primary gid to the
@@ -877,26 +831,24 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
                 * correct info. AD might prohibit winbind looking up that
                 * information. */
 
-               uint32 dummy;
-
                /* We must always assign the *uid. */
-               if (!sid_to_uid(&user_sid, uid)) {
-                       DEBUG(1, ("winbindd case, sid_to_uid for %s (%s) failed\n",
-                                 username, sid_string_dbg(&user_sid)));
+               if (!sid_to_uid(user_sid, uid)) {
+                       DEBUG(1, ("winbindd case, sid_to_uid for %s failed\n",
+                                 sid_string_dbg(user_sid)));
                        result = NT_STATUS_NO_SUCH_USER;
                        goto done;
                }
 
                num_group_sids = 1;
-               group_sids = TALLOC_ARRAY(tmp_ctx, struct dom_sid, num_group_sids);
+               group_sids = talloc_array(tmp_ctx, struct dom_sid, num_group_sids);
                if (group_sids == NULL) {
-                       DEBUG(1, ("TALLOC_ARRAY failed\n"));
+                       DEBUG(1, ("talloc_array failed\n"));
                        result = NT_STATUS_NO_MEMORY;
                        goto done;
                }
 
-               sid_copy(&group_sids[0], &user_sid);
-               sid_split_rid(&group_sids[0], &dummy);
+               sid_copy(&group_sids[0], user_sid);
+               sid_split_rid(&group_sids[0], NULL);
                sid_append_rid(&group_sids[0], DOMAIN_RID_USERS);
 
                if (!sid_to_gid(&group_sids[0], gid)) {
@@ -907,8 +859,7 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
 
                gids = gid;
 
-               /* Ensure we're returning the found_username on the right context. */
-               *found_username = talloc_strdup(mem_ctx, username);
+               *found_username = NULL;
        }
 
        /* Add the "Unix Group" SID for each gid to catch mapped groups
@@ -919,13 +870,13 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
           to 'valid user = "Domain Admins"'.  --jerry */
 
        num_gids = num_group_sids;
+       range_ok = lp_idmap_default_range(&low, &high);
        for ( i=0; i<num_gids; i++ ) {
-               gid_t high, low;
 
                /* don't pickup anything managed by Winbind */
-
-               if ( lp_idmap_gid(&low, &high) && (gids[i] >= low) && (gids[i] <= high) )
+               if (range_ok && (gids[i] >= low) && (gids[i] <= high)) {
                        continue;
+               }
 
                gid_to_unix_groups_sid(gids[i], &unix_group_sid);
 
@@ -937,10 +888,10 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
        }
 
        /* Ensure we're creating the nt_token on the right context. */
-       *token = create_local_nt_token(mem_ctx, &user_sid,
+       *token = create_local_nt_token(mem_ctx, user_sid,
                                       is_guest, num_group_sids, group_sids);
 
-       if ((*token == NULL) || (*found_username == NULL)) {
+       if (*token == NULL) {
                result = NT_STATUS_NO_MEMORY;
                goto done;
        }
@@ -951,6 +902,118 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
        return result;
 }
 
+/*
+ * Create an artificial NT token given just a username. (Initially intended
+ * for force user)
+ *
+ * We go through lookup_name() to avoid problems we had with 'winbind use
+ * default domain'.
+ *
+ * We have 3 cases:
+ *
+ * unmapped unix users: Go directly to nss to find the user's group.
+ *
+ * A passdb user: The list of groups is provided by pdb_enum_group_memberships.
+ *
+ * If the user is provided by winbind, the primary gid is set to "domain
+ * users" of the user's domain. For an explanation why this is necessary, see
+ * the thread starting at
+ * http://lists.samba.org/archive/samba-technical/2006-January/044803.html.
+ */
+
+NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
+                                   bool is_guest,
+                                   uid_t *uid, gid_t *gid,
+                                   char **found_username,
+                                   struct security_token **token)
+{
+       NTSTATUS result = NT_STATUS_NO_SUCH_USER;
+       TALLOC_CTX *tmp_ctx = talloc_stackframe();
+       struct dom_sid user_sid;
+       enum lsa_SidType type;
+
+       if (!lookup_name_smbconf(tmp_ctx, username, LOOKUP_NAME_ALL,
+                        NULL, NULL, &user_sid, &type)) {
+               DEBUG(1, ("lookup_name_smbconf for %s failed\n", username));
+               goto done;
+       }
+
+       if (type != SID_NAME_USER) {
+               DEBUG(1, ("%s is a %s, not a user\n", username,
+                         sid_type_lookup(type)));
+               goto done;
+       }
+
+       result = create_token_from_sid(mem_ctx, &user_sid, is_guest, uid, gid, found_username, token);
+
+       if (!NT_STATUS_IS_OK(result)) {
+               goto done;
+       }
+
+       /*
+        * If result == NT_STATUS_OK then
+        * we know we have a valid token. Ensure
+        * we also have a valid username to match.
+        */
+
+       if (*found_username == NULL) {
+               *found_username = talloc_strdup(mem_ctx, username);
+               if (*found_username == NULL) {
+                       result = NT_STATUS_NO_MEMORY;
+               }
+       }
+
+done:
+       TALLOC_FREE(tmp_ctx);
+       return result;
+}
+
+/***************************************************************************
+ Build upon create_token_from_sid:
+
+ Expensive helper function to figure out whether a user given its sid is
+ member of a particular group.
+***************************************************************************/
+
+bool user_sid_in_group_sid(const struct dom_sid *sid, const struct dom_sid *group_sid)
+{
+       NTSTATUS status;
+       uid_t uid;
+       gid_t gid;
+       char *found_username;
+       struct security_token *token;
+       bool result = false;
+       enum lsa_SidType type;
+       TALLOC_CTX *mem_ctx = talloc_stackframe();
+
+       if (!lookup_sid(mem_ctx, sid,
+                        NULL, NULL, &type)) {
+               DEBUG(1, ("lookup_sid for %s failed\n", dom_sid_string(mem_ctx, sid)));
+               goto done;
+       }
+
+       if (type != SID_NAME_USER) {
+               DEBUG(5, ("%s is a %s, not a user\n", dom_sid_string(mem_ctx, sid),
+                         sid_type_lookup(type)));
+               goto done;
+       }
+
+       status = create_token_from_sid(mem_ctx, sid, False,
+                                      &uid, &gid, &found_username,
+                                      &token);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(10, ("could not create token for %s\n", dom_sid_string(mem_ctx, sid)));
+               goto done;
+       }
+
+       result = security_token_has_sid(token, group_sid);
+
+done:
+       TALLOC_FREE(mem_ctx);
+       return result;
+}
+
 /***************************************************************************
  Build upon create_token_from_username:
 
@@ -964,7 +1027,7 @@ bool user_in_group_sid(const char *username, const struct dom_sid *group_sid)
        uid_t uid;
        gid_t gid;
        char *found_username;
-       struct nt_user_token *token;
+       struct security_token *token;
        bool result;
        TALLOC_CTX *mem_ctx = talloc_stackframe();
 
@@ -978,7 +1041,7 @@ bool user_in_group_sid(const char *username, const struct dom_sid *group_sid)
                return False;
        }
 
-       result = nt_token_check_sid(group_sid, token);
+       result = security_token_has_sid(token, group_sid);
 
        TALLOC_FREE(mem_ctx);
        return result;