Makefile :

	adding bits for new nt domain code

byteorder.h :

	trying to get macros right, and not to crash on SUNOS5...

client.c :

	added #ifdef NTDOMAIN, and created do_nt_login() function.  don't
	want to have to recompile client.c unless absolutely necessary.

credentials.c :

	moved deal_with_creds() [possibly inappropriately] into credentials.c

ipc.c reply.c server.c uid.c :

	attempting to make (un)become_root() functions calleable from smbclient.
	this is a little tricky: smbclient might have to be another setuid
	root program, immediately setuid'ing to non-root, so that we can
	reset-uid to root to get at the smbpasswd file.  or, have a secure
	pipe mechanism to smbd to grab smbpasswd entries.  or the like.

smbdes.c smbencrypt.c :

	created a function to generate lm and nt owf hashes.

lsaparse.c ntclient.c smbparse.c :

	added nt client LSA_AUTH2 code.  it works, too!

pipenetlog.c pipentlsa.c pipesrvsvc.c :

	simplification.  code-shuffling.  getting that damn offset right
	for the opcode in RPC_HDR.

smb.h :

	changed dcinfo xxx_creds to DOM_CRED structures instead of DOM_CHAL.
	we might need to store the server times as well.

proto.h :

	the usual.
(This used to be commit 82436a3d99d4bdce249ce9ff27fd2ca4b2447e07)

1 files changed, 5 insertions, 11 deletions

diff --git a/source3/client/client.c b/source3/client/client.c
index 5dbb2f3b1c..68cd930cf9 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -3886,6 +3886,8 @@ static void usage(char *pname)
       return(ret);
     }
 
+#ifdef NTDOMAIN
+
 	if (nt_domain_logon)
 	{
 		int ret = 0;
@@ -3897,25 +3899,17 @@ static void usage(char *pname)
 
 		if (cli_open_sockets(port))
 		{
-			DOM_CHAL srv_chal;
-
 			if (!cli_send_login(NULL,NULL,True,True)) return(1);
 
-			if (!cli_lsa_req_chal(&srv_chal, desthost, myhostname, Client, cnum))
-			{
-				return (1);
-			}
-#if 0
-			cli_lsa_auth2();
-			cli_lsa_sam_logon();
-			cli_lsa_sam_logoff();
-#endif
+			do_nt_login(desthost, myhostname, Client, cnum);
+
 			cli_send_logout();
 			close_sockets();
 		}
 
 		return(ret);
 	}
+#endif 
 
   if (cli_open_sockets(port))
     {