svn commit: samba r12353 - in trunk/source/utils: .

jra at samba.org jra at samba.org
Mon Dec 19 04:28:58 GMT 2005


Author: jra
Date: 2005-12-19 04:28:58 +0000 (Mon, 19 Dec 2005)
New Revision: 12353

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12353

Log:
Make lookup use older pre-popt variables.
Jeremy.

Modified:
   trunk/source/utils/netlookup.c


Changeset:
Modified: trunk/source/utils/netlookup.c
===================================================================
--- trunk/source/utils/netlookup.c	2005-12-19 04:27:46 UTC (rev 12352)
+++ trunk/source/utils/netlookup.c	2005-12-19 04:28:58 UTC (rev 12353)
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "utils/net.h"
 
 struct con_struct {
 	BOOL failed_connect;
@@ -61,21 +62,22 @@
 	talloc_set_destructor(cs, cs_destructor);
 
 	/* Connect to localhost with given username/password. */
-	if (!cmdline_auth_info.got_pass) {
+	if (!opt_password && !opt_machine_pass) {
 		char *pass = getpass("Password:");
 		if (pass) {
-			pstrcpy(cmdline_auth_info.password, pass);
+			opt_password = SMB_STRDUP(pass);
 		}
 	}
 
 	nt_status = cli_full_connection(&cs->cli, global_myname(), global_myname(),
 					&loopback_ip, 0,
 					"IPC$", "IPC",
-					cmdline_auth_info.username,
-					lp_workgroup(),
-					cmdline_auth_info.password,
-					cmdline_auth_info.use_kerberos ? CLI_FULL_CONNECTION_USE_KERBEROS : 0,
-					cmdline_auth_info.signing_state,NULL);
+					opt_user_name,
+					opt_workgroup,
+					opt_password,
+					0,
+					Undefined,
+					NULL);
 
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		DEBUG(2,("create_cs: Connect failed. Error was %s\n", nt_errstr(nt_status)));



More information about the samba-cvs mailing list