summaryrefslogtreecommitdiff
path: root/source4/include
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2005-03-24 03:32:25 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:11:15 -0500
commit038c4c4c6a4f6039e0436134de1d9c1e14c444d8 (patch)
tree0a1144858e9c920a0a13357dc8ccaf77935bebfb /source4/include
parentd600b78c33cd4950073d2848f1a9a0f17f17d20e (diff)
downloadsamba-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/include')
-rw-r--r--source4/include/credentials.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/source4/include/credentials.h b/source4/include/credentials.h
index 7b223dad5a..d7bf8997eb 100644
--- a/source4/include/credentials.h
+++ b/source4/include/credentials.h
@@ -4,6 +4,7 @@
Client credentials structure
Copyright (C) Jelmer Vernooij 2004-2005
+ Copyright (C) Andrew Bartlett <abartlet@samba.org> 2005
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -49,5 +50,14 @@ struct cli_credentials {
const char *(*domain_cb) (struct cli_credentials *);
const char *(*realm_cb) (struct cli_credentials *);
+ /* Private handle for the callback routines to use */
void *priv_data;
+
+ struct creds_CredentialState *netlogon_creds;
+
+ /* We are flagged to get machine account details from the
+ * secrets.ldb when we are asked for a username or password */
+
+ BOOL machine_account_pending;
};
+