Changeset 862 for trunk/server/source3/librpc/gen_ndr/ntprinting.h

Timestamp:

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

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/librpc/gen_ndr/ntprinting.h (modified) (4 diffs)

trunk/server/source3/librpc/gen_ndr/ntprinting.h

@@ -23 +23 @@
 
 struct ntprinting_driver {
+
         uint32_t version;
-        const char * name;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
-        const char * environment;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
-        const char * driverpath;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
-        const char * datafile;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
-        const char * configfile;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
-        const char * helpfile;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
-        const char * monitorname;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
-        const char * defaultdatatype;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
-        const char ** dependent_files;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NOTERM|LIBNDR_FLAG_REMAINING)] */
+        const char * name;/* [flag()] */
+        const char * environment;/* [flag()] */
+        const char * driverpath;/* [flag()] */
+        const char * datafile;/* [flag()] */
+        const char * configfile;/* [flag()] */
+        const char * helpfile;/* [flag()] */
+        const char * monitorname;/* [flag()] */
+        const char * defaultdatatype;/* [flag()] */
+        const char ** dependent_files;/* [flag(|LIBNDR_FLAG_STR_NOTERM|LIBNDR_FLAG_REMAINING)] */
 }/* [public,flag(LIBNDR_FLAG_NOALIGN)] */;
 
 struct ntprinting_devicemode {
-        const char * devicename;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
-        const char * formname;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
+        uint32_t string_flags;/* [skip] */
+        const char * devicename;/* [flag(ndr_ntprinting_string_flags(r->string_flags))] */
+        const char * formname;/* [flag(ndr_ntprinting_string_flags(r->string_flags))] */
         uint16_t specversion;
         uint16_t driverversion;
@@ -74 +76 @@
 
 struct ntprinting_printer_data {
+
         uint32_t ptr;
-        const char * name;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
+        const char * name;/* [flag()] */
         uint32_t type;
         DATA_BLOB data;
@@ -81 +84 @@
 
 struct ntprinting_printer_info {
+
         uint32_t attributes;
         uint32_t priority;
@@ -92 +96 @@
         uint32_t c_setprinter;
         uint32_t setuptime;
-        const char * servername;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
-        const char * printername;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
-        const char * sharename;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
-        const char * portname;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
-        const char * drivername;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
-        const char * comment;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
-        const char * location;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
-        const char * sepfile;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
-        const char * printprocessor;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
-        const char * datatype;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
-        const char * parameters;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
+        const char * servername;/* [flag()] */
+        const char * printername;/* [flag()] */
+        const char * sharename;/* [flag()] */
+        const char * portname;/* [flag()] */
+        const char * drivername;/* [flag()] */
+        const char * comment;/* [flag()] */
+        const char * location;/* [flag()] */
+        const char * sepfile;/* [flag()] */
+        const char * printprocessor;/* [flag()] */
+        const char * datatype;/* [flag()] */
+        const char * parameters;/* [flag()] */
 }/* [public,flag(LIBNDR_FLAG_NOALIGN)] */;