Ethereal-dev: [Ethereal-dev] [packet-dcerpc-samr.c] W2K3 operations names

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

From: Jean-Baptiste Marchand <Jean-Baptiste.Marchand@xxxxxx>
Date: Sun, 28 Sep 2003 19:37:58 +0200
Hello,

attached patches add names for operations that have been added in the
W2K3 version of the SAMR MSRPC interface.

Jean-Baptiste Marchand
-- 
Jean-Baptiste.Marchand@xxxxxx
HSC - http://www.hsc.fr/
Index: packet-dcerpc-samr.c
===================================================================
RCS file: /cvsroot/ethereal/packet-dcerpc-samr.c,v
retrieving revision 1.101
diff -u -r1.101 packet-dcerpc-samr.c
--- packet-dcerpc-samr.c	23 Sep 2003 12:06:20 -0000	1.101
+++ packet-dcerpc-samr.c	28 Sep 2003 17:34:38 -0000
@@ -5005,7 +5005,7 @@
         { SAMR_QUERY_USERINFO, "SamrQueryInformationUser",
 		samr_dissect_query_information_user_rqst,
 		samr_dissect_query_information_user_reply },
-        { SAMR_SET_USERINFO2, "SamrSetInformationUser2",
+        { SAMR_SET_USERINFO, "SamrSetInformationUser",
 		samr_dissect_set_information_user2_rqst,
 		samr_dissect_set_information_user2_reply },
 	{ SAMR_CHANGE_PASSWORD_USER, "SamrChangePasswordUser",
@@ -5038,7 +5038,7 @@
         { SAMR_QUERY_INFORMATION_USER2, "SamrQueryInformationUser2",
 		samr_dissect_query_information_user2_rqst,
 		samr_dissect_query_information_user2_reply },
-        { SAMR_QUERY_DISPINFO2, "QueryDispinfo2",
+        { SAMR_QUERY_DISPINFO2, "SamrQueryDisplayInformation2",
 		samr_dissect_query_dispinfo_rqst,
 		samr_dissect_query_dispinfo_reply },
         { SAMR_GET_DISPLAY_ENUMERATION_INDEX2, "SamrGetDisplayEnumerationIndex2",
@@ -5068,7 +5068,7 @@
 	{ SAMR_CONNECT2, "SamrConnect2",
 		samr_dissect_connect2_rqst,
 		samr_dissect_connect2_reply },
-        { SAMR_SET_USERINFO, "SamrSetInformationUser",
+        { SAMR_SET_USERINFO2, "SamrSetInformationUser2",
 		samr_dissect_set_information_user2_rqst,
 		samr_dissect_set_information_user2_reply },
         { SAMR_SET_BOOT_KEY_INFORMATION, "SamrSetBootKeyInformation",
@@ -5083,6 +5083,12 @@
 	{ SAMR_CONNECT4, "SamrConnect4",
 		samr_dissect_connect4_rqst,
 		samr_dissect_connect2_reply },
+	{ SAMR_UNICODE_CHANGE_PASSWORD_USER3, "SamrUnicodeChangePasswordUser3",
+		NULL, NULL },
+	{ SAMR_CONNECT5, "SamrConnect5", NULL, NULL },
+	{ SAMR_RID_TO_SID, "SamrRidToSid", NULL, NULL },
+	{ SAMR_SET_DSRM_PASSWORD, "SamrSetDSRMPassword", NULL, NULL },
+	{ SAMR_VALIDATE_PASSWORD, "SamrValidatePassword", NULL, NULL },
         {0, NULL, NULL,  NULL }
 };
 
Index: packet-dcerpc-samr.h
===================================================================
RCS file: /cvsroot/ethereal/packet-dcerpc-samr.h,v
retrieving revision 1.11
diff -u -r1.11 packet-dcerpc-samr.h
--- packet-dcerpc-samr.h	23 Sep 2003 12:06:20 -0000	1.11
+++ packet-dcerpc-samr.h	28 Sep 2003 17:32:59 -0000
@@ -28,69 +28,74 @@
 
 /* Functions available on the SAMR pipe.  From Samba, include/rpc_samr.h */
 
-#define SAMR_CONNECT                0x00
-#define SAMR_CLOSE_HND              0x01
-#define SAMR_SET_SEC_OBJECT         0x02
-#define SAMR_QUERY_SEC_OBJECT       0x03
-#define SAMR_SHUTDOWN_SAM_SERVER    0x04
-#define SAMR_LOOKUP_DOMAIN          0x05
-#define SAMR_ENUM_DOMAINS           0x06
-#define SAMR_OPEN_DOMAIN            0x07
-#define SAMR_QUERY_DOMAIN_INFO      0x08
-#define SAMR_SET_DOMAIN_INFO        0x09
-#define SAMR_CREATE_DOM_GROUP       0x0a
-#define SAMR_ENUM_DOM_GROUPS   0x0b
-#define SAMR_CREATE_USER_IN_DOMAIN 0x0c
-#define SAMR_ENUM_DOM_USERS    0x0d
-#define SAMR_CREATE_DOM_ALIAS  0x0e
-#define SAMR_ENUM_DOM_ALIASES  0x0f
-#define SAMR_GET_ALIAS_MEMBERSHIP 0x10
-#define SAMR_LOOKUP_NAMES      0x11
-#define SAMR_LOOKUP_RIDS       0x12
-#define SAMR_OPEN_GROUP        0x13
-#define SAMR_QUERY_GROUPINFO   0x14
-#define SAMR_SET_GROUPINFO     0x15
-#define SAMR_ADD_GROUPMEM      0x16
-#define SAMR_DELETE_DOM_GROUP  0x17
-#define SAMR_DEL_GROUPMEM      0x18
-#define SAMR_QUERY_GROUPMEM    0x19
-#define SAMR_SET_MEMBER_ATTRIBUTES_OF_GROUP        0x1a
-#define SAMR_OPEN_ALIAS        0x1b
-#define SAMR_QUERY_ALIASINFO   0x1c
-#define SAMR_SET_ALIASINFO     0x1d
-#define SAMR_DELETE_DOM_ALIAS  0x1e
-#define SAMR_ADD_ALIASMEM      0x1f
-#define SAMR_DEL_ALIASMEM      0x20
-#define SAMR_GET_MEMBERS_IN_ALIAS   0x21
-#define SAMR_OPEN_USER         0x22
-#define SAMR_DELETE_DOM_USER   0x23
-#define SAMR_QUERY_USERINFO    0x24
-#define SAMR_SET_USERINFO2     0x25
-#define SAMR_CHANGE_PASSWORD_USER  0x26
-#define SAMR_GET_GROUPS_FOR_USER  0x27
-#define SAMR_QUERY_DISPINFO    0x28
-#define SAMR_GET_DISPLAY_ENUMERATION_INDEX        0x29
-#define SAMR_TEST_PRIVATE_FUNCTIONS_DOMAIN        0x2a
+#define SAMR_CONNECT                		0x00
+#define SAMR_CLOSE_HND              		0x01
+#define SAMR_SET_SEC_OBJECT         		0x02
+#define SAMR_QUERY_SEC_OBJECT       		0x03
+#define SAMR_SHUTDOWN_SAM_SERVER    		0x04
+#define SAMR_LOOKUP_DOMAIN          		0x05
+#define SAMR_ENUM_DOMAINS           		0x06
+#define SAMR_OPEN_DOMAIN            		0x07
+#define SAMR_QUERY_DOMAIN_INFO      		0x08
+#define SAMR_SET_DOMAIN_INFO        		0x09
+#define SAMR_CREATE_DOM_GROUP       		0x0a
+#define SAMR_ENUM_DOM_GROUPS   			0x0b
+#define SAMR_CREATE_USER_IN_DOMAIN 		0x0c
+#define SAMR_ENUM_DOM_USERS    			0x0d
+#define SAMR_CREATE_DOM_ALIAS  			0x0e
+#define SAMR_ENUM_DOM_ALIASES  			0x0f
+#define SAMR_GET_ALIAS_MEMBERSHIP 		0x10
+#define SAMR_LOOKUP_NAMES      			0x11
+#define SAMR_LOOKUP_RIDS       			0x12
+#define SAMR_OPEN_GROUP        			0x13
+#define SAMR_QUERY_GROUPINFO   			0x14
+#define SAMR_SET_GROUPINFO     			0x15
+#define SAMR_ADD_GROUPMEM      			0x16
+#define SAMR_DELETE_DOM_GROUP  			0x17
+#define SAMR_DEL_GROUPMEM      			0x18
+#define SAMR_QUERY_GROUPMEM    			0x19
+#define SAMR_SET_MEMBER_ATTRIBUTES_OF_GROUP	0x1a
+#define SAMR_OPEN_ALIAS        			0x1b
+#define SAMR_QUERY_ALIASINFO   			0x1c
+#define SAMR_SET_ALIASINFO     			0x1d
+#define SAMR_DELETE_DOM_ALIAS  			0x1e
+#define SAMR_ADD_ALIASMEM      			0x1f
+#define SAMR_DEL_ALIASMEM      			0x20
+#define SAMR_GET_MEMBERS_IN_ALIAS   		0x21
+#define SAMR_OPEN_USER         			0x22
+#define SAMR_DELETE_DOM_USER   			0x23
+#define SAMR_QUERY_USERINFO    			0x24
+#define SAMR_SET_USERINFO     			0x25
+#define SAMR_CHANGE_PASSWORD_USER  		0x26
+#define SAMR_GET_GROUPS_FOR_USER  		0x27
+#define SAMR_QUERY_DISPINFO    			0x28
+#define SAMR_GET_DISPLAY_ENUMERATION_INDEX     	0x29
+#define SAMR_TEST_PRIVATE_FUNCTIONS_DOMAIN     	0x2a
 #define SAMR_TEST_PRIVATE_FUNCTIONS_USER        0x2b
-#define SAMR_GET_USRDOM_PWINFO 0x2c
-#define SAMR_REMOVE_MEMBER_FROM_FOREIGN_DOMAIN     0x2d
-#define SAMR_QUERY_INFORMATION_DOMAIN2    0x2e
-#define SAMR_QUERY_INFORMATION_USER2        0x2f
-#define SAMR_QUERY_DISPINFO2   0x30
-#define SAMR_GET_DISPLAY_ENUMERATION_INDEX2        0x31
-#define SAMR_CREATE_USER2_IN_DOMAIN       0x32
-#define SAMR_QUERY_DISPINFO3   0x33
-#define SAMR_ADD_MULTIPLE_MEMBERS_TO_ALIAS 0x34
-#define SAMR_REMOVE_MULTIPLE_MEMBERS_FROM_ALIAS     0x35
-#define SAMR_OEM_CHANGE_PASSWORD_USER2        0x36
-#define SAMR_UNICODE_CHANGE_PASSWORD_USER2    0x37
-#define SAMR_GET_DOM_PWINFO    0x38
-#define SAMR_CONNECT2          0x39
-#define SAMR_SET_USERINFO      0x3A
-#define SAMR_SET_BOOT_KEY_INFORMATION	       0x3B
-#define SAMR_GET_BOOT_KEY_INFORMATION	       0x3C
-#define SAMR_CONNECT3          0x3D
-#define SAMR_CONNECT4          0x3E
+#define SAMR_GET_USRDOM_PWINFO 			0x2c
+#define SAMR_REMOVE_MEMBER_FROM_FOREIGN_DOMAIN 	0x2d
+#define SAMR_QUERY_INFORMATION_DOMAIN2    	0x2e
+#define SAMR_QUERY_INFORMATION_USER2        	0x2f
+#define SAMR_QUERY_DISPINFO2   			0x30
+#define SAMR_GET_DISPLAY_ENUMERATION_INDEX2 	0x31
+#define SAMR_CREATE_USER2_IN_DOMAIN       	0x32
+#define SAMR_QUERY_DISPINFO3   			0x33
+#define SAMR_ADD_MULTIPLE_MEMBERS_TO_ALIAS 	0x34
+#define SAMR_REMOVE_MULTIPLE_MEMBERS_FROM_ALIAS 0x35
+#define SAMR_OEM_CHANGE_PASSWORD_USER2 		0x36
+#define SAMR_UNICODE_CHANGE_PASSWORD_USER2	0x37
+#define SAMR_GET_DOM_PWINFO			0x38
+#define SAMR_CONNECT2          			0x39
+#define SAMR_SET_USERINFO2      		0x3a
+#define SAMR_SET_BOOT_KEY_INFORMATION 		0x3b
+#define SAMR_GET_BOOT_KEY_INFORMATION	       	0x3c
+#define SAMR_CONNECT3          			0x3d
+#define SAMR_CONNECT4          			0x3e
+#define SAMR_UNICODE_CHANGE_PASSWORD_USER3 	0x3f
+#define SAMR_CONNECT5				0x40	
+#define SAMR_RID_TO_SID				0x41
+#define SAMR_SET_DSRM_PASSWORD			0x42
+#define SAMR_VALIDATE_PASSWORD			0x43
 
 /* Specific access rights */