r6287: sorted out a small but surprisingly tricky dependency problem with the

ndr code for handling sids and security descriptors now that we have a
sid in the nbt IDL
(This used to be commit f8e77fcdeac704aed5e501aa9108f3ed0ab26ca4)

1 files changed, 0 insertions, 77 deletions

diff --git a/source4/librpc/ndr/ndr_sec.c b/source4/librpc/ndr/ndr_sec.c
index 73d9ddc1d1..9e4bc526dc 100644
--- a/source4/librpc/ndr/ndr_sec.c
+++ b/source4/librpc/ndr/ndr_sec.c
@@ -116,80 +116,3 @@ NTSTATUS ndr_push_dom_sid28(struct ndr_push *ndr, int ndr_flags, struct dom_sid
 	return NT_STATUS_OK;
 }
 
-/*
-  print a dom_sid
-*/
-void ndr_print_dom_sid(struct ndr_print *ndr, const char *name, struct dom_sid *sid)
-{
-	ndr->print(ndr, "%-25s: %s", name, dom_sid_string(ndr, sid));
-}
-
-void ndr_print_dom_sid2(struct ndr_print *ndr, const char *name, struct dom_sid *sid)
-{
-	ndr_print_dom_sid(ndr, name, sid);
-}
-
-void ndr_print_dom_sid28(struct ndr_print *ndr, const char *name, struct dom_sid *sid)
-{
-	ndr_print_dom_sid(ndr, name, sid);
-}
-
-/*
-  return the wire size of a dom_sid
-*/
-size_t ndr_size_dom_sid(struct dom_sid *sid)
-{
-	if (!sid) return 0;
-	return 8 + 4*sid->num_auths;
-}
-
-/*
-  return the wire size of a dom_sid
-*/
-size_t ndr_length_dom_sid(struct dom_sid *sid)
-{
-	if (!sid) return 0;
-	if (sid->sid_rev_num == 0) return 0;
-	return 8 + 4*sid->num_auths;
-}
-
-/*
-  return the wire size of a security_ace
-*/
-size_t ndr_size_security_ace(struct security_ace *ace)
-{
-	if (!ace) return 0;
-	return 8 + ndr_size_dom_sid(&ace->trustee);
-}
-
-
-/*
-  return the wire size of a security_acl
-*/
-size_t ndr_size_security_acl(struct security_acl *acl)
-{
-	size_t ret;
-	int i;
-	if (!acl) return 0;
-	ret = 8;
-	for (i=0;i<acl->num_aces;i++) {
-		ret += ndr_size_security_ace(&acl->aces[i]);
-	}
-	return ret;
-}
-
-/*
-  return the wire size of a security descriptor
-*/
-size_t ndr_size_security_descriptor(struct security_descriptor *sd)
-{
-	size_t ret;
-	if (!sd) return 0;
-	
-	ret = 20;
-	ret += ndr_size_dom_sid(sd->owner_sid);
-	ret += ndr_size_dom_sid(sd->group_sid);
-	ret += ndr_size_security_acl(sd->dacl);
-	ret += ndr_size_security_acl(sd->sacl);
-	return ret;
-}