Changeset 228 for branches/samba-3.2.x/source/librpc

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

Location:

branches/samba-3.2.x/source/librpc

Files:

• gen_ndr/cli_ntsvcs.c (modified) (2 diffs)
• gen_ndr/cli_ntsvcs.h (modified) (1 diff)
• gen_ndr/ndr_ntsvcs.c (modified) (6 diffs)
• gen_ndr/ndr_samr.c (modified) (6 diffs)
• gen_ndr/ndr_security.c (modified) (7 diffs)
• gen_ndr/ndr_security.h (modified) (2 diffs)
• gen_ndr/ntsvcs.h (modified) (2 diffs)
• gen_ndr/samr.h (modified) (2 diffs)
• gen_ndr/security.h (modified) (2 diffs)
• idl/ntsvcs.idl (modified) (2 diffs)
• idl/samr.idl (modified) (2 diffs)
• idl/security.idl (modified) (4 diffs)
• ndr/ndr_sec_helper.c (modified) (2 diffs)

branches/samba-3.2.x/source/librpc/gen_ndr/cli_ntsvcs.c

@@ -1769 +1769 @@
                                   uint32_t idx /* [in]  */,
                                   struct PNP_HwProfInfo *info /* [in,out] [ref] */,
-                                  uint32_t unknown1 /* [in]  */,
-                                  uint32_t unknown2 /* [in]  */,
+                                  uint32_t size /* [in]  */,
+                                  uint32_t flags /* [in]  */,
                                   WERROR *werror)
 {
@@ -1779 +1779 @@
         r.in.idx = idx;
         r.in.info = info;
-        r.in.unknown1 = unknown1;
-        r.in.unknown2 = unknown2;
+        r.in.size = size;
+        r.in.flags = flags;
 
         if (DEBUGLEVEL >= 10) {

branches/samba-3.2.x/source/librpc/gen_ndr/cli_ntsvcs.h

@@ -144 +144 @@
                                   uint32_t idx /* [in]  */,
                                   struct PNP_HwProfInfo *info /* [in,out] [ref] */,
-                                  uint32_t unknown1 /* [in]  */,
-                                  uint32_t unknown2 /* [in]  */,
+                                  uint32_t size /* [in]  */,
+                                  uint32_t flags /* [in]  */,
                                   WERROR *werror);
 NTSTATUS rpccli_PNP_AddEmptyLogConf(struct rpc_pipe_client *cli,

branches/samba-3.2.x/source/librpc/gen_ndr/ndr_ntsvcs.c

@@ -6 +6 @@
 static enum ndr_err_code ndr_push_PNP_HwProfInfo(struct ndr_push *ndr, int ndr_flags, const struct PNP_HwProfInfo *r)
 {
-        uint32_t cntr_unknown2_0;
+        uint32_t cntr_friendly_name_0;
         if (ndr_flags & NDR_SCALARS) {
                 NDR_CHECK(ndr_push_align(ndr, 4));
-                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->unknown1));
-                for (cntr_unknown2_0 = 0; cntr_unknown2_0 < 160; cntr_unknown2_0++) {
-                        NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->unknown2[cntr_unknown2_0]));
-                }
-                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->unknown3));
+                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->profile_handle));
+                for (cntr_friendly_name_0 = 0; cntr_friendly_name_0 < 80; cntr_friendly_name_0++) {
+                        NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->friendly_name[cntr_friendly_name_0]));
+                }
+                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->flags));
         }
         if (ndr_flags & NDR_BUFFERS) {
@@ -22 +22 @@
 static enum ndr_err_code ndr_pull_PNP_HwProfInfo(struct ndr_pull *ndr, int ndr_flags, struct PNP_HwProfInfo *r)
 {
-        uint32_t cntr_unknown2_0;
+        uint32_t cntr_friendly_name_0;
         if (ndr_flags & NDR_SCALARS) {
                 NDR_CHECK(ndr_pull_align(ndr, 4));
-                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->unknown1));
-                for (cntr_unknown2_0 = 0; cntr_unknown2_0 < 160; cntr_unknown2_0++) {
-                        NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->unknown2[cntr_unknown2_0]));
-                }
-                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->unknown3));
+                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->profile_handle));
+                for (cntr_friendly_name_0 = 0; cntr_friendly_name_0 < 80; cntr_friendly_name_0++) {
+                        NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->friendly_name[cntr_friendly_name_0]));
+                }
+                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->flags));
         }
         if (ndr_flags & NDR_BUFFERS) {
@@ -38 +38 @@
 _PUBLIC_ void ndr_print_PNP_HwProfInfo(struct ndr_print *ndr, const char *name, const struct PNP_HwProfInfo *r)
 {
-        uint32_t cntr_unknown2_0;
+        uint32_t cntr_friendly_name_0;
         ndr_print_struct(ndr, name, "PNP_HwProfInfo");
         ndr->depth++;
-        ndr_print_uint32(ndr, "unknown1", r->unknown1);
-        ndr->print(ndr, "%s: ARRAY(%d)", "unknown2", (int)160);
-        ndr->depth++;
-        for (cntr_unknown2_0=0;cntr_unknown2_0<160;cntr_unknown2_0++) {
+        ndr_print_uint32(ndr, "profile_handle", r->profile_handle);
+        ndr->print(ndr, "%s: ARRAY(%d)", "friendly_name", (int)80);
+        ndr->depth++;
+        for (cntr_friendly_name_0=0;cntr_friendly_name_0<80;cntr_friendly_name_0++) {
                 char *idx_0=NULL;
-                if (asprintf(&idx_0, "[%d]", cntr_unknown2_0) != -1) {
-                        ndr_print_uint16(ndr, "unknown2", r->unknown2[cntr_unknown2_0]);
+                if (asprintf(&idx_0, "[%d]", cntr_friendly_name_0) != -1) {
+                        ndr_print_uint16(ndr, "friendly_name", r->friendly_name[cntr_friendly_name_0]);
                         free(idx_0);
                 }
         }
         ndr->depth--;
-        ndr_print_uint32(ndr, "unknown3", r->unknown3);
+        ndr_print_uint32(ndr, "flags", r->flags);
         ndr->depth--;
 }
@@ -2039 +2039 @@
                 }
                 NDR_CHECK(ndr_push_PNP_HwProfInfo(ndr, NDR_SCALARS, r->in.info));
-                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.unknown1));
-                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.unknown2));
+                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.size));
+                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.flags));
         }
         if (flags & NDR_OUT) {
@@ -2066 +2066 @@
                 NDR_CHECK(ndr_pull_PNP_HwProfInfo(ndr, NDR_SCALARS, r->in.info));
                 NDR_PULL_SET_MEM_CTX(ndr, _mem_save_info_0, LIBNDR_FLAG_REF_ALLOC);
-                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.unknown1));
-                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.unknown2));
+                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.size));
+                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.flags));
                 NDR_PULL_ALLOC(ndr, r->out.info);
                 *r->out.info = *r->in.info;
@@ -2099 +2099 @@
                 ndr_print_PNP_HwProfInfo(ndr, "info", r->in.info);
                 ndr->depth--;
-                ndr_print_uint32(ndr, "unknown1", r->in.unknown1);
-                ndr_print_uint32(ndr, "unknown2", r->in.unknown2);
+                ndr_print_uint32(ndr, "size", r->in.size);
+                ndr_print_uint32(ndr, "flags", r->in.flags);
                 ndr->depth--;
         }

branches/samba-3.2.x/source/librpc/gen_ndr/ndr_samr.c

@@ -2962 +2962 @@
                 NDR_CHECK(ndr_push_align(ndr, 1));
                 NDR_CHECK(ndr_push_samr_CryptPassword(ndr, NDR_SCALARS, &r->password));
-                NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->pw_len));
+                NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->password_expired));
         }
         if (ndr_flags & NDR_BUFFERS) {
@@ -2974 +2974 @@
                 NDR_CHECK(ndr_pull_align(ndr, 1));
                 NDR_CHECK(ndr_pull_samr_CryptPassword(ndr, NDR_SCALARS, &r->password));
-                NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->pw_len));
+                NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->password_expired));
         }
         if (ndr_flags & NDR_BUFFERS) {
@@ -2986 +2986 @@
         ndr->depth++;
         ndr_print_samr_CryptPassword(ndr, "password", &r->password);
-        ndr_print_uint8(ndr, "pw_len", r->pw_len);
+        ndr_print_uint8(ndr, "password_expired", r->password_expired);
         ndr->depth--;
 }
@@ -3075 +3075 @@
                 NDR_CHECK(ndr_push_align(ndr, 1));
                 NDR_CHECK(ndr_push_samr_CryptPasswordEx(ndr, NDR_SCALARS, &r->password));
-                NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->pw_len));
+                NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->password_expired));
         }
         if (ndr_flags & NDR_BUFFERS) {
@@ -3087 +3087 @@
                 NDR_CHECK(ndr_pull_align(ndr, 1));
                 NDR_CHECK(ndr_pull_samr_CryptPasswordEx(ndr, NDR_SCALARS, &r->password));
-                NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->pw_len));
+                NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->password_expired));
         }
         if (ndr_flags & NDR_BUFFERS) {
@@ -3099 +3099 @@
         ndr->depth++;
         ndr_print_samr_CryptPasswordEx(ndr, "password", &r->password);
-        ndr_print_uint8(ndr, "pw_len", r->pw_len);
+        ndr_print_uint8(ndr, "password_expired", r->password_expired);
         ndr->depth--;
 }

branches/samba-3.2.x/source/librpc/gen_ndr/ndr_security.c

@@ -5 +5 @@
 
 #include "librpc/gen_ndr/ndr_misc.h"
-static enum ndr_err_code ndr_push_security_ace_flags(struct ndr_push *ndr, int ndr_flags, uint8_t r)
+_PUBLIC_ enum ndr_err_code ndr_push_security_ace_flags(struct ndr_push *ndr, int ndr_flags, uint8_t r)
 {
         NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r));
@@ -11 +11 @@
 }
 
-static enum ndr_err_code ndr_pull_security_ace_flags(struct ndr_pull *ndr, int ndr_flags, uint8_t *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_security_ace_flags(struct ndr_pull *ndr, int ndr_flags, uint8_t *r)
 {
         uint8_t v;
@@ -34 +34 @@
 }
 
-static enum ndr_err_code ndr_push_security_ace_type(struct ndr_push *ndr, int ndr_flags, enum security_ace_type r)
+_PUBLIC_ enum ndr_err_code ndr_push_security_ace_type(struct ndr_push *ndr, int ndr_flags, enum security_ace_type r)
 {
         NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r));
@@ -40 +40 @@
 }
 
-static enum ndr_err_code ndr_pull_security_ace_type(struct ndr_pull *ndr, int ndr_flags, enum security_ace_type *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_security_ace_type(struct ndr_pull *ndr, int ndr_flags, enum security_ace_type *r)
 {
         uint8_t v;
@@ -279 +279 @@
 }
 
-static enum ndr_err_code ndr_push_security_ace_object_ctr(struct ndr_push *ndr, int ndr_flags, const union security_ace_object_ctr *r)
+_PUBLIC_ enum ndr_err_code ndr_push_security_ace_object_ctr(struct ndr_push *ndr, int ndr_flags, const union security_ace_object_ctr *r)
 {
         if (ndr_flags & NDR_SCALARS) {
@@ -332 +332 @@
 }
 
-static enum ndr_err_code ndr_pull_security_ace_object_ctr(struct ndr_pull *ndr, int ndr_flags, union security_ace_object_ctr *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_security_ace_object_ctr(struct ndr_pull *ndr, int ndr_flags, union security_ace_object_ctr *r)
 {
         int level;
@@ -428 +428 @@
                 NDR_CHECK(ndr_push_security_ace_object_ctr(ndr, NDR_BUFFERS, &r->object));
                 NDR_CHECK(ndr_push_dom_sid(ndr, NDR_BUFFERS, &r->trustee));
-        }
-        return NDR_ERR_SUCCESS;
-}
-
-_PUBLIC_ enum ndr_err_code ndr_pull_security_ace(struct ndr_pull *ndr, int ndr_flags, struct security_ace *r)
-{
-        if (ndr_flags & NDR_SCALARS) {
-                NDR_CHECK(ndr_pull_align(ndr, 4));
-                NDR_CHECK(ndr_pull_security_ace_type(ndr, NDR_SCALARS, &r->type));
-                NDR_CHECK(ndr_pull_security_ace_flags(ndr, NDR_SCALARS, &r->flags));
-                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->size));
-                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->access_mask));
-                NDR_CHECK(ndr_pull_set_switch_value(ndr, &r->object, r->type));
-                NDR_CHECK(ndr_pull_security_ace_object_ctr(ndr, NDR_SCALARS, &r->object));
-                NDR_CHECK(ndr_pull_dom_sid(ndr, NDR_SCALARS, &r->trustee));
-        }
-        if (ndr_flags & NDR_BUFFERS) {
-                NDR_CHECK(ndr_pull_security_ace_object_ctr(ndr, NDR_BUFFERS, &r->object));
-                NDR_CHECK(ndr_pull_dom_sid(ndr, NDR_BUFFERS, &r->trustee));
         }
         return NDR_ERR_SUCCESS;

branches/samba-3.2.x/source/librpc/gen_ndr/ndr_security.h

@@ -8 +8 @@
 
 #define NDR_SECURITY_CALL_COUNT (0)
+enum ndr_err_code ndr_push_security_ace_flags(struct ndr_push *ndr, int ndr_flags, uint8_t r);
+enum ndr_err_code ndr_pull_security_ace_flags(struct ndr_pull *ndr, int ndr_flags, uint8_t *r);
 void ndr_print_security_ace_flags(struct ndr_print *ndr, const char *name, uint8_t r);
+enum ndr_err_code ndr_push_security_ace_type(struct ndr_push *ndr, int ndr_flags, enum security_ace_type r);
+enum ndr_err_code ndr_pull_security_ace_type(struct ndr_pull *ndr, int ndr_flags, enum security_ace_type *r);
 void ndr_print_security_ace_type(struct ndr_print *ndr, const char *name, enum security_ace_type r);
 void ndr_print_security_ace_object_flags(struct ndr_print *ndr, const char *name, uint32_t r);
@@ -14 +18 @@
 void ndr_print_security_ace_object_inherited_type(struct ndr_print *ndr, const char *name, const union security_ace_object_inherited_type *r);
 void ndr_print_security_ace_object(struct ndr_print *ndr, const char *name, const struct security_ace_object *r);
+enum ndr_err_code ndr_push_security_ace_object_ctr(struct ndr_push *ndr, int ndr_flags, const union security_ace_object_ctr *r);
+enum ndr_err_code ndr_pull_security_ace_object_ctr(struct ndr_pull *ndr, int ndr_flags, union security_ace_object_ctr *r);
 void ndr_print_security_ace_object_ctr(struct ndr_print *ndr, const char *name, const union security_ace_object_ctr *r);
 enum ndr_err_code ndr_push_security_ace(struct ndr_push *ndr, int ndr_flags, const struct security_ace *r);

branches/samba-3.2.x/source/librpc/gen_ndr/ntsvcs.h

@@ -7 +7 @@
 
 struct PNP_HwProfInfo {
-        uint32_t unknown1;
-        uint16_t unknown2[160];
-        uint32_t unknown3;
+        uint32_t profile_handle;
+        uint16_t friendly_name[80];
+        uint32_t flags;
 };
 
@@ -370 +370 @@
         struct {
                 uint32_t idx;
-                uint32_t unknown1;
-                uint32_t unknown2;
+                uint32_t size;
+                uint32_t flags;
                 struct PNP_HwProfInfo *info;/* [ref] */
         } in;

branches/samba-3.2.x/source/librpc/gen_ndr/samr.h

@@ -500 +500 @@
 struct samr_UserInfo24 {
         struct samr_CryptPassword password;
-        uint8_t pw_len;
+        uint8_t password_expired;
 };
 
@@ -514 +514 @@
 struct samr_UserInfo26 {
         struct samr_CryptPasswordEx password;
-        uint8_t pw_len;
+        uint8_t password_expired;
 };
 

branches/samba-3.2.x/source/librpc/gen_ndr/security.h

@@ -233 +233 @@
 union security_ace_object_ctr {
         struct security_ace_object object;/* [case(SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT)] */
-}/* [nodiscriminant] */;
+}/* [public,nodiscriminant] */;
 
 struct security_ace {
@@ -242 +242 @@
         union security_ace_object_ctr object;/* [switch_is(type)] */
         struct dom_sid trustee;
-}/* [gensize,public,nosize] */;
+}/* [gensize,public,nopull,nosize] */;
 
 enum security_acl_revision

branches/samba-3.2.x/source/librpc/idl/ntsvcs.idl

@@ -238 +238 @@
 
         typedef struct {
-                uint32 unknown1;
-                uint16 unknown2[160];
-                uint32 unknown3;
+                uint32 profile_handle;
+                uint16 friendly_name[80];
+                uint32 flags;
         } PNP_HwProfInfo;
 
@@ -246 +246 @@
                 [in] uint32 idx,
                 [in,out,ref] PNP_HwProfInfo *info,
-                [in] uint32 unknown1,
-                [in] uint32 unknown2
+                [in] uint32 size,
+                [in] uint32 flags
                 );
 

branches/samba-3.2.x/source/librpc/idl/samr.idl

@@ -836 +836 @@
         typedef struct {
                 samr_CryptPassword password;
-                uint8 pw_len;
+                uint8 password_expired;
         } samr_UserInfo24;
 
@@ -850 +850 @@
         typedef struct {
                 samr_CryptPasswordEx password;
-                uint8 pw_len;
+                uint8 password_expired;
         } samr_UserInfo26;
 

branches/samba-3.2.x/source/librpc/idl/security.idl

@@ -234 +234 @@
         } sec_privilege;
 
-        typedef [bitmap8bit] bitmap {
+        typedef [public,bitmap8bit] bitmap {
                 SEC_ACE_FLAG_OBJECT_INHERIT             = 0x01,
                 SEC_ACE_FLAG_CONTAINER_INHERIT          = 0x02,
@@ -245 +245 @@
         } security_ace_flags;
 
-        typedef [enum8bit] enum {
+        typedef [public,enum8bit] enum {
                 SEC_ACE_TYPE_ACCESS_ALLOWED             = 0,
                 SEC_ACE_TYPE_ACCESS_DENIED              = 1,
@@ -282 +282 @@
         } security_ace_object;
 
-        typedef [nodiscriminant] union {
+        typedef [public,nodiscriminant] union {
                 [case(SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT)] security_ace_object object;
                 [case(SEC_ACE_TYPE_ACCESS_DENIED_OBJECT)] security_ace_object object;
@@ -290 +290 @@
         } security_ace_object_ctr;
 
-        typedef [public,gensize,nosize] struct {
+        typedef [public,nopull,gensize,nosize] struct {
                 security_ace_type type;  /* SEC_ACE_TYPE_* */
                 security_ace_flags flags; /* SEC_ACE_FLAG_* */

branches/samba-3.2.x/source/librpc/ndr/ndr_sec_helper.c

@@ -22 +22 @@
 
 #include "includes.h"
+#include "librpc/gen_ndr/security.h"
 
 /*
@@ -50 +51 @@
 {
         return ndr_size_dom_sid28(sid, flags);
+}
+
+enum ndr_err_code ndr_pull_security_ace(struct ndr_pull *ndr, int ndr_flags, struct security_ace *r)
+{
+        if (ndr_flags & NDR_SCALARS) {
+                uint32_t start_ofs = ndr->offset;
+                uint32_t size = 0;
+                uint32_t pad = 0;
+                NDR_CHECK(ndr_pull_align(ndr, 4));
+                NDR_CHECK(ndr_pull_security_ace_type(ndr, NDR_SCALARS, &r->type));
+                NDR_CHECK(ndr_pull_security_ace_flags(ndr, NDR_SCALARS, &r->flags));
+                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->size));
+                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->access_mask));
+                NDR_CHECK(ndr_pull_set_switch_value(ndr, &r->object, r->type));
+                NDR_CHECK(ndr_pull_security_ace_object_ctr(ndr, NDR_SCALARS, &r->object));
+                NDR_CHECK(ndr_pull_dom_sid(ndr, NDR_SCALARS, &r->trustee));
+                size = ndr->offset - start_ofs;
+                if (r->size < size) {
+                        return ndr_pull_error(ndr, NDR_ERR_BUFSIZE,
+                                              "ndr_pull_security_ace: r->size %u < size %u",
+                                              (unsigned)r->size, size);
+                }
+                pad = r->size - size;
+                NDR_PULL_NEED_BYTES(ndr, pad);
+                ndr->offset += pad;
+        }
+        if (ndr_flags & NDR_BUFFERS) {
+                NDR_CHECK(ndr_pull_security_ace_object_ctr(ndr, NDR_BUFFERS, &r->object));
+        }
+        return NDR_ERR_SUCCESS;
 }