svn commit: samba r3101 - in branches/SAMBA_4_0/source/lib/cmdline: .

[metze at samba.org]

Author: metze
Date: 2004-10-21 00:47:05 +0000 (Thu, 21 Oct 2004)
New Revision: 3101

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source/lib/cmdline&rev=3101&nolog=1

Log:
some minor fixes

metze

Modified:
   branches/SAMBA_4_0/source/lib/cmdline/popt_common.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/cmdline/popt_common.c
===================================================================
--- branches/SAMBA_4_0/source/lib/cmdline/popt_common.c	2004-10-21 00:26:43 UTC (rev 3100)
+++ branches/SAMBA_4_0/source/lib/cmdline/popt_common.c	2004-10-21 00:47:05 UTC (rev 3101)
@@ -257,15 +257,15 @@
 		while ((*val!='\0') && ((*val==' ') || (*val=='\t')))
 			val++;
 
-		if (strwicmp("password", param) == 0)
-		{
+		if (strwicmp("password", param) == 0) {
 			pstrcpy(info->password, val);
 			info->got_pass = True;
-		}
-		else if (strwicmp("username", param) == 0)
+		} else if (strwicmp("username", param) == 0) {
 			pstrcpy(info->username, val);
-		else if (strwicmp("domain", param) == 0)
+		} else if (strwicmp("domain", param) == 0) {
 			pstrcpy(info->domain,val);
+			info->got_domain = True;
+		}
 		memset(buf, 0, sizeof(buf));
 	}
 	x_fclose(auth);
@@ -398,12 +398,13 @@
 				 "%s$", lp_netbios_name());
 			pstrcpy(cmdline_auth_info.password,opt_password);
 			SAFE_FREE(opt_password);
+			cmdline_auth_info.got_pass = True;
 
-			pstrcpy(cmdline_auth_info.password, lp_workgroup());
-
+			pstrcpy(cmdline_auth_info.domain, lp_workgroup());
+			cmdline_auth_info.domain = True;
+			
 			/* machine accounts only work with kerberos */
 			cmdline_auth_info.use_kerberos = True;
-			cmdline_auth_info.got_pass = True;
 		}
 		break;
 	}