added SamrQueryDomainInfo call info level 0x3 for kix32.exe support
authorLuke Leighton <lkcl@samba.org>
Mon, 29 Mar 1999 17:24:46 +0000 (17:24 +0000)
committerLuke Leighton <lkcl@samba.org>
Mon, 29 Mar 1999 17:24:46 +0000 (17:24 +0000)
(This used to be commit ac070dfd39bfa9b60680855585155ce528ab7691)

source3/include/proto.h
source3/include/rpc_samr.h
source3/rpc_parse/parse_samr.c
source3/rpc_server/srv_samr.c

index 94d76b9e9f4bbe8d97705f0212223eae170e879a..ff992fe0864f33ae8e4031e561812b6c870af36e 100644 (file)
@@ -2260,6 +2260,8 @@ void samr_io_q_unknown_3(char *desc,  SAMR_Q_UNKNOWN_3 *q_u, prs_struct *ps, int
 void make_samr_q_query_dom_info(SAMR_Q_QUERY_DOMAIN_INFO *q_u,
                                POLICY_HND *domain_pol, uint16 switch_value);
 void samr_io_q_query_dom_info(char *desc,  SAMR_Q_QUERY_DOMAIN_INFO *q_u, prs_struct *ps, int depth);
+void make_unk_info3(SAM_UNK_INFO_3 *u_3);
+void sam_io_unk_info3(char *desc, SAM_UNK_INFO_3 *u_3, prs_struct *ps, int depth);
 void make_unk_info6(SAM_UNK_INFO_6 *u_6);
 void sam_io_unk_info6(char *desc, SAM_UNK_INFO_6 *u_6, prs_struct *ps, int depth);
 void make_unk_info7(SAM_UNK_INFO_7 *u_7);
index 9a62bd4b97efcd6de6736412bcb16b85ea282199..5a6089f0a1fa9699ae801aa51c9f53c8dfabbb9f 100644 (file)
@@ -447,6 +447,13 @@ typedef struct q_samr_query_domain_info
 
 } SAMR_Q_QUERY_DOMAIN_INFO;
 
+typedef struct sam_unknown_info_3_info
+{
+       uint32 unknown_0; /* 0x0000 0000 */
+       uint32 unknown_1; /* 0x8000 0000 */
+
+} SAM_UNK_INFO_3;
+
 typedef struct sam_unknown_info_6_info
 {
        uint32 unknown_0; /* 0x0000 0000 */
@@ -498,7 +505,6 @@ typedef struct sam_unknown_info_1_inf
        uint8 padding[12]; /* 12 bytes zeros */
        uint32 unknown_1; /* 0x8000 0000 */
        uint32 unknown_2; /* 0x0000 0000 */
-       uint32 unknown_3; /* 0x0000 0000 */
 
 } SAM_UNK_INFO_1;
 
@@ -509,6 +515,7 @@ typedef struct sam_unknown_ctr_info
        {
                SAM_UNK_INFO_1 inf1;
                SAM_UNK_INFO_2 inf2;
+               SAM_UNK_INFO_3 inf3;
                SAM_UNK_INFO_6 inf6;
                SAM_UNK_INFO_7 inf7;
 
index 09c881a812f7e11630994a350b477ab3bf17ca26..6b75136f943a987c66776ec9ab9ccdb589005704 100644 (file)
@@ -319,6 +319,34 @@ void samr_io_q_query_dom_info(char *desc,  SAMR_Q_QUERY_DOMAIN_INFO *q_u, prs_st
 }
 
 
+/*******************************************************************
+makes a structure.
+********************************************************************/
+void make_unk_info3(SAM_UNK_INFO_3 *u_3)
+{
+       if (u_3 == NULL) return;
+
+       u_3->unknown_0 = 0x00000000;
+       u_3->unknown_1 = 0x80000000;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+void sam_io_unk_info3(char *desc, SAM_UNK_INFO_3 *u_3, prs_struct *ps, int depth)
+{
+       if (u_3 == NULL) return;
+
+       prs_debug(ps, depth, desc, "sam_io_unk_info3");
+       depth++;
+
+       prs_uint32("unknown_0", ps, depth, &u_3->unknown_0); /* 0x0000 0000 */
+       prs_uint32("unknown_1", ps, depth, &u_3->unknown_1); /* 0x8000 0000 */
+
+       prs_align(ps);
+
+}
+
 /*******************************************************************
 makes a structure.
 ********************************************************************/
@@ -459,7 +487,6 @@ void make_unk_info1(SAM_UNK_INFO_1 *u_1)
        memset(u_1->padding, 0, sizeof(u_1->padding)); /* 12 bytes zeros */
        u_1->unknown_1 = 0x80000000;
        u_1->unknown_2 = 0x00000000;
-       u_1->unknown_3 = 0x00000000;
 }
 
 /*******************************************************************
@@ -476,7 +503,6 @@ void sam_io_unk_info1(char *desc, SAM_UNK_INFO_1 *u_1, prs_struct *ps, int depth
 
        prs_uint32("unknown_1", ps, depth, &u_1->unknown_1); /* 0x8000 0000 */
        prs_uint32("unknown_2", ps, depth, &u_1->unknown_2); /* 0x0000 0000 */
-       prs_uint32("unknown_3", ps, depth, &u_1->unknown_3); /* 0x0000 0000 */
 
        prs_align(ps);
 }
@@ -524,14 +550,19 @@ void samr_io_r_query_dom_info(char *desc, SAMR_R_QUERY_DOMAIN_INFO *r_u, prs_str
        {
                switch (r_u->switch_value)
                {
+                       case 0x07:
+                       {
+                               sam_io_unk_info7("unk_inf7", &r_u->ctr->info.inf7, ps, depth);
+                               break;
+                       }
                        case 0x06:
                        {
                                sam_io_unk_info6("unk_inf6", &r_u->ctr->info.inf6, ps, depth);
                                break;
                        }
-                       case 0x07:
+                       case 0x03:
                        {
-                               sam_io_unk_info7("unk_inf7", &r_u->ctr->info.inf7, ps, depth);
+                               sam_io_unk_info3("unk_inf3", &r_u->ctr->info.inf3, ps, depth);
                                break;
                        }
                        case 0x02:
@@ -552,6 +583,8 @@ void samr_io_r_query_dom_info(char *desc, SAMR_R_QUERY_DOMAIN_INFO *r_u, prs_str
                        }
                }
        }
+
+       prs_uint32("status      ", ps, depth, &(r_u->status));
 }
 
 
index 63aa0dc91452bb3ed7808a54f06795e01b147122..4b1c5a4ea19e7cd98e7cc268e68a4c6b8d138c85 100644 (file)
@@ -1997,9 +1997,7 @@ static BOOL set_user_info_23(SAM_USER_INFO_23 *id23, uint32 rid)
 
        pwdb_init_sam(&new_pwd);
        copy_sam_passwd(&new_pwd, pwd);
-#if 0
        copy_id23_to_sam_passwd(&new_pwd, id23);
-#endif
 
        if (!decode_pw_buffer(id23->pass, new_pw, sizeof(new_pw), True))
        {
@@ -2453,6 +2451,13 @@ static void samr_reply_query_dom_info(SAMR_Q_QUERY_DOMAIN_INFO *q_u,
        {
                switch (q_u->switch_value)
                {
+                       case 0x07:
+                       {
+                               switch_value = 0x7;
+                               make_unk_info7(&ctr.info.inf7);
+
+                               break;
+                       }
                        case 0x06:
                        {
                                switch_value = 0x6;
@@ -2460,10 +2465,10 @@ static void samr_reply_query_dom_info(SAMR_Q_QUERY_DOMAIN_INFO *q_u,
 
                                break;
                        }
-                       case 0x07:
+                       case 0x03:
                        {
-                               switch_value = 0x7;
-                               make_unk_info7(&ctr.info.inf7);
+                               switch_value = 0x3;
+                               make_unk_info3(&ctr.info.inf3);
 
                                break;
                        }