svn commit: samba r24944 - in branches/SAMBA_4_0_RELEASE/source: rpc_server/samr torture/rpc

[abartlet at samba.org]

Author: abartlet
Date: 2007-09-04 05:57:54 +0000 (Tue, 04 Sep 2007)
New Revision: 24944

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24944

Log:
Merge acct_expiry fix to release branch.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0_RELEASE/source/rpc_server/samr/dcesrv_samr.c
   branches/SAMBA_4_0_RELEASE/source/torture/rpc/samr.c


Changeset:
Modified: branches/SAMBA_4_0_RELEASE/source/rpc_server/samr/dcesrv_samr.c
===================================================================
--- branches/SAMBA_4_0_RELEASE/source/rpc_server/samr/dcesrv_samr.c	2007-09-04 05:39:06 UTC (rev 24943)
+++ branches/SAMBA_4_0_RELEASE/source/rpc_server/samr/dcesrv_samr.c	2007-09-04 05:57:54 UTC (rev 24944)
@@ -3363,7 +3363,9 @@
 		break;
 
 	case 21:
-#define IFSET(bit) if (bit & r->in.info->info21.fields_present)
+#define IFSET(bit) if (bit & r->in.info->info21.fields_present)	
+		IFSET(SAMR_FIELD_ACCT_EXPIRY)
+			SET_UINT64(msg, info21.acct_expiry,    "accountExpires");	
 		IFSET(SAMR_FIELD_ACCOUNT_NAME)         
 			SET_STRING(msg, info21.account_name,   "samAccountName");
 		IFSET(SAMR_FIELD_FULL_NAME) 
@@ -3391,15 +3393,14 @@
 		IFSET(SAMR_FIELD_COUNTRY_CODE)
 			SET_UINT  (msg, info21.country_code,   "countryCode");
 		IFSET(SAMR_FIELD_CODE_PAGE)
-			SET_UINT  (msg, info21.code_page,      "codePage");
-
-
-		/* Any reason the rest of these can't be set? */
+			SET_UINT  (msg, info21.code_page,      "codePage");	
 #undef IFSET
 		break;
 
 	case 23:
 #define IFSET(bit) if (bit & r->in.info->info23.info.fields_present)
+		IFSET(SAMR_FIELD_ACCT_EXPIRY)
+			SET_UINT64(msg, info23.info.acct_expiry,  "accountExpires");	
 		IFSET(SAMR_FIELD_ACCOUNT_NAME)         
 			SET_STRING(msg, info23.info.account_name, "samAccountName");
 		IFSET(SAMR_FIELD_FULL_NAME)         
@@ -3454,6 +3455,8 @@
 
 	case 25:
 #define IFSET(bit) if (bit & r->in.info->info25.info.fields_present)
+		IFSET(SAMR_FIELD_ACCT_EXPIRY)
+			SET_UINT64(msg, info25.info.acct_expiry,  "accountExpires");	
 		IFSET(SAMR_FIELD_ACCOUNT_NAME)         
 			SET_STRING(msg, info25.info.account_name, "samAccountName");
 		IFSET(SAMR_FIELD_FULL_NAME)         

Modified: branches/SAMBA_4_0_RELEASE/source/torture/rpc/samr.c
===================================================================
--- branches/SAMBA_4_0_RELEASE/source/torture/rpc/samr.c	2007-09-04 05:39:06 UTC (rev 24943)
+++ branches/SAMBA_4_0_RELEASE/source/torture/rpc/samr.c	2007-09-04 05:57:54 UTC (rev 24944)
@@ -386,6 +386,11 @@
 	TEST_USERINFO_INT(21, code_page, 21, code_page, __LINE__, 
 			  SAMR_FIELD_CODE_PAGE);
 
+	TEST_USERINFO_INT(17, acct_expiry, 21, acct_expiry, __LINE__, 0);
+	TEST_USERINFO_INT(17, acct_expiry, 5, acct_expiry, __LINE__, 0);
+	TEST_USERINFO_INT(21, acct_expiry, 21, acct_expiry, __LINE__, 
+			  SAMR_FIELD_ACCT_EXPIRY);
+
 	TEST_USERINFO_INT(4, logon_hours.bits[3],  3, logon_hours.bits[3], 1, 0);
 	TEST_USERINFO_INT(4, logon_hours.bits[3],  5, logon_hours.bits[3], 2, 0);
 	TEST_USERINFO_INT(4, logon_hours.bits[3], 21, logon_hours.bits[3], 3, 0);