* changed to midl syntax using [case(x)] instead of case(x)

 * use empty defaults instead of a dummy empty structure
(This used to be commit 555a340d3c0697b147799bc0a6615e01e196daf6)

10 files changed, 127 insertions, 357 deletions

diff --git a/source4/librpc/idl/dfs.idl b/source4/librpc/idl/dfs.idl
index 1fb16b60ca..8e8488e367 100644
--- a/source4/librpc/idl/dfs.idl
+++ b/source4/librpc/idl/dfs.idl
@@ -96,15 +96,15 @@
 	} dfs_Info300;
 
 	typedef union {
-		case(1)   dfs_Info1 *info1;
-		case(2)   dfs_Info2 *info2;
-		case(3)   dfs_Info3 *info3;
-		case(4)   dfs_Info4 *info4;
-		case(100) dfs_Info100 *info100;
-		case(101) dfs_Info101 *info101;
-		case(102) dfs_Info102 *info102;
-		case(200) dfs_Info200 *info200;
-		case(300) dfs_Info300 *info300;
+		[case(1)]   dfs_Info1 *info1;
+		[case(2)]   dfs_Info2 *info2;
+		[case(3)]   dfs_Info3 *info3;
+		[case(4)]   dfs_Info4 *info4;
+		[case(100)] dfs_Info100 *info100;
+		[case(101)] dfs_Info101 *info101;
+		[case(102)] dfs_Info102 *info102;
+		[case(200)] dfs_Info200 *info200;
+		[case(300)] dfs_Info300 *info300;
 	} dfs_Info;
 
 	NTSTATUS dfs_GetInfo (
@@ -150,12 +150,12 @@
 
 
 	typedef union {
-		case(1) dfs_EnumArray1 *info1;
-		case(2) dfs_EnumArray2 *info2;
-		case(3) dfs_EnumArray3 *info3;
-		case(4) dfs_EnumArray4 *info4;
-		case(200) dfs_EnumArray200 *info200;
-		case(300) dfs_EnumArray300 *info300;
+		[case(1)] dfs_EnumArray1 *info1;
+		[case(2)] dfs_EnumArray2 *info2;
+		[case(3)] dfs_EnumArray3 *info3;
+		[case(4)] dfs_EnumArray4 *info4;
+		[case(200)] dfs_EnumArray200 *info200;
+		[case(300)] dfs_EnumArray300 *info300;
 	} dfs_EnumInfo;
 
 	typedef struct {
diff --git a/source4/librpc/idl/lsa.idl b/source4/librpc/idl/lsa.idl
index afb6d849fb..6aedd33b97 100644
--- a/source4/librpc/idl/lsa.idl
+++ b/source4/librpc/idl/lsa.idl
@@ -174,18 +174,18 @@
 	} lsa_DnsDomainInfo;
 
 	typedef union {
-		case(1)  lsa_AuditLogInfo audit_log;
-		case(2)  lsa_AuditEventsInfo audit_events;
-		case(3)  lsa_DomainInfo domain;
-		case(4)  lsa_PDAccountInfo pd;
-		case(5)  lsa_DomainInfo account_domain;
-		case(6)  lsa_ServerRole role;
-		case(7)  lsa_ReplicaSourceInfo replica;
-		case(8)  lsa_DefaultQuotaInfo quota;
-		case(9)  lsa_ModificationInfo db;
-		case(10) lsa_AuditFullSetInfo auditfullset;
-		case(11) lsa_AuditFullQueryInfo auditfullquery;
-		case(12) lsa_DnsDomainInfo dns;
+		[case(1)]  lsa_AuditLogInfo audit_log;
+		[case(2)]  lsa_AuditEventsInfo audit_events;
+		[case(3)]  lsa_DomainInfo domain;
+		[case(4)]  lsa_PDAccountInfo pd;
+		[case(5)]  lsa_DomainInfo account_domain;
+		[case(6)]  lsa_ServerRole role;
+		[case(7)]  lsa_ReplicaSourceInfo replica;
+		[case(8)]  lsa_DefaultQuotaInfo quota;
+		[case(9)]  lsa_ModificationInfo db;
+		[case(10)] lsa_AuditFullSetInfo auditfullset;
+		[case(11)] lsa_AuditFullQueryInfo auditfullquery;
+		[case(12)] lsa_DnsDomainInfo dns;
 	} lsa_PolicyInformation;
 
 	NTSTATUS lsa_QueryInfoPolicy (
diff --git a/source4/librpc/idl/samr.idl b/source4/librpc/idl/samr.idl
index 4aa757da34..7fc2847620 100644
--- a/source4/librpc/idl/samr.idl
+++ b/source4/librpc/idl/samr.idl
@@ -181,18 +181,18 @@
 	} samr_DomInfo13;
 
 	typedef union {
-		case(1) samr_DomInfo1 info1;
-		case(2) samr_DomInfo2 info2;
-		case(3) samr_DomInfo3 info3;
-		case(4) samr_DomInfo4 info4;
-		case(5) samr_DomInfo5 info5;
-		case(6) samr_DomInfo6 info6;
-		case(7) samr_DomInfo7 info7;
-		case(8) samr_DomInfo8 info8;
-		case(9) samr_DomInfo9 info9;
-		case(11) samr_DomInfo11 info11;
-		case(12) samr_DomInfo12 info12;
-		case(13) samr_DomInfo13 info13;
+		[case(1)] samr_DomInfo1 info1;
+		[case(2)] samr_DomInfo2 info2;
+		[case(3)] samr_DomInfo3 info3;
+		[case(4)] samr_DomInfo4 info4;
+		[case(5)] samr_DomInfo5 info5;
+		[case(6)] samr_DomInfo6 info6;
+		[case(7)] samr_DomInfo7 info7;
+		[case(8)] samr_DomInfo8 info8;
+		[case(9)] samr_DomInfo9 info9;
+		[case(11)] samr_DomInfo11 info11;
+		[case(12)] samr_DomInfo12 info12;
+		[case(13)] samr_DomInfo13 info13;
 	} samr_DomainInfo;
 
 	NTSTATUS samr_QueryDomainInfo(
@@ -314,10 +314,10 @@
 	} samr_GroupInfoDesciption;
 
 	typedef union {
-		case(1) samr_GroupInfoAll all;
-		case(2) samr_GroupInfoName name;
-		case(3) samr_GroupInfoX unknown;
-		case(4) samr_GroupInfoDesciption description;
+		[case(1)] samr_GroupInfoAll all;
+		[case(2)] samr_GroupInfoName name;
+		[case(3)] samr_GroupInfoX unknown;
+		[case(4)] samr_GroupInfoDesciption description;
 	} samr_GroupInfo;
 
 	NTSTATUS samr_QueryGroupInfo(
@@ -379,9 +379,9 @@
 	} samr_AliasInfoDescription;
 
 	typedef union {
-		case(1) samr_AliasInfoAll all;
-		case(2) samr_AliasInfoName name;
-		case(3) samr_AliasInfoDescription description;
+		[case(1)] samr_AliasInfoAll all;
+		[case(2)] samr_AliasInfoName name;
+		[case(3)] samr_AliasInfoDescription description;
 	} samr_AliasInfo;
 
 	NTSTATUS samr_QueryAliasInfo(
@@ -581,24 +581,24 @@
 	} samr_UserInfo21;
 
 	typedef union {
-		case(1) samr_UserInfo1 info1;
-		case(2) samr_UserInfo2 info2;
-		case(3) samr_UserInfo3 info3;
-		case(4) samr_UserInfo4 info4;
-		case(5) samr_UserInfo5 info5;
-		case(6) samr_UserInfo6 info6;
-		case(7) samr_UserInfo7 info7;
-		case(8) samr_UserInfo8 info8;
-		case(9) samr_UserInfo9 info9;
-		case(10) samr_UserInfo10 info10;
-		case(11) samr_UserInfo11 info11;
-		case(12) samr_UserInfo12 info12;
-		case(13) samr_UserInfo13 info13;
-		case(14) samr_UserInfo14 info14;
-		case(16) samr_UserInfo16 info16;
-		case(17) samr_UserInfo17 info17;
-		case(20) samr_UserInfo20 info20;
-		case(21) samr_UserInfo21 info21;
+		[case(1)] samr_UserInfo1 info1;
+		[case(2)] samr_UserInfo2 info2;
+		[case(3)] samr_UserInfo3 info3;
+		[case(4)] samr_UserInfo4 info4;
+		[case(5)] samr_UserInfo5 info5;
+		[case(6)] samr_UserInfo6 info6;
+		[case(7)] samr_UserInfo7 info7;
+		[case(8)] samr_UserInfo8 info8;
+		[case(9)] samr_UserInfo9 info9;
+		[case(10)] samr_UserInfo10 info10;
+		[case(11)] samr_UserInfo11 info11;
+		[case(12)] samr_UserInfo12 info12;
+		[case(13)] samr_UserInfo13 info13;
+		[case(14)] samr_UserInfo14 info14;
+		[case(16)] samr_UserInfo16 info16;
+		[case(17)] samr_UserInfo17 info17;
+		[case(20)] samr_UserInfo20 info20;
+		[case(21)] samr_UserInfo21 info21;
 	} samr_UserInfo;
 
 	NTSTATUS samr_QueryUserInfo(
diff --git a/source4/librpc/idl/spoolss.idl b/source4/librpc/idl/spoolss.idl
index 362e692aaf..a78dabd533 100644
--- a/source4/librpc/idl/spoolss.idl
+++ b/source4/librpc/idl/spoolss.idl
@@ -108,13 +108,13 @@
 	} spoolss_PrinterInfo7;
 
 	typedef [nodiscriminant,public] union {
-		case(1) spoolss_PrinterInfo1 info1;
-		case(2) spoolss_PrinterInfo2 info2;
-		case(3) spoolss_PrinterInfo3 info3;
-		case(4) spoolss_PrinterInfo4 info4;
-		case(5) spoolss_PrinterInfo5 info5;
-		case(6) spoolss_PrinterInfo6 info6;
-		case(7) spoolss_PrinterInfo7 info7;
+		[case(1)] spoolss_PrinterInfo1 info1;
+		[case(2)] spoolss_PrinterInfo2 info2;
+		[case(3)] spoolss_PrinterInfo3 info3;
+		[case(4)] spoolss_PrinterInfo4 info4;
+		[case(5)] spoolss_PrinterInfo5 info5;
+		[case(6)] spoolss_PrinterInfo6 info6;
+		[case(7)] spoolss_PrinterInfo7 info7;
 	} spoolss_PrinterInfo;
 
 	WERROR spoolss_EnumPrinters(
@@ -506,7 +506,7 @@
 	} spoolss_UserLevel1;
 
 	typedef union {
-		case(1)  spoolss_UserLevel1 *level1;
+		[case(1)]  spoolss_UserLevel1 *level1;
 	} spoolss_UserLevel;
 
 	/******************/
diff --git a/source4/librpc/idl/srvsvc.idl b/source4/librpc/idl/srvsvc.idl
index 40cb905e73..868888f5cc 100644
--- a/source4/librpc/idl/srvsvc.idl
+++ b/source4/librpc/idl/srvsvc.idl
@@ -74,13 +74,10 @@
 		[size_is(count)] srvsvc_NetConn1 *array;
 	} srvsvc_NetConnCtr1;
 
-	typedef struct {
-	} srvsvc_NetConnCtrDefault;
-
 	typedef union {
-		case(0) srvsvc_NetConnCtr0 *ctr0;
-		case(1) srvsvc_NetConnCtr1 *ctr1;
-		default srvsvc_NetConnCtrDefault ctrDefault;
+		[case(0)] srvsvc_NetConnCtr0 *ctr0;
+		[case(1)] srvsvc_NetConnCtr1 *ctr1;
+		[default] ;
 	} srvsvc_NetConnCtr;
 
 	WERROR srvsvc_NetConnEnum(
@@ -118,13 +115,10 @@
 		[size_is(count)] srvsvc_NetFile3 *array;
 	} srvsvc_NetFileCtr3;
 
-	typedef struct {
-	} srvsvc_NetFileCtrDefault;
-
 	typedef union {
-		case(2) srvsvc_NetFileCtr2 *ctr2;
-		case(3) srvsvc_NetFileCtr3 *ctr3;
-		default srvsvc_NetFileCtrDefault ctrDefault;
+		[case(2)] srvsvc_NetFileCtr2 *ctr2;
+		[case(3)] srvsvc_NetFileCtr3 *ctr3;
+		[default] ;
 	} srvsvc_NetFileCtr;
 
 	WERROR srvsvc_NetFileEnum(
@@ -217,16 +211,13 @@
 		[size_is(count)] srvsvc_NetSess502 *array;
 	} srvsvc_NetSessCtr502;
 
-	typedef struct {
-	} srvsvc_NetSessCtrDefault;
-
 	typedef union {
-		case(0) srvsvc_NetSessCtr0 *ctr0;
-		case(1) srvsvc_NetSessCtr1 *ctr1;
-		case(2) srvsvc_NetSessCtr2 *ctr2;
-		case(10) srvsvc_NetSessCtr10 *ctr10;
-		case(502) srvsvc_NetSessCtr502 *ctr502;
-		default srvsvc_NetSessCtrDefault ctrDefault;
+		[case(0)] srvsvc_NetSessCtr0 *ctr0;
+		[case(1)] srvsvc_NetSessCtr1 *ctr1;
+		[case(2)] srvsvc_NetSessCtr2 *ctr2;
+		[case(10)] srvsvc_NetSessCtr10 *ctr10;
+		[case(502)] srvsvc_NetSessCtr502 *ctr502;
+		[default] ;
 	} srvsvc_NetSessCtr;
 
 	WERROR srvsvc_NetSessEnum(
@@ -319,16 +310,13 @@
 		[size_is(count)] srvsvc_NetShare502 *array;
 	} srvsvc_NetShareCtr502;
 
-	typedef struct {
-	} srvsvc_NetShareCtrDefault;
-
 	typedef union {
-		case(0) srvsvc_NetShareCtr0 *ctr0;
-		case(1) srvsvc_NetShareCtr1 *ctr1;
-		case(2) srvsvc_NetShareCtr2 *ctr2;
-		case(501) srvsvc_NetShareCtr501 *ctr501;
-		case(502) srvsvc_NetShareCtr502 *ctr502;
-		default srvsvc_NetShareCtrDefault ctrDefault;
+		[case(0)] srvsvc_NetShareCtr0 *ctr0;
+		[case(1)] srvsvc_NetShareCtr1 *ctr1;
+		[case(2)] srvsvc_NetShareCtr2 *ctr2;
+		[case(501)] srvsvc_NetShareCtr501 *ctr501;
+		[case(502)] srvsvc_NetShareCtr502 *ctr502;
+		[default] ;
 	} srvsvc_NetShareCtr;
 
 	WERROR srvsvc_NetShareEnumAll(
@@ -418,15 +406,12 @@
 		[size_is(count)] srvsvc_NetDisk3 *array;
 	} srvsvc_NetDiskCtr3;
 
-	typedef struct {
-	} srvsvc_NetDiskCtrDefault;
-
 	typedef union {
-		case(0) srvsvc_NetDiskCtr0 ctr0;
-		case(1) srvsvc_NetDiskCtr1 ctr1;
-		case(2) srvsvc_NetDiskCtr2 ctr2;
-		case(3) srvsvc_NetDiskCtr3 ctr3;
-		default srvsvc_NetDiskCtrDefault ctrDefault;
+		[case(0)] srvsvc_NetDiskCtr0 ctr0;
+		[case(1)] srvsvc_NetDiskCtr1 ctr1;
+		[case(2)] srvsvc_NetDiskCtr2 ctr2;
+		[case(3)] srvsvc_NetDiskCtr3 ctr3;
+		[default] ;
 	} srvsvc_NetDiskSubCtr;
 
 	typedef struct {
@@ -499,14 +484,10 @@
 		[size_is(count)] srvsvc_NetTransport2 *array;
 	} srvsvc_NetTransportCtr2;
 
-	typedef struct {
-	} srvsvc_NetTransportCtrDefault;
-
 	typedef union {
-		case(0) srvsvc_NetTransportCtr0 *ctr0;
-		case(1) srvsvc_NetTransportCtr1 *ctr1;
-		case(2) srvsvc_NetTransportCtr2 *ctr2;
-		default srvsvc_NetTransportCtrDefault ctrDefault;
+		[case(0)] srvsvc_NetTransportCtr0 *ctr0;
+		[case(1)] srvsvc_NetTransportCtr1 *ctr1;
+		[case(2)] srvsvc_NetTransportCtr2 *ctr2;
 	} srvsvc_NetTransportCtr;
 
 	WERROR srvsvc_NetTransportEnum(
diff --git a/source4/librpc/idl/wkssvc.idl b/source4/librpc/idl/wkssvc.idl
index e42e7ae4f0..2a1fb83f79 100644
--- a/source4/librpc/idl/wkssvc.idl
+++ b/source4/librpc/idl/wkssvc.idl
@@ -79,10 +79,10 @@
 	} wkssvc_Info502;
 
 	typedef union {
-		case (100) wkssvc_Info100 *info100;
-		case (101) wkssvc_Info101 *info101;
-		case (102) wkssvc_Info102 *info102;
-		case (502) wkssvc_Info502 *info502;
+		[case(100)] wkssvc_Info100 *info100;
+		[case(101)] wkssvc_Info101 *info101;
+		[case(102)] wkssvc_Info102 *info102;
+		[case(502)] wkssvc_Info502 *info502;
 	} wkssvc_Info;
 
 	WERROR wkssvc_QueryInfo(
@@ -126,7 +126,8 @@
 	} wkssvc_TransportInfoArray;
 
 	typedef union {
-		case(0) wkssvc_TransportInfoArray *array;
+		[case(0)] wkssvc_TransportInfoArray *array;
+		[default] ;
 	} wkssvc_TransportInfo;
 
 	WERROR wkssvc_TransportEnum (
diff --git a/source4/librpc/ndr/ndr_srvsvc.c b/source4/librpc/ndr/ndr_srvsvc.c
index 31874eec5b..645a5572cc 100644
--- a/source4/librpc/ndr/ndr_srvsvc.c
+++ b/source4/librpc/ndr/ndr_srvsvc.c
@@ -124,18 +124,6 @@ done:
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_srvsvc_NetConnCtrDefault(struct ndr_push *ndr, int ndr_flags, struct srvsvc_NetConnCtrDefault *r)
-{
-	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
-	NDR_CHECK(ndr_push_struct_start(ndr));
-	NDR_CHECK(ndr_push_align(ndr, 1));
-	ndr_push_struct_end(ndr);
-buffers:
-	if (!(ndr_flags & NDR_BUFFERS)) goto done;
-done:
-	return NT_STATUS_OK;
-}
-
 NTSTATUS ndr_push_srvsvc_NetConnCtr(struct ndr_push *ndr, int ndr_flags, uint16 level, union srvsvc_NetConnCtr *r)
 {
 	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
@@ -150,7 +138,6 @@ NTSTATUS ndr_push_srvsvc_NetConnCtr(struct ndr_push *ndr, int ndr_flags, uint16
 	break;
 
 	default:
-	NDR_CHECK(ndr_push_srvsvc_NetConnCtrDefault(ndr, NDR_SCALARS, &r->ctrDefault));
 	break;
 
 	}
@@ -171,7 +158,6 @@ buffers:
 	break;
 
 	default:
-		NDR_CHECK(ndr_push_srvsvc_NetConnCtrDefault(ndr, ndr_flags, &r->ctrDefault));
 	break;
 
 	}
@@ -273,18 +259,6 @@ done:
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_srvsvc_NetFileCtrDefault(struct ndr_push *ndr, int ndr_flags, struct srvsvc_NetFileCtrDefault *r)
-{
-	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
-	NDR_CHECK(ndr_push_struct_start(ndr));
-	NDR_CHECK(ndr_push_align(ndr, 1));
-	ndr_push_struct_end(ndr);
-buffers:
-	if (!(ndr_flags & NDR_BUFFERS)) goto done;
-done:
-	return NT_STATUS_OK;
-}
-
 NTSTATUS ndr_push_srvsvc_NetFileCtr(struct ndr_push *ndr, int ndr_flags, uint16 level, union srvsvc_NetFileCtr *r)
 {
 	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
@@ -299,7 +273,6 @@ NTSTATUS ndr_push_srvsvc_NetFileCtr(struct ndr_push *ndr, int ndr_flags, uint16
 	break;
 
 	default:
-	NDR_CHECK(ndr_push_srvsvc_NetFileCtrDefault(ndr, NDR_SCALARS, &r->ctrDefault));
 	break;
 
 	}
@@ -320,7 +293,6 @@ buffers:
 	break;
 
 	default:
-		NDR_CHECK(ndr_push_srvsvc_NetFileCtrDefault(ndr, ndr_flags, &r->ctrDefault));
 	break;
 
 	}
@@ -578,18 +550,6 @@ done:
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_srvsvc_NetSessCtrDefault(struct ndr_push *ndr, int ndr_flags, struct srvsvc_NetSessCtrDefault *r)
-{
-	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
-	NDR_CHECK(ndr_push_struct_start(ndr));
-	NDR_CHECK(ndr_push_align(ndr, 1));
-	ndr_push_struct_end(ndr);
-buffers:
-	if (!(ndr_flags & NDR_BUFFERS)) goto done;
-done:
-	return NT_STATUS_OK;
-}
-
 NTSTATUS ndr_push_srvsvc_NetSessCtr(struct ndr_push *ndr, int ndr_flags, uint16 level, union srvsvc_NetSessCtr *r)
 {
 	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
@@ -616,7 +576,6 @@ NTSTATUS ndr_push_srvsvc_NetSessCtr(struct ndr_push *ndr, int ndr_flags, uint16
 	break;
 
 	default:
-	NDR_CHECK(ndr_push_srvsvc_NetSessCtrDefault(ndr, NDR_SCALARS, &r->ctrDefault));
 	break;
 
 	}
@@ -655,7 +614,6 @@ buffers:
 	break;
 
 	default:
-		NDR_CHECK(ndr_push_srvsvc_NetSessCtrDefault(ndr, ndr_flags, &r->ctrDefault));
 	break;
 
 	}
@@ -919,18 +877,6 @@ done:
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_srvsvc_NetShareCtrDefault(struct ndr_push *ndr, int ndr_flags, struct srvsvc_NetShareCtrDefault *r)
-{
-	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
-	NDR_CHECK(ndr_push_struct_start(ndr));
-	NDR_CHECK(ndr_push_align(ndr, 1));
-	ndr_push_struct_end(ndr);
-buffers:
-	if (!(ndr_flags & NDR_BUFFERS)) goto done;
-done:
-	return NT_STATUS_OK;
-}
-
 NTSTATUS ndr_push_srvsvc_NetShareCtr(struct ndr_push *ndr, int ndr_flags, uint16 level, union srvsvc_NetShareCtr *r)
 {
 	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
@@ -957,7 +903,6 @@ NTSTATUS ndr_push_srvsvc_NetShareCtr(struct ndr_push *ndr, int ndr_flags, uint16
 	break;
 
 	default:
-	NDR_CHECK(ndr_push_srvsvc_NetShareCtrDefault(ndr, NDR_SCALARS, &r->ctrDefault));
 	break;
 
 	}
@@ -996,7 +941,6 @@ buffers:
 	break;
 
 	default:
-		NDR_CHECK(ndr_push_srvsvc_NetShareCtrDefault(ndr, ndr_flags, &r->ctrDefault));
 	break;
 
 	}
@@ -1235,18 +1179,6 @@ done:
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_srvsvc_NetTransportCtrDefault(struct ndr_push *ndr, int ndr_flags, struct srvsvc_NetTransportCtrDefault *r)
-{
-	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
-	NDR_CHECK(ndr_push_struct_start(ndr));
-	NDR_CHECK(ndr_push_align(ndr, 1));
-	ndr_push_struct_end(ndr);
-buffers:
-	if (!(ndr_flags & NDR_BUFFERS)) goto done;
-done:
-	return NT_STATUS_OK;
-}
-
 NTSTATUS ndr_push_srvsvc_NetTransportCtr(struct ndr_push *ndr, int ndr_flags, uint16 level, union srvsvc_NetTransportCtr *r)
 {
 	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
@@ -1265,9 +1197,7 @@ NTSTATUS ndr_push_srvsvc_NetTransportCtr(struct ndr_push *ndr, int ndr_flags, ui
 	break;
 
 	default:
-	NDR_CHECK(ndr_push_srvsvc_NetTransportCtrDefault(ndr, NDR_SCALARS, &r->ctrDefault));
-	break;
-
+		return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
 	}
 	ndr_push_struct_end(ndr);
 buffers:
@@ -1292,9 +1222,7 @@ buffers:
 	break;
 
 	default:
-		NDR_CHECK(ndr_push_srvsvc_NetTransportCtrDefault(ndr, ndr_flags, &r->ctrDefault));
-	break;
-
+		return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
 	}
 done:
 	return NT_STATUS_OK;
@@ -1582,18 +1510,6 @@ done:
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_srvsvc_NetConnCtrDefault(struct ndr_pull *ndr, int ndr_flags, struct srvsvc_NetConnCtrDefault *r)
-{
-	NDR_CHECK(ndr_pull_struct_start(ndr));
-	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
-	NDR_CHECK(ndr_pull_align(ndr, 1));
-	ndr_pull_struct_end(ndr);
-buffers:
-	if (!(ndr_flags & NDR_BUFFERS)) goto done;
-done:
-	return NT_STATUS_OK;
-}
-
 NTSTATUS ndr_pull_srvsvc_NetConnCtr(struct ndr_pull *ndr, int ndr_flags, uint16 level, union srvsvc_NetConnCtr *r)
 {
 	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
@@ -1620,7 +1536,6 @@ NTSTATUS ndr_pull_srvsvc_NetConnCtr(struct ndr_pull *ndr, int ndr_flags, uint16
 	break; }
 
 	default: {
-	NDR_CHECK(ndr_pull_srvsvc_NetConnCtrDefault(ndr, NDR_SCALARS, &r->ctrDefault));
 	break; }
 
 	}
@@ -1641,7 +1556,6 @@ buffers:
 	break;
 
 	default:
-		NDR_CHECK(ndr_pull_srvsvc_NetConnCtrDefault(ndr, NDR_BUFFERS, &r->ctrDefault));
 	break;
 
 	}
@@ -1784,18 +1698,6 @@ done:
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_srvsvc_NetFileCtrDefault(struct ndr_pull *ndr, int ndr_flags, struct srvsvc_NetFileCtrDefault *r)
-{
-	NDR_CHECK(ndr_pull_struct_start(ndr));
-	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
-	NDR_CHECK(ndr_pull_align(ndr, 1));
-	ndr_pull_struct_end(ndr);
-buffers:
-	if (!(ndr_flags & NDR_BUFFERS)) goto done;
-done:
-	return NT_STATUS_OK;
-}
-
 NTSTATUS ndr_pull_srvsvc_NetFileCtr(struct ndr_pull *ndr, int ndr_flags, uint16 level, union srvsvc_NetFileCtr *r)
 {
 	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
@@ -1822,7 +1724,6 @@ NTSTATUS ndr_pull_srvsvc_NetFileCtr(struct ndr_pull *ndr, int ndr_flags, uint16
 	break; }
 
 	default: {
-	NDR_CHECK(ndr_pull_srvsvc_NetFileCtrDefault(ndr, NDR_SCALARS, &r->ctrDefault));
 	break; }
 
 	}
@@ -1843,7 +1744,6 @@ buffers:
 	break;
 
 	default:
-		NDR_CHECK(ndr_pull_srvsvc_NetFileCtrDefault(ndr, NDR_BUFFERS, &r->ctrDefault));
 	break;
 
 	}
@@ -2239,18 +2139,6 @@ done:
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_srvsvc_NetSessCtrDefault(struct ndr_pull *ndr, int ndr_flags, struct srvsvc_NetSessCtrDefault *r)
-{
-	NDR_CHECK(ndr_pull_struct_start(ndr));
-	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
-	NDR_CHECK(ndr_pull_align(ndr, 1));
-	ndr_pull_struct_end(ndr);
-buffers:
-	if (!(ndr_flags & NDR_BUFFERS)) goto done;
-done:
-	return NT_STATUS_OK;
-}
-
 NTSTATUS ndr_pull_srvsvc_NetSessCtr(struct ndr_pull *ndr, int ndr_flags, uint16 level, union srvsvc_NetSessCtr *r)
 {
 	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
@@ -2307,7 +2195,6 @@ NTSTATUS ndr_pull_srvsvc_NetSessCtr(struct ndr_pull *ndr, int ndr_flags, uint16
 	break; }
 
 	default: {
-	NDR_CHECK(ndr_pull_srvsvc_NetSessCtrDefault(ndr, NDR_SCALARS, &r->ctrDefault));
 	break; }
 
 	}
@@ -2346,7 +2233,6 @@ buffers:
 	break;
 
 	default:
-		NDR_CHECK(ndr_pull_srvsvc_NetSessCtrDefault(ndr, NDR_BUFFERS, &r->ctrDefault));
 	break;
 
 	}
@@ -2760,18 +2646,6 @@ done:
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_srvsvc_NetShareCtrDefault(struct ndr_pull *ndr, int ndr_flags, struct srvsvc_NetShareCtrDefault *r)
-{
-	NDR_CHECK(ndr_pull_struct_start(ndr));
-	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
-	NDR_CHECK(ndr_pull_align(ndr, 1));
-	ndr_pull_struct_end(ndr);
-buffers:
-	if (!(ndr_flags & NDR_BUFFERS)) goto done;
-done:
-	return NT_STATUS_OK;
-}
-
 NTSTATUS ndr_pull_srvsvc_NetShareCtr(struct ndr_pull *ndr, int ndr_flags, uint16 level, union srvsvc_NetShareCtr *r)
 {
 	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
@@ -2828,7 +2702,6 @@ NTSTATUS ndr_pull_srvsvc_NetShareCtr(struct ndr_pull *ndr, int ndr_flags, uint16
 	break; }
 
 	default: {
-	NDR_CHECK(ndr_pull_srvsvc_NetShareCtrDefault(ndr, NDR_SCALARS, &r->ctrDefault));
 	break; }
 
 	}
@@ -2867,7 +2740,6 @@ buffers:
 	break;
 
 	default:
-		NDR_CHECK(ndr_pull_srvsvc_NetShareCtrDefault(ndr, NDR_BUFFERS, &r->ctrDefault));
 	break;
 
 	}
@@ -3305,18 +3177,6 @@ done:
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_srvsvc_NetTransportCtrDefault(struct ndr_pull *ndr, int ndr_flags, struct srvsvc_NetTransportCtrDefault *r)
-{
-	NDR_CHECK(ndr_pull_struct_start(ndr));
-	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
-	NDR_CHECK(ndr_pull_align(ndr, 1));
-	ndr_pull_struct_end(ndr);
-buffers:
-	if (!(ndr_flags & NDR_BUFFERS)) goto done;
-done:
-	return NT_STATUS_OK;
-}
-
 NTSTATUS ndr_pull_srvsvc_NetTransportCtr(struct ndr_pull *ndr, int ndr_flags, uint16 level, union srvsvc_NetTransportCtr *r)
 {
 	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
@@ -3352,10 +3212,8 @@ NTSTATUS ndr_pull_srvsvc_NetTransportCtr(struct ndr_pull *ndr, int ndr_flags, ui
 	}
 	break; }
 
-	default: {
-	NDR_CHECK(ndr_pull_srvsvc_NetTransportCtrDefault(ndr, NDR_SCALARS, &r->ctrDefault));
-	break; }
-
+	default:
+		return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
 	}
 	ndr_pull_struct_end(ndr);
 buffers:
@@ -3380,9 +3238,7 @@ buffers:
 	break;
 
 	default:
-		NDR_CHECK(ndr_pull_srvsvc_NetTransportCtrDefault(ndr, NDR_BUFFERS, &r->ctrDefault));
-	break;
-
+		return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
 	}
 done:
 	return NT_STATUS_OK;
@@ -3733,13 +3589,6 @@ void ndr_print_srvsvc_NetConnCtr1(struct ndr_print *ndr, const char *name, struc
 	ndr->depth--;
 }
 
-void ndr_print_srvsvc_NetConnCtrDefault(struct ndr_print *ndr, const char *name, struct srvsvc_NetConnCtrDefault *r)
-{
-	ndr_print_struct(ndr, name, "srvsvc_NetConnCtrDefault");
-	ndr->depth++;
-	ndr->depth--;
-}
-
 void ndr_print_srvsvc_NetConnCtr(struct ndr_print *ndr, const char *name, uint16 level, union srvsvc_NetConnCtr *r)
 {
 	ndr_print_union(ndr, name, level, "srvsvc_NetConnCtr");
@@ -3763,7 +3612,6 @@ void ndr_print_srvsvc_NetConnCtr(struct ndr_print *ndr, const char *name, uint16
 	break;
 
 	default:
-	ndr_print_srvsvc_NetConnCtrDefault(ndr, "ctrDefault", &r->ctrDefault);
 	break;
 
 	}
@@ -3875,13 +3723,6 @@ void ndr_print_srvsvc_NetFileCtr3(struct ndr_print *ndr, const char *name, struc
 	ndr->depth--;
 }
 
-void ndr_print_srvsvc_NetFileCtrDefault(struct ndr_print *ndr, const char *name, struct srvsvc_NetFileCtrDefault *r)
-{
-	ndr_print_struct(ndr, name, "srvsvc_NetFileCtrDefault");
-	ndr->depth++;
-	ndr->depth--;
-}
-
 void ndr_print_srvsvc_NetFileCtr(struct ndr_print *ndr, const char *name, uint16 level, union srvsvc_NetFileCtr *r)
 {
 	ndr_print_union(ndr, name, level, "srvsvc_NetFileCtr");
@@ -3905,7 +3746,6 @@ void ndr_print_srvsvc_NetFileCtr(struct ndr_print *ndr, const char *name, uint16
 	break;
 
 	default:
-	ndr_print_srvsvc_NetFileCtrDefault(ndr, "ctrDefault", &r->ctrDefault);
 	break;
 
 	}
@@ -4192,13 +4032,6 @@ void ndr_print_srvsvc_NetSessCtr502(struct ndr_print *ndr, const char *name, str
 	ndr->depth--;
 }
 
-void ndr_print_srvsvc_NetSessCtrDefault(struct ndr_print *ndr, const char *name, struct srvsvc_NetSessCtrDefault *r)
-{
-	ndr_print_struct(ndr, name, "srvsvc_NetSessCtrDefault");
-	ndr->depth++;
-	ndr->depth--;
-}
-
 void ndr_print_srvsvc_NetSessCtr(struct ndr_print *ndr, const char *name, uint16 level, union srvsvc_NetSessCtr *r)
 {
 	ndr_print_union(ndr, name, level, "srvsvc_NetSessCtr");
@@ -4249,7 +4082,6 @@ void ndr_print_srvsvc_NetSessCtr(struct ndr_print *ndr, const char *name, uint16
 	break;
 
 	default:
-	ndr_print_srvsvc_NetSessCtrDefault(ndr, "ctrDefault", &r->ctrDefault);
 	break;
 
 	}
@@ -4546,13 +4378,6 @@ void ndr_print_srvsvc_NetShareCtr502(struct ndr_print *ndr, const char *name, st
 	ndr->depth--;
 }
 
-void ndr_print_srvsvc_NetShareCtrDefault(struct ndr_print *ndr, const char *name, struct srvsvc_NetShareCtrDefault *r)
-{
-	ndr_print_struct(ndr, name, "srvsvc_NetShareCtrDefault");
-	ndr->depth++;
-	ndr->depth--;
-}
-
 void ndr_print_srvsvc_NetShareCtr(struct ndr_print *ndr, const char *name, uint16 level, union srvsvc_NetShareCtr *r)
 {
 	ndr_print_union(ndr, name, level, "srvsvc_NetShareCtr");
@@ -4603,7 +4428,6 @@ void ndr_print_srvsvc_NetShareCtr(struct ndr_print *ndr, const char *name, uint1
 	break;
 
 	default:
-	ndr_print_srvsvc_NetShareCtrDefault(ndr, "ctrDefault", &r->ctrDefault);
 	break;
 
 	}
@@ -4874,13 +4698,6 @@ void ndr_print_srvsvc_NetDiskCtr3(struct ndr_print *ndr, const char *name, struc
 	ndr->depth--;
 }
 
-void ndr_print_srvsvc_NetDiskCtrDefault(struct ndr_print *ndr, const char *name, struct srvsvc_NetDiskCtrDefault *r)
-{
-	ndr_print_struct(ndr, name, "srvsvc_NetDiskCtrDefault");
-	ndr->depth++;
-	ndr->depth--;
-}
-
 void ndr_print_srvsvc_NetDiskSubCtr(struct ndr_print *ndr, const char *name, uint16 level, union srvsvc_NetDiskSubCtr *r)
 {
 	ndr_print_union(ndr, name, level, "srvsvc_NetDiskSubCtr");
@@ -4902,7 +4719,6 @@ void ndr_print_srvsvc_NetDiskSubCtr(struct ndr_print *ndr, const char *name, uin
 	break;
 
 	default:
-	ndr_print_srvsvc_NetDiskCtrDefault(ndr, "ctrDefault", &r->ctrDefault);
 	break;
 
 	}
@@ -5124,13 +4940,6 @@ void ndr_print_srvsvc_NetTransportCtr2(struct ndr_print *ndr, const char *name,
 	ndr->depth--;
 }
 
-void ndr_print_srvsvc_NetTransportCtrDefault(struct ndr_print *ndr, const char *name, struct srvsvc_NetTransportCtrDefault *r)
-{
-	ndr_print_struct(ndr, name, "srvsvc_NetTransportCtrDefault");
-	ndr->depth++;
-	ndr->depth--;
-}
-
 void ndr_print_srvsvc_NetTransportCtr(struct ndr_print *ndr, const char *name, uint16 level, union srvsvc_NetTransportCtr *r)
 {
 	ndr_print_union(ndr, name, level, "srvsvc_NetTransportCtr");
@@ -5163,9 +4972,7 @@ void ndr_print_srvsvc_NetTransportCtr(struct ndr_print *ndr, const char *name, u
 	break;
 
 	default:
-	ndr_print_srvsvc_NetTransportCtrDefault(ndr, "ctrDefault", &r->ctrDefault);
-	break;
-
+		ndr_print_bad_level(ndr, name, level);
 	}
 }
 
diff --git a/source4/librpc/ndr/ndr_srvsvc.h b/source4/librpc/ndr/ndr_srvsvc.h
index 7ebcb552b7..bae4543254 100644
--- a/source4/librpc/ndr/ndr_srvsvc.h
+++ b/source4/librpc/ndr/ndr_srvsvc.h
@@ -151,14 +151,10 @@ struct srvsvc_NetConnCtr1 {
 	struct srvsvc_NetConn1 *array;
 };
 
-struct srvsvc_NetConnCtrDefault {
-};
-
 union srvsvc_NetConnCtr {
 /* [case(0)] */ struct srvsvc_NetConnCtr0 *ctr0;
 /* [case(1)] */ struct srvsvc_NetConnCtr1 *ctr1;
-/* [case(default)] */ struct srvsvc_NetConnCtrDefault ctrDefault;
-};
+/* [case(default)] */ };
 
 struct srvsvc_NetConnEnum {
 	struct {
@@ -202,14 +198,10 @@ struct srvsvc_NetFileCtr3 {
 	struct srvsvc_NetFile3 *array;
 };
 
-struct srvsvc_NetFileCtrDefault {
-};
-
 union srvsvc_NetFileCtr {
 /* [case(2)] */ struct srvsvc_NetFileCtr2 *ctr2;
 /* [case(3)] */ struct srvsvc_NetFileCtr3 *ctr3;
-/* [case(default)] */ struct srvsvc_NetFileCtrDefault ctrDefault;
-};
+/* [case(default)] */ };
 
 struct srvsvc_NetFileEnum {
 	struct {
@@ -318,17 +310,13 @@ struct srvsvc_NetSessCtr502 {
 	struct srvsvc_NetSess502 *array;
 };
 
-struct srvsvc_NetSessCtrDefault {
-};
-
 union srvsvc_NetSessCtr {
 /* [case(0)] */ struct srvsvc_NetSessCtr0 *ctr0;
 /* [case(1)] */ struct srvsvc_NetSessCtr1 *ctr1;
 /* [case(2)] */ struct srvsvc_NetSessCtr2 *ctr2;
 /* [case(10)] */ struct srvsvc_NetSessCtr10 *ctr10;
 /* [case(502)] */ struct srvsvc_NetSessCtr502 *ctr502;
-/* [case(default)] */ struct srvsvc_NetSessCtrDefault ctrDefault;
-};
+/* [case(default)] */ };
 
 struct srvsvc_NetSessEnum {
 	struct {
@@ -437,17 +425,13 @@ struct srvsvc_NetShareCtr502 {
 	struct srvsvc_NetShare502 *array;
 };
 
-struct srvsvc_NetShareCtrDefault {
-};
-
 union srvsvc_NetShareCtr {
 /* [case(0)] */ struct srvsvc_NetShareCtr0 *ctr0;
 /* [case(1)] */ struct srvsvc_NetShareCtr1 *ctr1;
 /* [case(2)] */ struct srvsvc_NetShareCtr2 *ctr2;
 /* [case(501)] */ struct srvsvc_NetShareCtr501 *ctr501;
 /* [case(502)] */ struct srvsvc_NetShareCtr502 *ctr502;
-/* [case(default)] */ struct srvsvc_NetShareCtrDefault ctrDefault;
-};
+/* [case(default)] */ };
 
 struct srvsvc_NetShareEnumAll {
 	struct {
@@ -578,16 +562,12 @@ struct srvsvc_NetDiskCtr3 {
 	struct srvsvc_NetDisk3 *array;
 };
 
-struct srvsvc_NetDiskCtrDefault {
-};
-
 union srvsvc_NetDiskSubCtr {
 /* [case(0)] */ struct srvsvc_NetDiskCtr0 ctr0;
 /* [case(1)] */ struct srvsvc_NetDiskCtr1 ctr1;
 /* [case(2)] */ struct srvsvc_NetDiskCtr2 ctr2;
 /* [case(3)] */ struct srvsvc_NetDiskCtr3 ctr3;
-/* [case(default)] */ struct srvsvc_NetDiskCtrDefault ctrDefault;
-};
+/* [case(default)] */ };
 
 struct srvsvc_NetDiskCtr {
 	uint32 num1;
@@ -674,14 +654,10 @@ struct srvsvc_NetTransportCtr2 {
 	struct srvsvc_NetTransport2 *array;
 };
 
-struct srvsvc_NetTransportCtrDefault {
-};
-
 union srvsvc_NetTransportCtr {
 /* [case(0)] */ struct srvsvc_NetTransportCtr0 *ctr0;
 /* [case(1)] */ struct srvsvc_NetTransportCtr1 *ctr1;
 /* [case(2)] */ struct srvsvc_NetTransportCtr2 *ctr2;
-/* [case(default)] */ struct srvsvc_NetTransportCtrDefault ctrDefault;
 };
 
 struct srvsvc_NetTransportEnum {
diff --git a/source4/librpc/ndr/ndr_wkssvc.c b/source4/librpc/ndr/ndr_wkssvc.c
index 40006a5982..d6b1558d4c 100644
--- a/source4/librpc/ndr/ndr_wkssvc.c
+++ b/source4/librpc/ndr/ndr_wkssvc.c
@@ -88,7 +88,8 @@ NTSTATUS ndr_push_wkssvc_TransportInfo(struct ndr_push *ndr, int ndr_flags, uint
 	break;
 
 	default:
-		return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
+	break;
+
 	}
 	ndr_push_struct_end(ndr);
 buffers:
@@ -101,7 +102,8 @@ buffers:
 	break;
 
 	default:
-		return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
+	break;
+
 	}
 done:
 	return NT_STATUS_OK;
@@ -653,8 +655,9 @@ NTSTATUS ndr_pull_wkssvc_TransportInfo(struct ndr_pull *ndr, int ndr_flags, uint
 	}
 	break; }
 
-	default:
-		return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
+	default: {
+	break; }
+
 	}
 	ndr_pull_struct_end(ndr);
 buffers:
@@ -667,7 +670,8 @@ buffers:
 	break;
 
 	default:
-		return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
+	break;
+
 	}
 done:
 	return NT_STATUS_OK;
@@ -1187,7 +1191,8 @@ void ndr_print_wkssvc_TransportInfo(struct ndr_print *ndr, const char *name, uin
 	break;
 
 	default:
-		ndr_print_bad_level(ndr, name, level);
+	break;
+
 	}
 }
 
diff --git a/source4/librpc/ndr/ndr_wkssvc.h b/source4/librpc/ndr/ndr_wkssvc.h
index 9a245dfe5f..f08aea1139 100644
--- a/source4/librpc/ndr/ndr_wkssvc.h
+++ b/source4/librpc/ndr/ndr_wkssvc.h
@@ -177,7 +177,7 @@ struct wkssvc_TransportInfoArray {
 
 union wkssvc_TransportInfo {
 /* [case(0)] */ struct wkssvc_TransportInfoArray *array;
-};
+/* [case(default)] */ };
 
 struct wkssvc_TransportEnum {
 	struct {