lib:ldb: Use correct integer types for sizes

[vlendec/samba-autobuild/.git] / source3 / lib / util_nttoken.c

diff --git a/source3/lib/util_nttoken.c b/source3/lib/util_nttoken.c
index 680dd29ba77b10a4f52d451cc26dc1b85111e28f..925b79c041c24dbb772e5f469027a2aaa698a931 100644 (file)
--- a/source3/lib/util_nttoken.c
+++ b/source3/lib/util_nttoken.c
@@ -2,7 +2,7 @@
  *  Unix SMB/CIFS implementation.
  *  Authentication utility functions
  *  Copyright (C) Andrew Tridgell 1992-1998
- *  Copyright (C) Andrew Bartlett 2001
+ *  Copyright (C) Andrew Bartlett 2001-2023
  *  Copyright (C) Jeremy Allison 2000-2001
  *  Copyright (C) Rafal Szczesniak 2002
  *  Copyright (C) Volker Lendecke 2006
@@ -26,60 +26,26 @@
 /* function(s) moved from auth/auth_util.c to minimize linker deps */
 
 #include "includes.h"
-#include "../libcli/security/dom_sid.h"
-
-/****************************************************************************
- Duplicate a SID token.
-****************************************************************************/
-
-struct security_token *dup_nt_token(TALLOC_CTX *mem_ctx, const struct security_token *ptoken)
-{
-       struct security_token *token;
-
-       if (!ptoken)
-               return NULL;
-
-       token = TALLOC_ZERO_P(mem_ctx, struct security_token);
-       if (token == NULL) {
-               DEBUG(0, ("talloc failed\n"));
-               return NULL;
-       }
-
-       if (ptoken->sids && ptoken->num_sids) {
-               token->sids = (struct dom_sid *)talloc_memdup(
-                       token, ptoken->sids, sizeof(struct dom_sid) * ptoken->num_sids );
-
-               if (token->sids == NULL) {
-                       DEBUG(0, ("talloc_memdup failed\n"));
-                       TALLOC_FREE(token);
-                       return NULL;
-               }
-               token->num_sids = ptoken->num_sids;
-       }
-       
-       token->privilege_mask = ptoken->privilege_mask;
-
-       return token;
-}
+#include "../libcli/security/security.h"
 
 /****************************************************************************
  merge NT tokens
 ****************************************************************************/
 
-NTSTATUS merge_nt_token(TALLOC_CTX *mem_ctx,
-                       const struct security_token *token_1,
-                       const struct security_token *token_2,
-                       struct security_token **token_out)
+NTSTATUS merge_with_system_token(TALLOC_CTX *mem_ctx,
+                                const struct security_token *token_1,
+                                struct security_token **token_out)
 {
+       const struct security_token *token_2 = get_system_token();
        struct security_token *token = NULL;
        NTSTATUS status;
-       int i;
+       uint32_t i;
 
        if (!token_1 || !token_2 || !token_out) {
                return NT_STATUS_INVALID_PARAMETER;
        }
 
-       token = TALLOC_ZERO_P(mem_ctx, struct security_token);
+       token = talloc_zero(mem_ctx, struct security_token);
        NT_STATUS_HAVE_NO_MEMORY(token);
 
        for (i=0; i < token_1->num_sids; i++) {
@@ -107,6 +73,14 @@ NTSTATUS merge_nt_token(TALLOC_CTX *mem_ctx,
        token->privilege_mask |= token_1->privilege_mask;
        token->privilege_mask |= token_2->privilege_mask;
 
+       token->rights_mask |= token_1->rights_mask;
+       token->rights_mask |= token_2->rights_mask;
+
+       /*
+        * We don't need to merge claims as the system token has no
+        * claims
+        */
+
        *token_out = token;
 
        return NT_STATUS_OK;