netlogon.idl - rerun "make idl"
authorMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>
Fri, 11 Sep 2009 20:03:45 +0000 (22:03 +0200)
committerMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>
Fri, 11 Sep 2009 20:03:45 +0000 (22:03 +0200)
librpc/gen_ndr/ndr_netlogon.c
librpc/gen_ndr/netlogon.h

index daba526e655452495563c9f59fa3789cea9cd579..823c174ba51f5005fab4f7eaebad8fd202aceafe 100644 (file)
@@ -7393,7 +7393,17 @@ static enum ndr_err_code ndr_push_netr_OsVersionInfoEx(struct ndr_push *ndr, int
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->MinorVersion));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->BuildNumber));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->PlatformId));
-               NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->CSDVersion, 128, sizeof(uint16_t), CH_UTF16));
+               {
+                       uint32_t _flags_save_string = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+                       {
+                               struct ndr_push *_ndr_CSDVersion;
+                               NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_CSDVersion, 0, 256));
+                               NDR_CHECK(ndr_push_string(_ndr_CSDVersion, NDR_SCALARS, r->CSDVersion));
+                               NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_CSDVersion, 0, 256));
+                       }
+                       ndr->flags = _flags_save_string;
+               }
                NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->ServicePackMajor));
                NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->ServicePackMinor));
                NDR_CHECK(ndr_push_netr_SuiteMask(ndr, NDR_SCALARS, r->SuiteMask));
@@ -7414,7 +7424,17 @@ static enum ndr_err_code ndr_pull_netr_OsVersionInfoEx(struct ndr_pull *ndr, int
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->MinorVersion));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->BuildNumber));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->PlatformId));
-               NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->CSDVersion, 128, sizeof(uint16_t), CH_UTF16));
+               {
+                       uint32_t _flags_save_string = ndr->flags;
+                       ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
+                       {
+                               struct ndr_pull *_ndr_CSDVersion;
+                               NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_CSDVersion, 0, 256));
+                               NDR_CHECK(ndr_pull_string(_ndr_CSDVersion, NDR_SCALARS, &r->CSDVersion));
+                               NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_CSDVersion, 0, 256));
+                       }
+                       ndr->flags = _flags_save_string;
+               }
                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->ServicePackMajor));
                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->ServicePackMinor));
                NDR_CHECK(ndr_pull_netr_SuiteMask(ndr, NDR_SCALARS, &r->SuiteMask));
index 0a314e13c5ceb760eb3acc798280d2a37041fe35..234ea10ff3d37b71bccae61ad5b9fd161f58a07d 100644 (file)
@@ -930,7 +930,7 @@ struct netr_OsVersionInfoEx {
        uint32_t MinorVersion;
        uint32_t BuildNumber;
        uint32_t PlatformId;
-       const char *CSDVersion;/* [charset(UTF16)] */
+       const char * CSDVersion;/* [subcontext_size(256),subcontext(0),flag(LIBNDR_FLAG_STR_NULLTERM)] */
        uint16_t ServicePackMajor;
        uint16_t ServicePackMinor;
        uint16_t SuiteMask;