s3: re-run make samba3-idl.

Guenther

3 files changed, 72 insertions, 44 deletions

diff --git a/librpc/gen_ndr/ndr_rap.c b/librpc/gen_ndr/ndr_rap.c
index 3a1f70a681..43e7691ce6 100644
--- a/librpc/gen_ndr/ndr_rap.c
+++ b/librpc/gen_ndr/ndr_rap.c
@@ -3,6 +3,20 @@
 #include "includes.h"
 #include "../librpc/gen_ndr/ndr_rap.h"
 
+_PUBLIC_ enum ndr_err_code ndr_push_rap_status(struct ndr_push *ndr, int ndr_flags, enum rap_status r)
+{
+	NDR_CHECK(ndr_push_enum_uint1632(ndr, NDR_SCALARS, r));
+	return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_pull_rap_status(struct ndr_pull *ndr, int ndr_flags, enum rap_status *r)
+{
+	uint16_t v;
+	NDR_CHECK(ndr_pull_enum_uint1632(ndr, NDR_SCALARS, &v));
+	*r = v;
+	return NDR_ERR_SUCCESS;
+}
+
 static enum ndr_err_code ndr_push_rap_share_info_0(struct ndr_push *ndr, int ndr_flags, const struct rap_share_info_0 *r)
 {
 	if (ndr_flags & NDR_SCALARS) {
@@ -2239,7 +2253,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_rap_NetShareEnum(struct ndr_push *ndr, int f
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->in.bufsize));
 	}
 	if (flags & NDR_OUT) {
-		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.status));
+		NDR_CHECK(ndr_push_rap_status(ndr, NDR_SCALARS, r->out.status));
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.convert));
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.count));
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.available));
@@ -2264,7 +2278,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_rap_NetShareEnum(struct ndr_pull *ndr, int f
 		ZERO_STRUCTP(r->out.info);
 	}
 	if (flags & NDR_OUT) {
-		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.status));
+		NDR_CHECK(ndr_pull_rap_status(ndr, NDR_SCALARS, &r->out.status));
 		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.convert));
 		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.count));
 		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.available));
@@ -2297,7 +2311,7 @@ _PUBLIC_ void ndr_print_rap_NetShareEnum(struct ndr_print *ndr, const char *name
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "rap_NetShareEnum");
 		ndr->depth++;
-		ndr_print_uint16(ndr, "status", r->out.status);
+		ndr_print_rap_status(ndr, "status", r->out.status);
 		ndr_print_uint16(ndr, "convert", r->out.convert);
 		ndr_print_uint16(ndr, "count", r->out.count);
 		ndr_print_uint16(ndr, "available", r->out.available);
@@ -2329,7 +2343,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_rap_NetServerEnum2(struct ndr_push *ndr, int
 		}
 	}
 	if (flags & NDR_OUT) {
-		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.status));
+		NDR_CHECK(ndr_push_rap_status(ndr, NDR_SCALARS, r->out.status));
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.convert));
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.count));
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.available));
@@ -2362,7 +2376,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_rap_NetServerEnum2(struct ndr_pull *ndr, int
 		}
 	}
 	if (flags & NDR_OUT) {
-		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.status));
+		NDR_CHECK(ndr_pull_rap_status(ndr, NDR_SCALARS, &r->out.status));
 		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.convert));
 		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.count));
 		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.available));
@@ -2404,7 +2418,7 @@ _PUBLIC_ void ndr_print_rap_NetServerEnum2(struct ndr_print *ndr, const char *na
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "rap_NetServerEnum2");
 		ndr->depth++;
-		ndr_print_uint16(ndr, "status", r->out.status);
+		ndr_print_rap_status(ndr, "status", r->out.status);
 		ndr_print_uint16(ndr, "convert", r->out.convert);
 		ndr_print_uint16(ndr, "count", r->out.count);
 		ndr_print_uint16(ndr, "available", r->out.available);
@@ -2431,7 +2445,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_rap_WserverGetInfo(struct ndr_push *ndr, int
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->in.bufsize));
 	}
 	if (flags & NDR_OUT) {
-		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.status));
+		NDR_CHECK(ndr_push_rap_status(ndr, NDR_SCALARS, r->out.status));
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.convert));
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.available));
 		NDR_CHECK(ndr_push_set_switch_value(ndr, &r->out.info, r->in.level));
@@ -2449,7 +2463,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_rap_WserverGetInfo(struct ndr_pull *ndr, int
 		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->in.bufsize));
 	}
 	if (flags & NDR_OUT) {
-		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.status));
+		NDR_CHECK(ndr_pull_rap_status(ndr, NDR_SCALARS, &r->out.status));
 		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.convert));
 		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.available));
 		NDR_CHECK(ndr_pull_set_switch_value(ndr, &r->out.info, r->in.level));
@@ -2475,7 +2489,7 @@ _PUBLIC_ void ndr_print_rap_WserverGetInfo(struct ndr_print *ndr, const char *na
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "rap_WserverGetInfo");
 		ndr->depth++;
-		ndr_print_uint16(ndr, "status", r->out.status);
+		ndr_print_rap_status(ndr, "status", r->out.status);
 		ndr_print_uint16(ndr, "convert", r->out.convert);
 		ndr_print_uint16(ndr, "available", r->out.available);
 		ndr_print_set_switch_value(ndr, &r->out.info, r->in.level);
@@ -2493,7 +2507,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_rap_NetPrintQEnum(struct ndr_push *ndr, int
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->in.bufsize));
 	}
 	if (flags & NDR_OUT) {
-		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.status));
+		NDR_CHECK(ndr_push_rap_status(ndr, NDR_SCALARS, r->out.status));
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.convert));
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.count));
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.available));
@@ -2519,7 +2533,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_rap_NetPrintQEnum(struct ndr_pull *ndr, int
 		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->in.bufsize));
 	}
 	if (flags & NDR_OUT) {
-		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.status));
+		NDR_CHECK(ndr_pull_rap_status(ndr, NDR_SCALARS, &r->out.status));
 		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.convert));
 		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.count));
 		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.available));
@@ -2556,7 +2570,7 @@ _PUBLIC_ void ndr_print_rap_NetPrintQEnum(struct ndr_print *ndr, const char *nam
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "rap_NetPrintQEnum");
 		ndr->depth++;
-		ndr_print_uint16(ndr, "status", r->out.status);
+		ndr_print_rap_status(ndr, "status", r->out.status);
 		ndr_print_uint16(ndr, "convert", r->out.convert);
 		ndr_print_uint16(ndr, "count", r->out.count);
 		ndr_print_uint16(ndr, "available", r->out.available);
@@ -2589,7 +2603,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_rap_NetPrintQGetInfo(struct ndr_push *ndr, i
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->in.bufsize));
 	}
 	if (flags & NDR_OUT) {
-		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.status));
+		NDR_CHECK(ndr_push_rap_status(ndr, NDR_SCALARS, r->out.status));
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.convert));
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.available));
 		NDR_CHECK(ndr_push_set_switch_value(ndr, &r->out.info, r->in.level));
@@ -2613,7 +2627,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_rap_NetPrintQGetInfo(struct ndr_pull *ndr, i
 		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->in.bufsize));
 	}
 	if (flags & NDR_OUT) {
-		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.status));
+		NDR_CHECK(ndr_pull_rap_status(ndr, NDR_SCALARS, &r->out.status));
 		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.convert));
 		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.available));
 		NDR_CHECK(ndr_pull_set_switch_value(ndr, &r->out.info, r->in.level));
@@ -2640,7 +2654,7 @@ _PUBLIC_ void ndr_print_rap_NetPrintQGetInfo(struct ndr_print *ndr, const char *
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "rap_NetPrintQGetInfo");
 		ndr->depth++;
-		ndr_print_uint16(ndr, "status", r->out.status);
+		ndr_print_rap_status(ndr, "status", r->out.status);
 		ndr_print_uint16(ndr, "convert", r->out.convert);
 		ndr_print_uint16(ndr, "available", r->out.available);
 		ndr_print_set_switch_value(ndr, &r->out.info, r->in.level);
@@ -2656,7 +2670,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_rap_NetPrintJobPause(struct ndr_push *ndr, i
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->in.JobID));
 	}
 	if (flags & NDR_OUT) {
-		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.status));
+		NDR_CHECK(ndr_push_rap_status(ndr, NDR_SCALARS, r->out.status));
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.convert));
 	}
 	return NDR_ERR_SUCCESS;
@@ -2670,7 +2684,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_rap_NetPrintJobPause(struct ndr_pull *ndr, i
 		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->in.JobID));
 	}
 	if (flags & NDR_OUT) {
-		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.status));
+		NDR_CHECK(ndr_pull_rap_status(ndr, NDR_SCALARS, &r->out.status));
 		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.convert));
 	}
 	return NDR_ERR_SUCCESS;
@@ -2692,7 +2706,7 @@ _PUBLIC_ void ndr_print_rap_NetPrintJobPause(struct ndr_print *ndr, const char *
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "rap_NetPrintJobPause");
 		ndr->depth++;
-		ndr_print_uint16(ndr, "status", r->out.status);
+		ndr_print_rap_status(ndr, "status", r->out.status);
 		ndr_print_uint16(ndr, "convert", r->out.convert);
 		ndr->depth--;
 	}
@@ -2705,7 +2719,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_rap_NetPrintJobContinue(struct ndr_push *ndr
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->in.JobID));
 	}
 	if (flags & NDR_OUT) {
-		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.status));
+		NDR_CHECK(ndr_push_rap_status(ndr, NDR_SCALARS, r->out.status));
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.convert));
 	}
 	return NDR_ERR_SUCCESS;
@@ -2719,7 +2733,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_rap_NetPrintJobContinue(struct ndr_pull *ndr
 		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->in.JobID));
 	}
 	if (flags & NDR_OUT) {
-		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.status));
+		NDR_CHECK(ndr_pull_rap_status(ndr, NDR_SCALARS, &r->out.status));
 		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.convert));
 	}
 	return NDR_ERR_SUCCESS;
@@ -2741,7 +2755,7 @@ _PUBLIC_ void ndr_print_rap_NetPrintJobContinue(struct ndr_print *ndr, const cha
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "rap_NetPrintJobContinue");
 		ndr->depth++;
-		ndr_print_uint16(ndr, "status", r->out.status);
+		ndr_print_rap_status(ndr, "status", r->out.status);
 		ndr_print_uint16(ndr, "convert", r->out.convert);
 		ndr->depth--;
 	}
@@ -2754,7 +2768,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_rap_NetPrintJobDelete(struct ndr_push *ndr,
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->in.JobID));
 	}
 	if (flags & NDR_OUT) {
-		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.status));
+		NDR_CHECK(ndr_push_rap_status(ndr, NDR_SCALARS, r->out.status));
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.convert));
 	}
 	return NDR_ERR_SUCCESS;
@@ -2768,7 +2782,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_rap_NetPrintJobDelete(struct ndr_pull *ndr,
 		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->in.JobID));
 	}
 	if (flags & NDR_OUT) {
-		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.status));
+		NDR_CHECK(ndr_pull_rap_status(ndr, NDR_SCALARS, &r->out.status));
 		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.convert));
 	}
 	return NDR_ERR_SUCCESS;
@@ -2790,7 +2804,7 @@ _PUBLIC_ void ndr_print_rap_NetPrintJobDelete(struct ndr_print *ndr, const char
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "rap_NetPrintJobDelete");
 		ndr->depth++;
-		ndr_print_uint16(ndr, "status", r->out.status);
+		ndr_print_rap_status(ndr, "status", r->out.status);
 		ndr_print_uint16(ndr, "convert", r->out.convert);
 		ndr->depth--;
 	}
@@ -2808,7 +2822,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_rap_NetPrintQueuePause(struct ndr_push *ndr,
 		}
 	}
 	if (flags & NDR_OUT) {
-		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.status));
+		NDR_CHECK(ndr_push_rap_status(ndr, NDR_SCALARS, r->out.status));
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.convert));
 	}
 	return NDR_ERR_SUCCESS;
@@ -2827,7 +2841,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_rap_NetPrintQueuePause(struct ndr_pull *ndr,
 		}
 	}
 	if (flags & NDR_OUT) {
-		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.status));
+		NDR_CHECK(ndr_pull_rap_status(ndr, NDR_SCALARS, &r->out.status));
 		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.convert));
 	}
 	return NDR_ERR_SUCCESS;
@@ -2849,7 +2863,7 @@ _PUBLIC_ void ndr_print_rap_NetPrintQueuePause(struct ndr_print *ndr, const char
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "rap_NetPrintQueuePause");
 		ndr->depth++;
-		ndr_print_uint16(ndr, "status", r->out.status);
+		ndr_print_rap_status(ndr, "status", r->out.status);
 		ndr_print_uint16(ndr, "convert", r->out.convert);
 		ndr->depth--;
 	}
@@ -2867,7 +2881,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_rap_NetPrintQueueResume(struct ndr_push *ndr
 		}
 	}
 	if (flags & NDR_OUT) {
-		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.status));
+		NDR_CHECK(ndr_push_rap_status(ndr, NDR_SCALARS, r->out.status));
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.convert));
 	}
 	return NDR_ERR_SUCCESS;
@@ -2886,7 +2900,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_rap_NetPrintQueueResume(struct ndr_pull *ndr
 		}
 	}
 	if (flags & NDR_OUT) {
-		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.status));
+		NDR_CHECK(ndr_pull_rap_status(ndr, NDR_SCALARS, &r->out.status));
 		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.convert));
 	}
 	return NDR_ERR_SUCCESS;
@@ -2908,7 +2922,7 @@ _PUBLIC_ void ndr_print_rap_NetPrintQueueResume(struct ndr_print *ndr, const cha
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "rap_NetPrintQueueResume");
 		ndr->depth++;
-		ndr_print_uint16(ndr, "status", r->out.status);
+		ndr_print_rap_status(ndr, "status", r->out.status);
 		ndr_print_uint16(ndr, "convert", r->out.convert);
 		ndr->depth--;
 	}
@@ -2926,7 +2940,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_rap_NetPrintQueuePurge(struct ndr_push *ndr,
 		}
 	}
 	if (flags & NDR_OUT) {
-		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.status));
+		NDR_CHECK(ndr_push_rap_status(ndr, NDR_SCALARS, r->out.status));
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.convert));
 	}
 	return NDR_ERR_SUCCESS;
@@ -2945,7 +2959,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_rap_NetPrintQueuePurge(struct ndr_pull *ndr,
 		}
 	}
 	if (flags & NDR_OUT) {
-		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.status));
+		NDR_CHECK(ndr_pull_rap_status(ndr, NDR_SCALARS, &r->out.status));
 		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.convert));
 	}
 	return NDR_ERR_SUCCESS;
@@ -2967,7 +2981,7 @@ _PUBLIC_ void ndr_print_rap_NetPrintQueuePurge(struct ndr_print *ndr, const char
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "rap_NetPrintQueuePurge");
 		ndr->depth++;
-		ndr_print_uint16(ndr, "status", r->out.status);
+		ndr_print_rap_status(ndr, "status", r->out.status);
 		ndr_print_uint16(ndr, "convert", r->out.convert);
 		ndr->depth--;
 	}
diff --git a/librpc/gen_ndr/ndr_rap.h b/librpc/gen_ndr/ndr_rap.h
index 5847697383..60c8f469df 100644
--- a/librpc/gen_ndr/ndr_rap.h
+++ b/librpc/gen_ndr/ndr_rap.h
@@ -30,6 +30,9 @@
 #define NDR_RAP_NETPRINTQUEUEPURGE (0x0a)
 
 #define NDR_RAP_CALL_COUNT (11)
+enum ndr_err_code ndr_push_rap_status(struct ndr_push *ndr, int ndr_flags, enum rap_status r);
+enum ndr_err_code ndr_pull_rap_status(struct ndr_pull *ndr, int ndr_flags, enum rap_status *r);
+void ndr_print_rap_status(struct ndr_print *ndr, const char *name, enum rap_status r);
 void ndr_print_rap_share_info_0(struct ndr_print *ndr, const char *name, const struct rap_share_info_0 *r);
 void ndr_print_rap_share_info_1(struct ndr_print *ndr, const char *name, const struct rap_share_info_1 *r);
 void ndr_print_rap_share_info_2(struct ndr_print *ndr, const char *name, const struct rap_share_info_2 *r);
diff --git a/librpc/gen_ndr/rap.h b/librpc/gen_ndr/rap.h
index 10f4f23863..2b7adc6155 100644
--- a/librpc/gen_ndr/rap.h
+++ b/librpc/gen_ndr/rap.h
@@ -338,6 +338,17 @@
 #define RAP_USER_LOGOFF_INFO_L1	( "WDW" )
 #define RAP_WKSTA_INFO_L1	( "WDzzzzBBDWDWWWWWWWWWWWWWWWWWWWzzWzzW" )
 #define RAP_WKSTA_INFO_L10	( "zzzBBzz" )
+enum rap_status
+#ifndef USE_UINT_ENUMS
+ {
+	NERR_Success=(int)(0)
+}
+#else
+ { __donnot_use_enum_rap_status=0x7FFFFFFF}
+#define NERR_Success ( 0 )
+#endif
+;
+
 struct rap_group_info_1 {
 	uint8_t group_name[21];
 	uint8_t reserved1;
@@ -600,7 +611,7 @@ struct rap_NetShareEnum {
 	} in;
 
 	struct {
-		uint16_t status;
+		enum rap_status status;
 		uint16_t convert;
 		uint16_t count;
 		uint16_t available;
@@ -619,7 +630,7 @@ struct rap_NetServerEnum2 {
 	} in;
 
 	struct {
-		uint16_t status;
+		enum rap_status status;
 		uint16_t convert;
 		uint16_t count;
 		uint16_t available;
@@ -636,7 +647,7 @@ struct rap_WserverGetInfo {
 	} in;
 
 	struct {
-		uint16_t status;
+		enum rap_status status;
 		uint16_t convert;
 		uint16_t available;
 		union rap_server_info info;/* [switch_is(level)] */
@@ -652,7 +663,7 @@ struct rap_NetPrintQEnum {
 	} in;
 
 	struct {
-		uint16_t status;
+		enum rap_status status;
 		uint16_t convert;
 		uint16_t count;
 		uint16_t available;
@@ -670,7 +681,7 @@ struct rap_NetPrintQGetInfo {
 	} in;
 
 	struct {
-		uint16_t status;
+		enum rap_status status;
 		uint16_t convert;
 		uint16_t available;
 		union rap_printq_info info;/* [switch_is(level)] */
@@ -685,7 +696,7 @@ struct rap_NetPrintJobPause {
 	} in;
 
 	struct {
-		uint16_t status;
+		enum rap_status status;
 		uint16_t convert;
 	} out;
 
@@ -698,7 +709,7 @@ struct rap_NetPrintJobContinue {
 	} in;
 
 	struct {
-		uint16_t status;
+		enum rap_status status;
 		uint16_t convert;
 	} out;
 
@@ -711,7 +722,7 @@ struct rap_NetPrintJobDelete {
 	} in;
 
 	struct {
-		uint16_t status;
+		enum rap_status status;
 		uint16_t convert;
 	} out;
 
@@ -724,7 +735,7 @@ struct rap_NetPrintQueuePause {
 	} in;
 
 	struct {
-		uint16_t status;
+		enum rap_status status;
 		uint16_t convert;
 	} out;
 
@@ -737,7 +748,7 @@ struct rap_NetPrintQueueResume {
 	} in;
 
 	struct {
-		uint16_t status;
+		enum rap_status status;
 		uint16_t convert;
 	} out;
 
@@ -750,7 +761,7 @@ struct rap_NetPrintQueuePurge {
 	} in;
 
 	struct {
-		uint16_t status;
+		enum rap_status status;
 		uint16_t convert;
 	} out;