summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-10-21 00:47:05 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:02:21 -0500
commita1063840e7b316eba02fe6112fc09ad84fc96be5 (patch)
tree82a41e53527bf58a334709b757feec12916fb66b /source4
parent95ddbe5ad29df57b3d5ad5b9f5be95f6e194d0e0 (diff)
downloadsamba-a1063840e7b316eba02fe6112fc09ad84fc96be5.tar.gz
samba-a1063840e7b316eba02fe6112fc09ad84fc96be5.tar.bz2
samba-a1063840e7b316eba02fe6112fc09ad84fc96be5.zip
r3101: some minor fixes
metze (This used to be commit 61de2229e27c55041cb4e1aac32bc1d8ed68a05c)
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/cmdline/popt_common.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/source4/lib/cmdline/popt_common.c b/source4/lib/cmdline/popt_common.c
index 0cf57bb2e0..266c99ae9e 100644
--- a/source4/lib/cmdline/popt_common.c
+++ b/source4/lib/cmdline/popt_common.c
@@ -257,15 +257,15 @@ static void get_credentials_file(const char *file, struct cmdline_auth_info *inf
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 @@ static void popt_common_credentials_callback(poptContext con,
"%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;
}