diff --git a/librpc/gen_ndr/ndr_rap.c b/librpc/gen_ndr/ndr_rap.c
index 05d38b2fb4a..1e0957c8985 100644
--- a/librpc/gen_ndr/ndr_rap.c
+++ b/librpc/gen_ndr/ndr_rap.c
@@ -562,17 +562,17 @@ static enum ndr_err_code ndr_push_rap_PrintJobInfo1(struct ndr_push *ndr, int nd
 	if (ndr_flags & NDR_SCALARS) {
 		NDR_CHECK(ndr_push_align(ndr, 5));
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->JobID));
-		NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->UserName, 21));
+		NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->UserName, 21, sizeof(uint8_t), CH_DOS));
 		NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->Pad));
-		NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->NotifyName, 16));
-		NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->DataType, 10));
+		NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->NotifyName, 16, sizeof(uint8_t), CH_DOS));
+		NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->DataType, 10, sizeof(uint8_t), CH_DOS));
 		NDR_CHECK(ndr_push_short_relative_ptr1(ndr, r->PrintParameterString));
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->PrintParameterStringHigh));
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->JobPosition));
 		NDR_CHECK(ndr_push_rap_PrintJStatusCode(ndr, NDR_SCALARS, r->JobStatus));
 		NDR_CHECK(ndr_push_short_relative_ptr1(ndr, r->JobStatusString));
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->JobStatusStringHigh));
-		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->TimeSubmitted));
+		NDR_CHECK(ndr_push_time_t(ndr, NDR_SCALARS, r->TimeSubmitted));
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->JobSize));
 		NDR_CHECK(ndr_push_short_relative_ptr1(ndr, r->JobCommentString));
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->JobCommentStringHigh));
@@ -615,10 +615,10 @@ static enum ndr_err_code ndr_pull_rap_PrintJobInfo1(struct ndr_pull *ndr, int nd
 	if (ndr_flags & NDR_SCALARS) {
 		NDR_CHECK(ndr_pull_align(ndr, 5));
 		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->JobID));
-		NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->UserName, 21));
+		NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->UserName, 21, sizeof(uint8_t), CH_DOS));
 		NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->Pad));
-		NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->NotifyName, 16));
-		NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->DataType, 10));
+		NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->NotifyName, 16, sizeof(uint8_t), CH_DOS));
+		NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->DataType, 10, sizeof(uint8_t), CH_DOS));
 		NDR_CHECK(ndr_pull_relative_ptr_short(ndr, &_ptr_PrintParameterString));
 		if (_ptr_PrintParameterString) {
 			NDR_PULL_ALLOC(ndr, r->PrintParameterString);
@@ -637,7 +637,7 @@ static enum ndr_err_code ndr_pull_rap_PrintJobInfo1(struct ndr_pull *ndr, int nd
 			r->JobStatusString = NULL;
 		}
 		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->JobStatusStringHigh));
-		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->TimeSubmitted));
+		NDR_CHECK(ndr_pull_time_t(ndr, NDR_SCALARS, &r->TimeSubmitted));
 		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->JobSize));
 		NDR_CHECK(ndr_pull_relative_ptr_short(ndr, &_ptr_JobCommentString));
 		if (_ptr_JobCommentString) {
@@ -704,10 +704,10 @@ _PUBLIC_ void ndr_print_rap_PrintJobInfo1(struct ndr_print *ndr, const char *nam
 	ndr_print_struct(ndr, name, "rap_PrintJobInfo1");
 	ndr->depth++;
 	ndr_print_uint16(ndr, "JobID", r->JobID);
-	ndr_print_array_uint8(ndr, "UserName", r->UserName, 21);
+	ndr_print_string(ndr, "UserName", r->UserName);
 	ndr_print_uint8(ndr, "Pad", r->Pad);
-	ndr_print_array_uint8(ndr, "NotifyName", r->NotifyName, 16);
-	ndr_print_array_uint8(ndr, "DataType", r->DataType, 10);
+	ndr_print_string(ndr, "NotifyName", r->NotifyName);
+	ndr_print_string(ndr, "DataType", r->DataType);
 	ndr_print_ptr(ndr, "PrintParameterString", r->PrintParameterString);
 	ndr->depth++;
 	if (r->PrintParameterString) {
@@ -724,7 +724,7 @@ _PUBLIC_ void ndr_print_rap_PrintJobInfo1(struct ndr_print *ndr, const char *nam
 	}
 	ndr->depth--;
 	ndr_print_uint16(ndr, "JobStatusStringHigh", r->JobStatusStringHigh);
-	ndr_print_uint32(ndr, "TimeSubmitted", r->TimeSubmitted);
+	ndr_print_time_t(ndr, "TimeSubmitted", r->TimeSubmitted);
 	ndr_print_uint32(ndr, "JobSize", r->JobSize);
 	ndr_print_ptr(ndr, "JobCommentString", r->JobCommentString);
 	ndr->depth++;
diff --git a/librpc/gen_ndr/rap.h b/librpc/gen_ndr/rap.h
index fa9b2c695d1..bf286c89a17 100644
--- a/librpc/gen_ndr/rap.h
+++ b/librpc/gen_ndr/rap.h
@@ -436,17 +436,17 @@ struct rap_PrintJobInfo0 {
 
 struct rap_PrintJobInfo1 {
 	uint16_t JobID;
-	uint8_t UserName[21];
+	const char *UserName;/* [charset(DOS)] */
 	uint8_t Pad;
-	uint8_t NotifyName[16];
-	uint8_t DataType[10];
+	const char *NotifyName;/* [charset(DOS)] */
+	const char *DataType;/* [charset(DOS)] */
 	const char *PrintParameterString;/* [charset(DOS),relative_short] */
 	uint16_t PrintParameterStringHigh;
 	uint16_t JobPosition;
 	enum rap_PrintJStatusCode JobStatus;
 	const char *JobStatusString;/* [charset(DOS),relative_short] */
 	uint16_t JobStatusStringHigh;
-	uint32_t TimeSubmitted;
+	time_t TimeSubmitted;
 	uint32_t JobSize;
 	const char *JobCommentString;/* [charset(DOS),relative_short] */
 	uint16_t JobCommentStringHigh;
@@ -459,7 +459,7 @@ struct rap_PrintJobInfo2 {
 	uint16_t UserNameHigh;
 	uint16_t JobPosition;
 	enum rap_PrintJStatusCode JobStatus;
-	uint32_t TimeSubmitted;
+	time_t TimeSubmitted;
 	uint32_t JobSize;
 	const char *JobCommentString;/* [charset(DOS),relative_short] */
 	uint16_t JobCommentStringHigh;
@@ -474,7 +474,7 @@ struct rap_PrintJobInfo3 {
 	uint16_t UserNameHigh;
 	uint16_t JobPosition;
 	enum rap_PrintJStatusCode JobStatus;
-	uint32_t TimeSubmitted;
+	time_t TimeSubmitted;
 	uint32_t JobSize;
 	const char *JobCommentString;/* [charset(DOS),relative_short] */
 	uint16_t JobCommentStringHigh;