From f3efceace4ad097882f6574b533318d332bff6b1 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Fri, 29 Feb 2008 18:19:06 +0100
Subject: Revert "what a wurst."

That commit message was just too silly, this happens to me during interactive
rebase all the time...

This reverts commit ab687104c1371c84c510eca7ef2caad7c21ea8fc.
(This used to be commit a3a1edab0d5ac07d42e64a5a82dd71fe0c3fdfeb)
---
 source3/lib/util_nttoken.c | 50 ----------------------------------------------
 1 file changed, 50 deletions(-)

(limited to 'source3/lib')

diff --git a/source3/lib/util_nttoken.c b/source3/lib/util_nttoken.c
index f81191af58..13c66a5f45 100644
--- a/source3/lib/util_nttoken.c
+++ b/source3/lib/util_nttoken.c
@@ -7,7 +7,6 @@
  *  Copyright (C) Rafal Szczesniak 2002
  *  Copyright (C) Volker Lendecke 2006
  *  Copyright (C) Michael Adam 2007
- *  Copyright (C) Guenther Deschner 2007
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -68,52 +67,3 @@ NT_USER_TOKEN *dup_nt_token(TALLOC_CTX *mem_ctx, const NT_USER_TOKEN *ptoken)
 	return token;
 }
 
-/****************************************************************************
- merge NT tokens
-****************************************************************************/
-
-NTSTATUS merge_nt_token(TALLOC_CTX *mem_ctx,
-			const struct nt_user_token *token_1,
-			const struct nt_user_token *token_2,
-			struct nt_user_token **token_out)
-{
-	struct nt_user_token *token = NULL;
-	NTSTATUS status;
-	int i;
-
-	if (!token_1 || !token_2 || !token_out) {
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	token = TALLOC_ZERO_P(mem_ctx, struct nt_user_token);
-	NT_STATUS_HAVE_NO_MEMORY(token);
-
-	for (i=0; i < token_1->num_sids; i++) {
-		status = add_sid_to_array_unique(mem_ctx,
-						 &token_1->user_sids[i],
-						 &token->user_sids,
-						 &token->num_sids);
-		if (!NT_STATUS_IS_OK(status)) {
-			TALLOC_FREE(token);
-			return status;
-		}
-	}
-
-	for (i=0; i < token_2->num_sids; i++) {
-		status = add_sid_to_array_unique(mem_ctx,
-						 &token_2->user_sids[i],
-						 &token->user_sids,
-						 &token->num_sids);
-		if (!NT_STATUS_IS_OK(status)) {
-			TALLOC_FREE(token);
-			return status;
-		}
-	}
-
-	se_priv_add(&token->privileges, &token_1->privileges);
-	se_priv_add(&token->privileges, &token_2->privileges);
-
-	*token_out = token;
-
-	return NT_STATUS_OK;
-}
-- 
cgit