3 files changed, 1 insertions, 139 deletions
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index 7360eddf94..1f790a8ca2 100644
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -51,8 +51,6 @@ ADD_OBJ_FILES = \
 		lib/wins_srv.o \
 		lib/util_str.o \
 		lib/util_strlist.o \
-		lib/util_sid.o \
-		lib/util_secdesc.o \
 		lib/util_uuid.o \
 		lib/util_unistr.o \
 		lib/util_file.o \
@@ -74,6 +72,6 @@ ADD_OBJ_FILES = \
 		lib/db_wrap.o \
 		lib/gencache.o
 REQUIRED_SUBSYSTEMS = \
-		LIBLDB CHARSET LIBREPLACE LIBNETIF LIBCRYPTO EXT_LIB_DL
+		LIBLDB CHARSET LIBREPLACE LIBNETIF LIBCRYPTO LIB_SECURITY EXT_LIB_DL
 # End SUBSYSTEM LIBBASIC
 ##############################
diff --git a/source4/lib/util_secdesc.c b/source4/lib/util_secdesc.c
deleted file mode 100644
index 92887b21d9..0000000000
--- a/source4/lib/util_secdesc.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   security descriptror utility functions
-
-   Copyright (C) Andrew Tridgell 		2004
-      
-   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
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "includes.h"
-
-/*
-  return a blank security descriptor (no owners, dacl or sacl)
-*/
-struct security_descriptor *sd_initialise(TALLOC_CTX *mem_ctx)
-{
-	struct security_descriptor *sd;
-
-	sd = talloc_p(mem_ctx, struct security_descriptor);
-	if (!sd) {
-		return NULL;
-	}
-
-	sd->revision = SD_REVISION;
-	/* we mark as self relative, even though it isn't while it remains
-	   a pointer in memory because this simplifies the ndr code later.
-	   All SDs that we store/emit are in fact SELF_RELATIVE
-	*/
-	sd->type = SEC_DESC_SELF_RELATIVE;
-
-	sd->owner_sid = NULL;
-	sd->group_sid = NULL;
-	sd->sacl = NULL;
-	sd->dacl = NULL;
-
-	return sd;
-}
-
diff --git a/source4/lib/util_sid.c b/source4/lib/util_sid.c
deleted file mode 100644
index cb2ec3eb75..0000000000
--- a/source4/lib/util_sid.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   Samba utility functions
-   Copyright (C) Andrew Tridgell 		1992-1998
-   Copyright (C) Luke Kenneth Caseson Leighton 	1998-1999
-   Copyright (C) Jeremy Allison  		1999
-   Copyright (C) Stefan (metze) Metzmacher 	2002
-   Copyright (C) Simo Sorce 			2002
-      
-   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
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "includes.h"
-
-/*****************************************************************
- Compare the auth portion of two sids.
-*****************************************************************/  
-
-static int sid_compare_auth(const struct dom_sid *sid1, const struct dom_sid *sid2)
-{
-	int i;
-
-	if (sid1 == sid2)
-		return 0;
-	if (!sid1)
-		return -1;
-	if (!sid2)
-		return 1;
-
-	if (sid1->sid_rev_num != sid2->sid_rev_num)
-		return sid1->sid_rev_num - sid2->sid_rev_num;
-
-	for (i = 0; i < 6; i++)
-		if (sid1->id_auth[i] != sid2->id_auth[i])
-			return sid1->id_auth[i] - sid2->id_auth[i];
-
-	return 0;
-}
-
-/*****************************************************************
- Compare two sids.
-*****************************************************************/  
-
-static int sid_compare(const struct dom_sid *sid1, const struct dom_sid *sid2)
-{
-	int i;
-
-	if (sid1 == sid2)
-		return 0;
-	if (!sid1)
-		return -1;
-	if (!sid2)
-		return 1;
-
-	/* Compare most likely different rids, first: i.e start at end */
-	if (sid1->num_auths != sid2->num_auths)
-		return sid1->num_auths - sid2->num_auths;
-
-	for (i = sid1->num_auths-1; i >= 0; --i)
-		if (sid1->sub_auths[i] != sid2->sub_auths[i])
-			return sid1->sub_auths[i] - sid2->sub_auths[i];
-
-	return sid_compare_auth(sid1, sid2);
-}
-
-/*****************************************************************
- Compare two sids.
-*****************************************************************/  
-
-BOOL sid_equal(const struct dom_sid *sid1, const struct dom_sid *sid2)
-{
-	return sid_compare(sid1, sid2) == 0;
-}