Changeset 862 for trunk/server/librpc/ndr/ndr_ntprinting.c

Timestamp:

May 13, 2014, 11:39:04 AM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• librpc/ndr/ndr_ntprinting.c (modified) (3 diffs)

trunk/server/librpc/ndr/ndr_ntprinting.c

@@ -23 +23 @@
 #include "../librpc/gen_ndr/ndr_ntprinting.h"
 
+_PUBLIC_ uint32_t ndr_ntprinting_string_flags(uint32_t string_flags)
+{
+        uint32_t flags = LIBNDR_FLAG_STR_NULLTERM;
+
+        if (string_flags & LIBNDR_FLAG_STR_ASCII) {
+                flags |= LIBNDR_FLAG_STR_ASCII;
+        } else {
+                flags |= LIBNDR_FLAG_STR_UTF8;
+        }
+
+        return flags;
+}
+
 _PUBLIC_ enum ndr_err_code ndr_pull_ntprinting_printer(struct ndr_pull *ndr, int ndr_flags, struct ntprinting_printer *r)
 {
@@ -44 +57 @@
                                 _mem_save_devmode_0 = NDR_PULL_GET_MEM_CTX(ndr);
                                 NDR_PULL_SET_MEM_CTX(ndr, r->devmode, 0);
+                                r->devmode->string_flags = r->info.string_flags;
                                 NDR_CHECK(ndr_pull_ntprinting_devicemode(ndr, NDR_SCALARS|NDR_BUFFERS, r->devmode));
                                 NDR_PULL_SET_MEM_CTX(ndr, _mem_save_devmode_0, 0);
@@ -60 +74 @@
                                 r->printer_data = talloc_realloc(ndr, r->printer_data, struct ntprinting_printer_data, r->count + 1);
                                 NDR_ERR_HAVE_NO_MEMORY(r->printer_data);
+                                r->printer_data[r->count].string_flags = r->info.string_flags;
                                 NDR_CHECK(ndr_pull_ntprinting_printer_data(ndr, NDR_SCALARS, &r->printer_data[r->count]));
                                 r->count++;