r26430: require explicit specification of loadparm context.

[jelmer/samba4-debian.git] / source / auth / credentials / credentials.h

diff --git a/source/auth/credentials/credentials.h b/source/auth/credentials/credentials.h
index ce63a55bb3c6eff72aaeb3a0f6e5686b4ef701e4..e00acf727abb73b492e12d6a7f4a639fbc800f14 100644 (file)
--- a/source/auth/credentials/credentials.h
+++ b/source/auth/credentials/credentials.h
@@ -8,7 +8,7 @@
 
    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
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -17,12 +17,12 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef __CREDENTIALS_H__
 #define __CREDENTIALS_H__
 
+#include "util/data_blob.h"
 #include "librpc/gen_ndr/misc.h"
 
 struct ccache_container;
@@ -61,6 +61,13 @@ struct cli_credentials {
        enum credentials_obtained keytab_obtained;
        enum credentials_obtained server_gss_creds_obtained;
 
+       /* Threshold values (essentially a MAX() over a number of the
+        * above) for the ccache and GSS credentials, to ensure we
+        * regenerate/pick correctly */
+
+       enum credentials_obtained ccache_threshold;
+       enum credentials_obtained client_gss_creds_threshold;
+
        const char *workstation;
        const char *username;
        const char *password;
@@ -97,11 +104,11 @@ struct cli_credentials {
 
        /* 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;
+       bool machine_account_pending;
+       struct loadparm_context *machine_account_pending_lp_ctx;
        
        /* Is this a machine account? */
-       BOOL machine_account;
+       bool machine_account;
 
        /* Should we be trying to use kerberos? */
        enum credentials_use_kerberos use_kerberos;
@@ -113,10 +120,14 @@ struct cli_credentials {
        int tries;
 
        /* Whether any callback is currently running */
-       BOOL callback_running;
+       bool callback_running;
+
+       /* an event context for anyone wanting to use the credentials */
+       struct event_context *ev;
 };
 
 struct ldb_context;
+struct loadparm_context;
 #include "auth/credentials/credentials_proto.h"
 
 #endif /* __CREDENTIALS_H__ */