diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-03-07 04:20:10 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:49:20 -0500 |
| commit | 847102c6ca17f7b7d665863b8caa1d85baef46ad (patch) | |
| tree | 13515b11aa4db066bc013c9a5a484ae06eff54f3 /source4/auth/credentials/credentials.c | |
| parent | b0b31f52f7614a910dda5c227fa478d6dc5d8841 (diff) | |
| download | samba-847102c6ca17f7b7d665863b8caa1d85baef46ad.tar.gz samba-847102c6ca17f7b7d665863b8caa1d85baef46ad.tar.bz2 samba-847102c6ca17f7b7d665863b8caa1d85baef46ad.zip | |
r21736: Fix the smbclient test to do something more interesting with the last
few authentication tests. Now that the tests correctly 'fail', I was
able to fix the credentials subsystem to honour USER and PASSWD.
To get --machine-pass working, I needed ldb to always load it's static
modules, so I put this in ldb_connect().
Andrew Bartlett
(This used to be commit 3430d8c072407a1c33c32229095fc9db2142b6fa)
Diffstat (limited to 'source4/auth/credentials/credentials.c')
| -rw-r--r-- | source4/auth/credentials/credentials.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/auth/credentials/credentials.c b/source4/auth/credentials/credentials.c index 6f740d95c3..55ada8e5a5 100644 --- a/source4/auth/credentials/credentials.c +++ b/source4/auth/credentials/credentials.c @@ -648,8 +648,9 @@ void cli_credentials_guess(struct cli_credentials *cred) cli_credentials_parse_password_fd(cred, atoi(getenv("PASSWD_FD")), CRED_GUESS_FILE); } - if (getenv("PASSWD_FILE")) { - cli_credentials_parse_password_file(cred, getenv("PASSWD_FILE"), CRED_GUESS_FILE); + p = getenv("PASSWD_FILE"); + if (p && p[0]) { + cli_credentials_parse_password_file(cred, p, CRED_GUESS_FILE); } if (cli_credentials_get_kerberos_state(cred) != CRED_DONT_USE_KERBEROS) { |