added samuserset2 rpcclient command to test ACB_XXX bit-setting on

samr opcode 0x25.  _yet_ another failed attempt to get nt5rc2 to join
a samba domain.  what _is_ it with this stuff, dammit?
(This used to be commit c3913f8ae272c496fc4519141accf01ee9f1e49e)

1 files changed, 33 insertions, 2 deletions

diff --git a/source3/include/rpc_samr.h b/source3/include/rpc_samr.h
index 850e3a8b94..2c9a719ff5 100644
--- a/source3/include/rpc_samr.h
+++ b/source3/include/rpc_samr.h
@@ -114,11 +114,12 @@ SamrTestPrivateFunctionsUser
 #define SAMR_QUERY_ALIASMEM    0x21
 
 #define SAMR_OPEN_USER         0x22
+#define SAMR_QUERY_USERINFO    0x24
+#define SAMR_SET_USERINFO2     0x25
+#define SAMR_QUERY_USERGROUPS  0x27
 #define SAMR_CREATE_USER       0x32
 #define SAMR_SET_USERINFO      0x3A
 
-#define SAMR_QUERY_USERINFO    0x24
-#define SAMR_QUERY_USERGROUPS  0x27
 #define SAMR_QUERY_DISPINFO    0x28
 
 #define SAMR_GET_USRDOM_PWINFO 0x2c
@@ -141,6 +142,13 @@ typedef struct logon_hours_info
 
 } LOGON_HRS;
 
+/* SAM_USER_INFO_16 */
+typedef struct sam_user_info_16
+{
+	uint16 acb_info; /* account info (ACB_xxxx bit-mask) */
+
+} SAM_USER_INFO_16;
+
 /* SAM_USER_INFO_23 */
 typedef struct sam_user_info_23
 {
@@ -1152,6 +1160,29 @@ typedef struct r_samr_query_usergroup_info
 } SAMR_R_QUERY_USERGROUPS;
 
 
+/* SAMR_Q_SET_USERINFO2 - set sam info */
+typedef struct q_samr_set_user_info2
+{
+	POLICY_HND pol;          /* policy handle associated with user */
+	uint16 switch_value;      /* 0x0010 */
+	uint16 switch_value2;      /* 0x0010 */
+
+	union
+	{
+		SAM_USER_INFO_16 *id16; /* auth-level 0x10 */
+		void* id; /* to make typecasting easy */
+
+	} info;
+
+} SAMR_Q_SET_USERINFO2;
+
+/* SAMR_R_SET_USERINFO2 - set sam info */
+typedef struct r_samr_set_user_info2
+{
+	uint32 status;         /* return status */
+
+} SAMR_R_SET_USERINFO2;
+
 /* SAMR_Q_SET_USERINFO - set sam info */
 typedef struct q_samr_set_user_info
 {