r25398: Parse loadparm context to all lp_*() functions.

[ab/samba.git/.git] / source4 / auth / credentials / credentials.c

diff --git a/source4/auth/credentials/credentials.c b/source4/auth/credentials/credentials.c
index 55ada8e5a5496aed1bdd2956df3cb69cea38c64e..e88e05cfb0f418e1162871dd4cde18f92a60aa14 100644 (file)
--- a/source4/auth/credentials/credentials.c
+++ b/source4/auth/credentials/credentials.c
@@ -9,7 +9,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,
@@ -18,8 +18,7 @@
    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/>.
 */
 
 #include "includes.h"
@@ -27,6 +26,8 @@
 #include "auth/credentials/credentials.h"
 #include "auth/credentials/credentials_krb5.h"
 #include "libcli/auth/libcli_auth.h"
+#include "lib/events/events.h"
+#include "param/param.h"
 
 /**
  * Create a new credentials structure
@@ -52,6 +53,9 @@ struct cli_credentials *cli_credentials_init(TALLOC_CTX *mem_ctx)
        cred->keytab_obtained = CRED_UNINITIALISED;
        cred->principal_obtained = CRED_UNINITIALISED;
 
+       cred->ccache_threshold = CRED_UNINITIALISED;
+       cred->client_gss_creds_threshold = CRED_UNINITIALISED;
+
        cred->old_password = NULL;
        cred->smb_krb5_context = NULL;
        cred->salt_principal = NULL;
@@ -61,6 +65,7 @@ struct cli_credentials *cli_credentials_init(TALLOC_CTX *mem_ctx)
 
        cred->tries = 3;
        cred->callback_running = False;
+       cred->ev = NULL;
 
        cli_credentials_set_kerberos_state(cred, CRED_AUTO_USE_KERBEROS);
        cli_credentials_set_gensec_features(cred, 0);
@@ -77,7 +82,7 @@ struct cli_credentials *cli_credentials_init_anon(TALLOC_CTX *mem_ctx)
        struct cli_credentials *anon_credentials;
 
        anon_credentials = cli_credentials_init(mem_ctx);
-       cli_credentials_set_conf(anon_credentials);
+       cli_credentials_set_conf(anon_credentials, global_loadparm);
        cli_credentials_set_anonymous(anon_credentials);
 
        return anon_credentials;
@@ -123,6 +128,7 @@ const char *cli_credentials_get_username(struct cli_credentials *cred)
                cred->username = cred->username_cb(cred);
                cred->callback_running = False;
                cred->username_obtained = CRED_SPECIFIED;
+               cli_credentials_invalidate_ccache(cred, cred->username_obtained);
        }
 
        return cred->username;
@@ -134,6 +140,7 @@ BOOL cli_credentials_set_username(struct cli_credentials *cred,
        if (obtained >= cred->username_obtained) {
                cred->username = talloc_strdup(cred, val);
                cred->username_obtained = obtained;
+               cli_credentials_invalidate_ccache(cred, cred->username_obtained);
                return True;
        }
 
@@ -189,6 +196,7 @@ const char *cli_credentials_get_principal(struct cli_credentials *cred, TALLOC_C
                cred->principal = cred->principal_cb(cred);
                cred->callback_running = False;
                cred->principal_obtained = CRED_SPECIFIED;
+               cli_credentials_invalidate_ccache(cred, cred->principal_obtained);
        }
 
        if (cred->principal_obtained < cred->username_obtained) {
@@ -212,6 +220,7 @@ BOOL cli_credentials_set_principal(struct cli_credentials *cred,
        if (obtained >= cred->principal_obtained) {
                cred->principal = talloc_strdup(cred, val);
                cred->principal_obtained = obtained;
+               cli_credentials_invalidate_ccache(cred, cred->principal_obtained);
                return True;
        }
 
@@ -278,6 +287,7 @@ const char *cli_credentials_get_password(struct cli_credentials *cred)
                cred->password = cred->password_cb(cred);
                cred->callback_running = False;
                cred->password_obtained = CRED_CALLBACK_RESULT;
+               cli_credentials_invalidate_ccache(cred, cred->password_obtained);
        }
 
        return cred->password;
@@ -293,6 +303,7 @@ BOOL cli_credentials_set_password(struct cli_credentials *cred,
        if (obtained >= cred->password_obtained) {
                cred->password = talloc_strdup(cred, val);
                cred->password_obtained = obtained;
+               cli_credentials_invalidate_ccache(cred, cred->password_obtained);
 
                cred->nt_hash = NULL;
                return True;
@@ -307,6 +318,7 @@ BOOL cli_credentials_set_password_callback(struct cli_credentials *cred,
        if (cred->password_obtained < CRED_CALLBACK) {
                cred->password_cb = password_cb;
                cred->password_obtained = CRED_CALLBACK;
+               cli_credentials_invalidate_ccache(cred, cred->password_obtained);
                return True;
        }
 
@@ -399,6 +411,7 @@ const char *cli_credentials_get_domain(struct cli_credentials *cred)
                cred->domain = cred->domain_cb(cred);
                cred->callback_running = False;
                cred->domain_obtained = CRED_SPECIFIED;
+               cli_credentials_invalidate_ccache(cred, cred->domain_obtained);
        }
 
        return cred->domain;
@@ -415,6 +428,7 @@ BOOL cli_credentials_set_domain(struct cli_credentials *cred,
                 * calculations */
                cred->domain = strupper_talloc(cred, val);
                cred->domain_obtained = obtained;
+               cli_credentials_invalidate_ccache(cred, cred->domain_obtained);
                return True;
        }
 
@@ -451,6 +465,7 @@ const char *cli_credentials_get_realm(struct cli_credentials *cred)
                cred->realm = cred->realm_cb(cred);
                cred->callback_running = False;
                cred->realm_obtained = CRED_SPECIFIED;
+               cli_credentials_invalidate_ccache(cred, cred->realm_obtained);
        }
 
        return cred->realm;
@@ -467,6 +482,7 @@ BOOL cli_credentials_set_realm(struct cli_credentials *cred,
        if (obtained >= cred->realm_obtained) {
                cred->realm = strupper_talloc(cred, val);
                cred->realm_obtained = obtained;
+               cli_credentials_invalidate_ccache(cred, cred->realm_obtained);
                return True;
        }
 
@@ -605,12 +621,13 @@ const char *cli_credentials_get_unparsed_name(struct cli_credentials *credential
  *
  * @param cred Credentials structure to fill in
  */
-void cli_credentials_set_conf(struct cli_credentials *cred)
+void cli_credentials_set_conf(struct cli_credentials *cred, 
+                             struct loadparm_context *lp_ctx)
 {
        cli_credentials_set_username(cred, "", CRED_UNINITIALISED);
-       cli_credentials_set_domain(cred, lp_workgroup(), CRED_UNINITIALISED);
-       cli_credentials_set_workstation(cred, lp_netbios_name(), CRED_UNINITIALISED);
-       cli_credentials_set_realm(cred, lp_realm(), CRED_UNINITIALISED);
+       cli_credentials_set_domain(cred, lp_workgroup(lp_ctx), CRED_UNINITIALISED);
+       cli_credentials_set_workstation(cred, lp_netbios_name(lp_ctx), CRED_UNINITIALISED);
+       cli_credentials_set_realm(cred, lp_realm(lp_ctx), CRED_UNINITIALISED);
 }
 
 /**
@@ -623,7 +640,7 @@ void cli_credentials_guess(struct cli_credentials *cred)
 {
        char *p;
 
-       cli_credentials_set_conf(cred);
+       cli_credentials_set_conf(cred, global_loadparm);
        
        if (getenv("LOGNAME")) {
                cli_credentials_set_username(cred, getenv("LOGNAME"), CRED_GUESS_ENV);
@@ -636,16 +653,13 @@ void cli_credentials_guess(struct cli_credentials *cred)
                }
        }
 
-       if (getenv("DOMAIN")) {
-               cli_credentials_set_domain(cred, getenv("DOMAIN"), CRED_GUESS_ENV);
-       }
-
        if (getenv("PASSWD")) {
                cli_credentials_set_password(cred, getenv("PASSWD"), CRED_GUESS_ENV);
        }
 
        if (getenv("PASSWD_FD")) {
-               cli_credentials_parse_password_fd(cred, atoi(getenv("PASSWD_FD")), CRED_GUESS_FILE);
+               cli_credentials_parse_password_fd(cred, atoi(getenv("PASSWD_FD")), 
+                                                 CRED_GUESS_FILE);
        }
        
        p = getenv("PASSWD_FILE");
@@ -751,3 +765,22 @@ BOOL cli_credentials_wrong_password(struct cli_credentials *cred)
 
        return (cred->tries > 0);
 }
+
+/*
+  set the common event context for this set of credentials
+ */
+void cli_credentials_set_event_context(struct cli_credentials *cred, struct event_context *ev)
+{
+       cred->ev = ev;
+}
+
+/*
+  set the common event context for this set of credentials
+ */
+struct event_context *cli_credentials_get_event_context(struct cli_credentials *cred)
+{
+       if (cred->ev == NULL) {
+               cred->ev = event_context_find(cred);
+       }
+       return cred->ev;
+}