s4: security.idl: split of dom_sid stuff into dom_sid.idl

[kai/samba.git] / source4 / librpc / ndr / ndr_sec_helper.c

diff --git a/source4/librpc/ndr/ndr_sec_helper.c b/source4/librpc/ndr/ndr_sec_helper.c
index 5a0178bd25bbee897b5b8731060b0821ce5b2b6e..a13c11510bec161c9750f4349da38aabe8106763 100644 (file)
--- a/source4/librpc/ndr/ndr_sec_helper.c
+++ b/source4/librpc/ndr/ndr_sec_helper.c
@@ -4,6 +4,7 @@
    fast routines for getting the wire size of security objects
 
    Copyright (C) Andrew Tridgell 2003
+   Copyright (C) Stefan Metzmacher 2006-2008
    
    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
@@ -24,30 +25,6 @@
 #include "librpc/gen_ndr/ndr_security.h"
 #include "libcli/security/security.h"
 
-/*
-  return the wire size of a dom_sid
-*/
-size_t ndr_size_dom_sid(const struct dom_sid *sid, int flags)
-{
-       if (!sid) return 0;
-       return 8 + 4*sid->num_auths;
-}
-
-size_t ndr_size_dom_sid28(const struct dom_sid *sid, int flags)
-{
-       struct dom_sid zero_sid;
-
-       if (!sid) return 0;
-
-       ZERO_STRUCT(zero_sid);
-
-       if (memcmp(&zero_sid, sid, sizeof(zero_sid)) == 0) {
-               return 0;
-       }
-
-       return 8 + 4*sid->num_auths;
-}
-
 /*
   return the wire size of a security_ace
 */
@@ -110,118 +87,3 @@ size_t ndr_size_security_descriptor(const struct security_descriptor *sd, int fl
        return ret;
 }
 
-/*
-  print a dom_sid
-*/
-void ndr_print_dom_sid(struct ndr_print *ndr, const char *name, const 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, const struct dom_sid *sid)
-{
-       ndr_print_dom_sid(ndr, name, sid);
-}
-
-void ndr_print_dom_sid28(struct ndr_print *ndr, const char *name, const struct dom_sid *sid)
-{
-       ndr_print_dom_sid(ndr, name, sid);
-}
-
-
-/*
-  parse a dom_sid2 - this is a dom_sid but with an extra copy of the num_auths field
-*/
-enum ndr_err_code ndr_pull_dom_sid2(struct ndr_pull *ndr, int ndr_flags, struct dom_sid *sid)
-{
-       uint32_t num_auths;
-       if (!(ndr_flags & NDR_SCALARS)) {
-               return NDR_ERR_SUCCESS;
-       }
-       NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &num_auths));
-       NDR_CHECK(ndr_pull_dom_sid(ndr, ndr_flags, sid));
-       if (sid->num_auths != num_auths) {
-               return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, 
-                                     "Bad array size %u should exceed %u", 
-                                     num_auths, sid->num_auths);
-       }
-       return NDR_ERR_SUCCESS;
-}
-
-/*
-  parse a dom_sid2 - this is a dom_sid but with an extra copy of the num_auths field
-*/
-enum ndr_err_code ndr_push_dom_sid2(struct ndr_push *ndr, int ndr_flags, const struct dom_sid *sid)
-{
-       if (!(ndr_flags & NDR_SCALARS)) {
-               return NDR_ERR_SUCCESS;
-       }
-       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, sid->num_auths));
-       return ndr_push_dom_sid(ndr, ndr_flags, sid);
-}
-
-/*
-  parse a dom_sid28 - this is a dom_sid in a fixed 28 byte buffer, so we need to ensure there are only upto 5 sub_auth
-*/
-enum ndr_err_code ndr_pull_dom_sid28(struct ndr_pull *ndr, int ndr_flags, struct dom_sid *sid)
-{
-       enum ndr_err_code status;
-       struct ndr_pull *subndr;
-
-       if (!(ndr_flags & NDR_SCALARS)) {
-               return NDR_ERR_SUCCESS;
-       }
-
-       subndr = talloc_zero(ndr, struct ndr_pull);
-       NDR_ERR_HAVE_NO_MEMORY(subndr);
-       subndr->flags           = ndr->flags;
-       subndr->current_mem_ctx = ndr->current_mem_ctx;
-
-       subndr->data            = ndr->data + ndr->offset;
-       subndr->data_size       = 28;
-       subndr->offset          = 0;
-
-       NDR_CHECK(ndr_pull_advance(ndr, 28));
-
-       status = ndr_pull_dom_sid(subndr, ndr_flags, sid);
-       if (!NDR_ERR_CODE_IS_SUCCESS(status)) {
-               /* handle a w2k bug which send random data in the buffer */
-               ZERO_STRUCTP(sid);
-       } else if (sid->num_auths == 0 && sid->sub_auths) {
-               talloc_free(sid->sub_auths);
-               sid->sub_auths = NULL;
-       }
-
-       return NDR_ERR_SUCCESS;
-}
-
-/*
-  push a dom_sid28 - this is a dom_sid in a 28 byte fixed buffer
-*/
-enum ndr_err_code ndr_push_dom_sid28(struct ndr_push *ndr, int ndr_flags, const struct dom_sid *sid)
-{
-       uint32_t old_offset;
-       uint32_t padding;
-
-       if (!(ndr_flags & NDR_SCALARS)) {
-               return NDR_ERR_SUCCESS;
-       }
-
-       if (sid->num_auths > 5) {
-               return ndr_push_error(ndr, NDR_ERR_RANGE, 
-                                     "dom_sid28 allows only upto 5 sub auth [%u]", 
-                                     sid->num_auths);
-       }
-
-       old_offset = ndr->offset;
-       NDR_CHECK(ndr_push_dom_sid(ndr, ndr_flags, sid));
-
-       padding = 28 - (ndr->offset - old_offset);
-
-       if (padding > 0) {
-               NDR_CHECK(ndr_push_zero(ndr, padding));
-       }
-
-       return NDR_ERR_SUCCESS;
-}
-