fixing joining to domain plus something weird going down with nt logins...

(This used to be commit cef258f1c931ecb7c2dda9d5c9977153e4c1dc73)

4 files changed, 9 insertions, 19 deletions

diff --git a/source3/rpc_client/cli_login.c b/source3/rpc_client/cli_login.c
index 832731d92d..a9244c886e 100644
--- a/source3/rpc_client/cli_login.c
+++ b/source3/rpc_client/cli_login.c
@@ -89,7 +89,7 @@ uint32 cli_nt_setup_creds( char* servers, const char* myhostname,
 	 * Receive an auth-2 challenge response and check it.
 	 */
 
-	ret = cli_net_auth2(srv_name, trust_acct, 
+	ret = cli_net_auth2(srv_name, trust_acct, myhostname,
 	                    sec_chan, 0x000001ff, &srv_chal);
 	if (ret != 0x0)
 	{
diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c
index 1231c706d0..fd6242c996 100644
--- a/source3/rpc_client/cli_netlogon.c
+++ b/source3/rpc_client/cli_netlogon.c
@@ -114,6 +114,7 @@ encrypt of the server challenge originally received. JRA.
 
 uint32 cli_net_auth2(const char *srv_name,
 				const char *trust_acct, 
+				const char *acct_name, 
 				uint16 sec_chan, 
 				uint32 neg_flags, DOM_CHAL *srv_chal)
 {
@@ -142,13 +143,13 @@ uint32 cli_net_auth2(const char *srv_name,
 	/* create and send a MSRPC command with api NET_AUTH2 */
 
 	DEBUG(4,("cli_net_auth2: srv:%s acct:%s sc:%x mc: %s neg: %x\n",
-	          srv_name, trust_acct, sec_chan, srv_name,
+	          srv_name, trust_acct, sec_chan, acct_name,
 	          neg_flags));
 
 	cli_con_get_cli_cred(con, &clnt_cred);
 
 	/* store the parameters */
-	make_q_auth_2(&q_a, srv_name, trust_acct, sec_chan, srv_name,
+	make_q_auth_2(&q_a, srv_name, trust_acct, sec_chan, acct_name,
 	              &clnt_cred.challenge, neg_flags);
 
 	/* turn parameters into data stream */
diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index 0c3da6801a..a0cb48969d 100644
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -1636,7 +1636,7 @@ BOOL samr_query_lookup_domain(  POLICY_HND *pol, const char *dom_name,
 do a SAMR Query Lookup Names
 ****************************************************************************/
 BOOL samr_query_lookup_names(  POLICY_HND *pol, uint32 flags,
-				uint32 num_names, const char **names,
+				uint32 num_names, char **names,
 				uint32 *num_rids,
 				uint32 rid[MAX_LOOKUP_SIDS],
 				uint32 type[MAX_LOOKUP_SIDS])
diff --git a/source3/rpc_client/msrpc_samr.c b/source3/rpc_client/msrpc_samr.c
index f6148571aa..49f34fe386 100644
--- a/source3/rpc_client/msrpc_samr.c
+++ b/source3/rpc_client/msrpc_samr.c
@@ -997,15 +997,13 @@ do a SAMR create domain user
 ****************************************************************************/
 BOOL create_samr_domain_user( POLICY_HND *pol_dom,
 				const char *acct_name, uint16 acb_info,
-				const char* password,
+				const char* password, int plen,
 				uint32 *rid)
 {
 	POLICY_HND pol_open_user;
 	BOOL ret = True;
 	BOOL res1 = True;
 	char pwbuf[516];
-	char randompw[24];
-	int plen = 0;
 	SAM_USER_INFO_24 *p24;
 	SAM_USER_INFO_16 *p16;
 	SAM_USER_INFO_16 usr16;
@@ -1052,16 +1050,6 @@ BOOL create_samr_domain_user( POLICY_HND *pol_dom,
 		return True;
 	}
 
-	if (password == NULL)
-	{
-		generate_random_buffer(randompw, sizeof(randompw), True);
-		password = randompw;
-		plen = sizeof(randompw);
-	}
-	else
-	{
-		plen = strlen(password);
-	}
 	encode_pw_buffer(pwbuf, password, plen, False);
 
 	p24 = (SAM_USER_INFO_24*)malloc(sizeof(SAM_USER_INFO_24));
@@ -1525,7 +1513,7 @@ SAM create domain user.
 ****************************************************************************/
 BOOL msrpc_sam_create_dom_user(const char* srv_name, DOM_SID *sid1,
 				const char *acct_name, uint16 acb_info,
-				const char *password,
+				const char *password, int plen,
 				uint32 *rid)
 {
 	BOOL res = True;
@@ -1535,6 +1523,7 @@ BOOL msrpc_sam_create_dom_user(const char* srv_name, DOM_SID *sid1,
 	uint32 user_rid; 
 	POLICY_HND sam_pol;
 	POLICY_HND pol_dom;
+	char *pwd = NULL;
 
 	/* establish a connection. */
 	res = res ? samr_connect( 
@@ -1550,7 +1539,7 @@ BOOL msrpc_sam_create_dom_user(const char* srv_name, DOM_SID *sid1,
 	res2 = res1 ? create_samr_domain_user( 
 				&pol_dom,
 	                        acct_name, 
-				acb_info, password, &user_rid) : False;
+				acb_info, password, plen, &user_rid) : False;
 
 	res1 = res1 ? samr_close( &pol_dom) : False;
 	res  = res  ? samr_close( &sam_pol) : False;