From 7cbdb48475b0340154fad60cb4b7cc53dc2bbcfd Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Sat, 29 Dec 2007 23:00:49 +0100
Subject: Remove tiny code duplication

ndr_size_security_descriptor does the same as sec_desc_size
(This used to be commit bc3bd7a8e7c6e9e27acb195c86abb92c0f53112f)
---
 source3/lib/secdesc.c  | 29 -----------------------------
 source3/lib/sharesec.c |  2 +-
 2 files changed, 1 insertion(+), 30 deletions(-)

(limited to 'source3/lib')

diff --git a/source3/lib/secdesc.c b/source3/lib/secdesc.c
index 5e5042e521..44ae23271e 100644
--- a/source3/lib/secdesc.c
+++ b/source3/lib/secdesc.c
@@ -31,35 +31,6 @@ const struct generic_mapping file_generic_mapping = {
 	FILE_GENERIC_ALL
 };
 
-/*******************************************************************
- Works out the linearization size of a SEC_DESC.
-********************************************************************/
-
-size_t sec_desc_size(SEC_DESC *psd)
-{
-	size_t offset;
-
-	if (!psd) return 0;
-
-	offset = SEC_DESC_HEADER_SIZE;
-
-	/* don't align */
-
-	if (psd->owner_sid != NULL)
-		offset += ndr_size_dom_sid(psd->owner_sid, 0);
-
-	if (psd->group_sid != NULL)
-		offset += ndr_size_dom_sid(psd->group_sid, 0);
-
-	if (psd->sacl != NULL)
-		offset += psd->sacl->size;
-
-	if (psd->dacl != NULL)
-		offset += psd->dacl->size;
-
-	return offset;
-}
-
 /*******************************************************************
  Compares two SEC_DESC structures
 ********************************************************************/
diff --git a/source3/lib/sharesec.c b/source3/lib/sharesec.c
index 0027a8813a..ba025dacc1 100644
--- a/source3/lib/sharesec.c
+++ b/source3/lib/sharesec.c
@@ -144,7 +144,7 @@ SEC_DESC *get_share_security( TALLOC_CTX *ctx, const char *servicename,
 	}
 
 	if (psd)
-		*psize = sec_desc_size(psd);
+		*psize = ndr_size_security_descriptor(psd, 0);
 
 	return psd;
 }
-- 
cgit