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 268f270ebe6fd1e642395de4fecc427ec8b0d5f3..a13c11510bec161c9750f4349da38aabe8106763 100644 (file)
--- a/source4/librpc/ndr/ndr_sec_helper.c
+++ b/source4/librpc/ndr/ndr_sec_helper.c
@@ -4,10 +4,11 @@
    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
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -16,54 +17,56 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_security.h"
-
-/*
-  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;
-}
+#include "libcli/security/security.h"
 
 /*
   return the wire size of a security_ace
 */
-size_t ndr_size_security_ace(struct security_ace *ace)
+size_t ndr_size_security_ace(const struct security_ace *ace, int flags)
 {
+       size_t ret;
+
        if (!ace) return 0;
-       return 8 + ndr_size_dom_sid(&ace->trustee);
-}
 
+       ret = 8 + ndr_size_dom_sid(&ace->trustee, flags);
+
+       switch (ace->type) {
+       case SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT:
+       case SEC_ACE_TYPE_ACCESS_DENIED_OBJECT:
+       case SEC_ACE_TYPE_SYSTEM_AUDIT_OBJECT:
+       case SEC_ACE_TYPE_SYSTEM_ALARM_OBJECT:
+               ret += 4; /* uint32 bitmap ace->object.object.flags */
+               if (ace->object.object.flags & SEC_ACE_OBJECT_TYPE_PRESENT) {
+                       ret += 16; /* GUID ace->object.object.type.type */
+               }
+               if (ace->object.object.flags & SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT) {
+                       ret += 16; /* GUID ace->object.object.inherited_typeinherited_type */
+               }
+               break;
+       default:
+               break;
+       }
+
+       return ret;
+}
 
 /*
   return the wire size of a security_acl
 */
-size_t ndr_size_security_acl(struct security_acl *acl)
+size_t ndr_size_security_acl(const struct security_acl *acl, int flags)
 {
        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]);
+               ret += ndr_size_security_ace(&acl->aces[i], flags);
        }
        return ret;
 }
@@ -71,66 +74,16 @@ size_t ndr_size_security_acl(struct security_acl *acl)
 /*
   return the wire size of a security descriptor
 */
-size_t ndr_size_security_descriptor(struct security_descriptor *sd)
+size_t ndr_size_security_descriptor(const struct security_descriptor *sd, int flags)
 {
        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;
-}
-
-/*
-  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);
-}
-
-/*
-  convert a dom_sid to a string
-*/
-char *dom_sid_string(TALLOC_CTX *mem_ctx, const struct dom_sid *sid)
-{
-       int i, ofs, maxlen;
-       uint32_t ia;
-       char *ret;
-       
-       if (!sid) {
-               return talloc_strdup(mem_ctx, "(NULL SID)");
-       }
-
-       maxlen = sid->num_auths * 11 + 25;
-       ret = talloc_size(mem_ctx, maxlen);
-       if (!ret) return talloc_strdup(mem_ctx, "(SID ERR)");
-
-       ia = (sid->id_auth[5]) +
-               (sid->id_auth[4] << 8 ) +
-               (sid->id_auth[3] << 16) +
-               (sid->id_auth[2] << 24);
-
-       ofs = snprintf(ret, maxlen, "S-%u-%lu", 
-                      (uint_t)sid->sid_rev_num, (unsigned long)ia);
-
-       for (i = 0; i < sid->num_auths; i++) {
-               ofs += snprintf(ret + ofs, maxlen - ofs, "-%lu", (unsigned long)sid->sub_auths[i]);
-       }
-       
+       ret += ndr_size_dom_sid(sd->owner_sid, flags);
+       ret += ndr_size_dom_sid(sd->group_sid, flags);
+       ret += ndr_size_security_acl(sd->dacl, flags);
+       ret += ndr_size_security_acl(sd->sacl, flags);
        return ret;
 }