svn commit: samba r9090 - in branches/SAMBA_4_0/source: libnet torture/libnet

[mimir at samba.org]

Author: mimir
Date: 2005-08-05 01:23:06 +0000 (Fri, 05 Aug 2005)
New Revision: 9090

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

Log:
Another field in usermod function - account flags.


rafal


Modified:
   branches/SAMBA_4_0/source/libnet/composite.h
   branches/SAMBA_4_0/source/libnet/userman.c
   branches/SAMBA_4_0/source/torture/libnet/userman.c


Changeset:
Modified: branches/SAMBA_4_0/source/libnet/composite.h
===================================================================
--- branches/SAMBA_4_0/source/libnet/composite.h	2005-08-05 01:04:45 UTC (rev 9089)
+++ branches/SAMBA_4_0/source/libnet/composite.h	2005-08-05 01:23:06 UTC (rev 9090)
@@ -87,6 +87,7 @@
 			struct timeval *acct_expiry;
 			struct timeval *allow_password_change;
 			struct timeval *force_password_change;
+			uint32_t acct_flags;
 		} change;
 	} in;
 };

Modified: branches/SAMBA_4_0/source/libnet/userman.c
===================================================================
--- branches/SAMBA_4_0/source/libnet/userman.c	2005-08-05 01:04:45 UTC (rev 9089)
+++ branches/SAMBA_4_0/source/libnet/userman.c	2005-08-05 01:23:06 UTC (rev 9090)
@@ -578,6 +578,12 @@
 			i->info17.acct_expiry = timeval_to_nttime(s->change.acct_expiry);
 
 			s->change.fields ^= USERMOD_FIELD_ACCT_EXPIRY;
+
+		} else if (s->change.fields & USERMOD_FIELD_ACCT_FLAGS) {
+			*level = 16;
+			i->info16.acct_flags = s->change.acct_flags;
+
+			s->change.fields ^= USERMOD_FIELD_ACCT_FLAGS;
 		}
 	}
 

Modified: branches/SAMBA_4_0/source/torture/libnet/userman.c
===================================================================
--- branches/SAMBA_4_0/source/torture/libnet/userman.c	2005-08-05 01:04:45 UTC (rev 9089)
+++ branches/SAMBA_4_0/source/torture/libnet/userman.c	2005-08-05 01:23:06 UTC (rev 9090)
@@ -422,15 +422,15 @@
 	struct timeval force  = { 33333, 55444 };
 
 	struct usermod_change changes[] = {
-		{ USERMOD_FIELD_ACCOUNT_NAME,   "changed", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL },
-		{ USERMOD_FIELD_FULL_NAME,      NULL, "Testing full account name", NULL, NULL, NULL, NULL, NULL, NULL, NULL },
-		{ USERMOD_FIELD_DESCRIPTION,    NULL, NULL, "Description of tested account", NULL, NULL, NULL, NULL, NULL, NULL },
-		{ USERMOD_FIELD_COMMENT,        NULL, NULL, NULL, "Comment for the tested account", NULL, NULL, NULL, NULL, NULL },
-		{ USERMOD_FIELD_LOGON_SCRIPT,   NULL, NULL, NULL, NULL, "test_logon.cmd", NULL, NULL, NULL, NULL },
-		{ USERMOD_FIELD_PROFILE_PATH,   NULL, NULL, NULL, NULL, NULL, "\\\\TESTSRV\\profiles\\test", NULL, NULL, NULL },
-		{ USERMOD_FIELD_ACCT_EXPIRY,    NULL, NULL, NULL, NULL, NULL, NULL, &expiry, NULL, NULL },
-		{ USERMOD_FIELD_ALLOW_PASS_CHG, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &allow, NULL },
-		{ USERMOD_FIELD_FORCE_PASS_CHG, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &force }
+		{ USERMOD_FIELD_ACCOUNT_NAME,   "changed", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0 },
+		{ USERMOD_FIELD_FULL_NAME,      NULL, "Testing full account name", NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0 },
+		{ USERMOD_FIELD_DESCRIPTION,    NULL, NULL, "Description of tested account", NULL, NULL, NULL, NULL, NULL, NULL, 0 },
+		{ USERMOD_FIELD_COMMENT,        NULL, NULL, NULL, "Comment for the tested account", NULL, NULL, NULL, NULL, NULL, 0 },
+		{ USERMOD_FIELD_LOGON_SCRIPT,   NULL, NULL, NULL, NULL, "test_logon.cmd", NULL, NULL, NULL, NULL, 0 },
+		{ USERMOD_FIELD_PROFILE_PATH,   NULL, NULL, NULL, NULL, NULL, "\\\\TESTSRV\\profiles\\test", NULL, NULL, NULL, 0 },
+		{ USERMOD_FIELD_ACCT_EXPIRY,    NULL, NULL, NULL, NULL, NULL, NULL, &expiry, NULL, NULL, 0 },
+		{ USERMOD_FIELD_ALLOW_PASS_CHG, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &allow, NULL, 0 },
+		{ USERMOD_FIELD_FORCE_PASS_CHG, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &force, ACB_NORMAL }
 	};
 	
 	mem_ctx = talloc_init("test_userdel");