Adding the same changes to HEAD as were added to BRANCH_1_9_18.

Changed smbpasswd to be client-server for a normal user, rather
than accessing the private/smbpasswd file directly (it still accesses
this file directly when run as root, so root can add users/change a
users password without knowing the old password).

A shakeout of this change is that smbpasswd can now be used to
change a users password on a remote NT machine (yep - you heard
that one right - we can now change a NT password from UNIX !!!!!).

Jeremy.
(This used to be commit 20770b6f1c25288e90d3e0d215afa7f0809ce124)

2 files changed, 0 insertions, 50 deletions

diff --git a/source3/client/client.c b/source3/client/client.c
index 679114fa2b..3ce635fbeb 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -3845,31 +3845,6 @@ static void usage(char *pname)
       return(ret);
     }
 
-#ifdef NTDOMAIN
-
-	if (nt_domain_logon)
-	{
-		int ret = 0;
-		sprintf(service,"\\\\%s\\IPC$",query_host);
-		strupper(service);
-		connect_as_ipc = True;
-
-		DEBUG(5,("NT Domain Logon.  Service: %s\n", service));
-
-		if (cli_open_sockets(port))
-		{
-			if (!cli_send_login(NULL,NULL,True,True,NULL)) return(1);
-
-			do_nt_login(desthost, myhostname, Client, cnum);
-
-			cli_send_logout();
-			close_sockets();
-		}
-
-		return(ret);
-	}
-#endif 
-
   if (cli_open_sockets(port))
     {
       if (!process(base_directory))
diff --git a/source3/client/smbmount.c b/source3/client/smbmount.c
index fdafaec9fa..bab7430859 100644
--- a/source3/client/smbmount.c
+++ b/source3/client/smbmount.c
@@ -883,31 +883,6 @@ static void usage(char *pname)
   get_myname((*myname)?NULL:myname,NULL);  
   strupper(myname);
 
-#ifdef NTDOMAIN
-
-	if (nt_domain_logon)
-	{
-		int ret = 0;
-		sprintf(service,"\\\\%s\\IPC$",query_host);
-		strupper(service);
-		connect_as_ipc = True;
-
-		DEBUG(5,("NT Domain Logon.  Service: %s\n", service));
-
-		if (cli_open_sockets(port))
-		{
-			if (!cli_send_login(NULL,NULL,True,True,NULL)) return(1);
-
-			do_nt_login(desthost, myhostname, Client, cnum);
-
-			cli_send_logout();
-			close_sockets();
-		}
-
-		return(ret);
-	}
-#endif 
-
   if (cli_open_sockets(port))
     {
       if (!process(base_directory))