dce/rpc

(This used to be commit 29434f496c18e816d864060d68f357aea6ef5de8)

3 files changed, 101 insertions, 5 deletions

diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c
index 27e156943c..d5c99b89c4 100644
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -137,6 +137,9 @@ pipes_struct *open_rpc_pipe_p(char *pipe_name,
 	p->frag_len_left   = 0;
 	p->next_frag_start = 0;
 	
+	p->ntlmssp_validated = False;
+	p->ntlmssp_auth      = False;
+	
 	fstrcpy(p->name, pipe_name);
 	
 	DEBUG(4,("Opened pipe %s with handle %x (pipes_open=%d)\n",
diff --git a/source3/rpc_server/srv_samr.c b/source3/rpc_server/srv_samr.c
index 11574be9b3..a3d758489c 100644
--- a/source3/rpc_server/srv_samr.c
+++ b/source3/rpc_server/srv_samr.c
@@ -719,6 +719,80 @@ static void api_samr_lookup_names( uint16 vuid, prs_struct *data, prs_struct *rd
 	samr_reply_lookup_names(&q_u, rdata);
 }
 
+/*******************************************************************
+ samr_reply_chgpasswd_user
+ ********************************************************************/
+static void samr_reply_chgpasswd_user(SAMR_Q_CHGPASSWD_USER *q_u,
+				prs_struct *rdata)
+{
+	SAMR_R_CHGPASSWD_USER r_u;
+	uint32 status = 0x0;
+	fstring user_name;
+	fstring wks;
+
+	fstrcpy(user_name, unistrn2(q_u->uni_user_name.buffer, q_u->uni_user_name.uni_str_len));
+	fstrcpy(wks      , unistrn2(q_u->uni_dest_host.buffer, q_u->uni_dest_host.uni_str_len));
+
+	DEBUG(5,("samr_chgpasswd_user: user: %s wks: %s\n", user_name, wks));
+
+	/* oops! */
+	status = 0xC0000000 | NT_STATUS_NO_SUCH_USER;
+
+	make_samr_r_chgpasswd_user(&r_u, status);
+
+	/* store the response in the SMB stream */
+	samr_io_r_chgpasswd_user("", &r_u, rdata, 0);
+
+	DEBUG(5,("samr_chgpasswd_user: %d\n", __LINE__));
+}
+
+/*******************************************************************
+ api_samr_chgpasswd_user
+ ********************************************************************/
+static void api_samr_chgpasswd_user( uint16 vuid, prs_struct *data, prs_struct *rdata)
+{
+	SAMR_Q_CHGPASSWD_USER q_u;
+
+	/* unknown 38 command */
+	samr_io_q_chgpasswd_user("", &q_u, data, 0);
+
+	/* construct reply. */
+	samr_reply_chgpasswd_user(&q_u, rdata);
+}
+
+
+/*******************************************************************
+ samr_reply_unknown_38
+ ********************************************************************/
+static void samr_reply_unknown_38(SAMR_Q_UNKNOWN_38 *q_u,
+				prs_struct *rdata)
+{
+	SAMR_R_UNKNOWN_38 r_u;
+
+	DEBUG(5,("samr_unknown_38: %d\n", __LINE__));
+
+	make_samr_r_unknown_38(&r_u);
+
+	/* store the response in the SMB stream */
+	samr_io_r_unknown_38("", &r_u, rdata, 0);
+
+	DEBUG(5,("samr_unknown_38: %d\n", __LINE__));
+}
+
+/*******************************************************************
+ api_samr_unknown_38
+ ********************************************************************/
+static void api_samr_unknown_38( uint16 vuid, prs_struct *data, prs_struct *rdata)
+{
+	SAMR_Q_UNKNOWN_38 q_u;
+
+	/* unknown 38 command */
+	samr_io_q_unknown_38("", &q_u, data, 0);
+
+	/* construct reply.  always indicate success */
+	samr_reply_unknown_38(&q_u, rdata);
+}
+
 
 /*******************************************************************
  samr_reply_unknown_12
@@ -1356,6 +1430,8 @@ static struct api_struct api_samr_cmds [] =
 	{ "SAMR_QUERY_ALIASINFO"  , SAMR_QUERY_ALIASINFO  , api_samr_query_aliasinfo  },
 	{ "SAMR_0x32"             , 0x32                  , api_samr_unknown_32       },
 	{ "SAMR_UNKNOWN_12"       , SAMR_UNKNOWN_12       , api_samr_unknown_12       },
+	{ "SAMR_UNKNOWN_38"       , SAMR_UNKNOWN_38       , api_samr_unknown_38       },
+	{ "SAMR_CHGPASSWD_USER"   , SAMR_CHGPASSWD_USER   , api_samr_chgpasswd_user   },
 	{ "SAMR_OPEN_ALIAS"       , SAMR_OPEN_ALIAS       , api_samr_open_alias       },
 	{ "SAMR_OPEN_DOMAIN"      , SAMR_OPEN_DOMAIN      , api_samr_open_domain      },
 	{ "SAMR_UNKNOWN_3"        , SAMR_UNKNOWN_3        , api_samr_unknown_3        },
diff --git a/source3/rpc_server/srv_util.c b/source3/rpc_server/srv_util.c
index 76f113374d..93640f3445 100644
--- a/source3/rpc_server/srv_util.c
+++ b/source3/rpc_server/srv_util.c
@@ -248,11 +248,12 @@ static BOOL api_pipe_ntlmssp_verify(pipes_struct *p)
 	dump_data(100, lm_owf, sizeof(lm_owf));
 	dump_data(100, nt_owf, sizeof(nt_owf));
 #endif
-	return True;
-#if 0
-	return pass_check_smb(p->user_name, p->domain,
-	                      p->ntplssp_chal.challenge, lm_owf, nt_owf);
-#endif
+	become_root(True);
+	p->ntlmssp_validated = pass_check_smb(p->user_name, p->domain,
+	                      p->ntlmssp_chal.challenge, lm_owf, nt_owf, NULL);
+	unbecome_root(True);
+
+	return p->ntlmssp_validated;
 }
 
 static BOOL api_pipe_ntlmssp(pipes_struct *p, prs_struct *pd)
@@ -486,10 +487,26 @@ static BOOL api_pipe_bind_req(pipes_struct *p, prs_struct *pd)
 	return True;
 }
 
+
+static BOOL api_pipe_auth_process(pipes_struct *p, prs_struct *pd)
+{
+	return True;
+}
+
 static BOOL api_pipe_request(pipes_struct *p, prs_struct *pd)
 {
 	int i = 0;
 
+	if (p->ntlmssp_auth && p->ntlmssp_validated)
+	{
+		if (!api_pipe_auth_process(p)) return False;
+
+		DEBUG(0,("api_pipe_request: **** MUST CALL become_user() HERE **** \n"));
+#if 0
+		become_user();
+#endif
+	}
+
 	for (i = 0; api_fd_commands[i].pipe_clnt_name; i++)
 	{
 		if (strequal(api_fd_commands[i].pipe_clnt_name, p->name) &&