diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-03-24 03:32:25 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:11:15 -0500 |
| commit | 038c4c4c6a4f6039e0436134de1d9c1e14c444d8 (patch) | |
| tree | 0a1144858e9c920a0a13357dc8ccaf77935bebfb /source4/lib/cmdline | |
| parent | d600b78c33cd4950073d2848f1a9a0f17f17d20e (diff) | |
| download | samba-038c4c4c6a4f6039e0436134de1d9c1e14c444d8.tar.gz samba-038c4c4c6a4f6039e0436134de1d9c1e14c444d8.tar.bz2 samba-038c4c4c6a4f6039e0436134de1d9c1e14c444d8.zip | |
r6024: Some of the ordering constraints on the popt callbacks were getting
painful, so don't call lp_*() functions until the post stage (rather
than in the cli_credentails_init(), which is called in the pre stage),
and don't open the secrets.ldb looking for the machine account details
until we actually need them (well after popt is done, and we know we have the other things right).
Set the domain and realm, as well as the account and password for -P
(fetch machine password) operation.
Allow NETLOGON credentials to be stored in this structure - will allow
SCHANNEL to be made more generic.
Clarify why we don't do special checks for NULL pointers, particularly
in the anonymous check (it indicates a programmer error, not a
run-time condition).
Also make lib/credentials.c a little more consistant.
Andrew Bartlett
(This used to be commit 730e6056b730c15008772c30cd6f7c03fb6b7e5f)
Diffstat (limited to 'source4/lib/cmdline')
| -rw-r--r-- | source4/lib/cmdline/popt_common.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/lib/cmdline/popt_common.c b/source4/lib/cmdline/popt_common.c index 50e07d95e9..68f491a188 100644 --- a/source4/lib/cmdline/popt_common.c +++ b/source4/lib/cmdline/popt_common.c @@ -212,10 +212,10 @@ static void popt_common_credentials_callback(poptContext con, break; case 'P': - { - cli_credentials_set_machine_account(cmdline_credentials); - } - /* machine accounts only work with kerberos */ + /* Later, after this is all over, get the machine account details from the secrets.ldb */ + cli_credentials_set_machine_account_pending(cmdline_credentials); + + /* machine accounts only work with kerberos (fall though)*/ case 'k': #ifndef HAVE_KRB5 |