From efe7ed72b5c3b454e801cdac092b75eeb2d30de8 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 19 Jan 2006 23:04:14 +0000
Subject: [PATCH] r13044: I finally understand that the [charset()] and
 [string] properties are independent...

fix some warnings

metze
(This used to be commit 6ae621437cdfd9ca5beac1d056f60d875a057b22)
---
 source4/librpc/idl/drsblobs.idl | 2 +-
 source4/librpc/idl/nbt.idl      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/source4/librpc/idl/drsblobs.idl b/source4/librpc/idl/drsblobs.idl
index 464bdb0d83e..d0173e48390 100644
--- a/source4/librpc/idl/drsblobs.idl
+++ b/source4/librpc/idl/drsblobs.idl
@@ -142,7 +142,7 @@ interface drsblobs {
 	} ldapControlDirSyncBlob;
 
 	typedef [public,relative_base] struct {
-		[string,charset(DOS),value("MSDS")] uint8 msds[4];
+		[charset(DOS),value("MSDS")] uint8 msds[4];
 		[subcontext(0)] ldapControlDirSyncBlob blob;
 	} ldapControlDirSyncCookie;
 
diff --git a/source4/librpc/idl/nbt.idl b/source4/librpc/idl/nbt.idl
index f2aca12b140..6c5c65e8ba9 100644
--- a/source4/librpc/idl/nbt.idl
+++ b/source4/librpc/idl/nbt.idl
@@ -596,7 +596,7 @@
 	typedef struct {
 		uint8 UpdateCount;
 		uint32 Periodicity;
-		[string,charset(DOS)] uint8 ServerName[16];
+		[charset(DOS)] uint8 ServerName[16];
 		uint8 OSMajor;
 		uint8 OSMinor;
 		svcctl_ServerType ServerType;
@@ -637,7 +637,7 @@
 	typedef struct {
 		uint8 UpdateCount;
 		uint32 Periodicity;
-		[string,charset(DOS)] uint8 ServerName[16];
+		[charset(DOS)] uint8 ServerName[16];
 		uint8 OSMajor;
 		uint8 OSMinor;
 		svcctl_ServerType ServerType;
@@ -656,7 +656,7 @@
 	typedef struct {
 		uint8 UpdateCount;
 		uint32 Periodicity;
-		[string,charset(DOS)] uint8 ServerName[16];
+		[charset(DOS)] uint8 ServerName[16];
 		uint8 OSMajor;
 		uint8 OSMinor;
 		svcctl_ServerType ServerType;