This patch does a number of things, mostly smaller than they look :-)

In particuar, it moves the domain_client_validate stuff out of
auth_domain.c to somwhere where they (I hope) they can be shared
with winbind better.  (This may need some work)

The main purpose of this patch was however to improve some of the
internal documentation and to correctly place become_root()/unbecome_root()
calls within the code.

Finally this patch moves some more of auth.c into other files, auth_unix.c
in this case.

Andrew Bartlett
(This used to be commit ea1c547ac880def29f150de2172c95213509350e)

1 files changed, 8 insertions, 10 deletions

diff --git a/source3/rpc_client/cli_login.c b/source3/rpc_client/cli_login.c
index a0999364760..7e2090164c4 100644
--- a/source3/rpc_client/cli_login.c
+++ b/source3/rpc_client/cli_login.c
@@ -155,22 +155,20 @@ NT login - network.
 password equivalents over the network. JRA.
 ****************************************************************************/
 
-BOOL cli_nt_login_network(struct cli_state *cli, const char *domain, const char *username, 
-                          uint32 smb_userid_low, const uchar lm_chal[8], 
-			  const uchar *lm_chal_resp, int lm_chal_resp_len, 
-			  const uchar *nt_chal_resp, int nt_chal_resp_len,
-                          NET_ID_INFO_CTR *ctr, NET_USER_INFO_3 *user_info3)
+BOOL cli_nt_login_network(struct cli_state *cli, const auth_usersupplied_info *user_info, 
+                          uint32 smb_userid_low, NET_ID_INFO_CTR *ctr, 
+			  NET_USER_INFO_3 *user_info3)
 {
   DEBUG(5,("cli_nt_login_network: %d\n", __LINE__));
   /* indicate a "network" login */
   ctr->switch_value = NET_LOGON_TYPE;
 
   /* Create the structure needed for SAM logon. */
-  init_id_info2(&ctr->auth.id2, domain, 0, smb_userid_low, 0,
-                username, cli->clnt_name_slash,
-		lm_chal, 
-		lm_chal_resp, lm_chal_resp_len,
-		nt_chal_resp, nt_chal_resp_len);
+  init_id_info2(&ctr->auth.id2, user_info->domain.str, 0, smb_userid_low, 0,
+                user_info->smb_username.str, cli->clnt_name_slash,
+		user_info->chal, 
+		user_info->lm_resp.buffer, user_info->lm_resp.len,
+		user_info->nt_resp.buffer, user_info->nt_resp.len);
 
   /* Send client sam-logon request - update credentials on success. */
   return cli_net_sam_logon(cli, ctr, user_info3);