diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-08-27 11:01:55 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-08-27 11:01:55 +1000 |
| commit | 8b94f7bcd70b1196487b433e355127a4f84bf5a5 (patch) | |
| tree | 940c1838cd0fa4033fef7945e97b530341f99ecf /source4/heimdal/kuser | |
| parent | ca20c56b260e2799c40b0c7c0e3ef5f7308b586e (diff) | |
| parent | 9430420ba246c26489ad51e8b52e13d891436bb3 (diff) | |
| download | samba-8b94f7bcd70b1196487b433e355127a4f84bf5a5.tar.gz samba-8b94f7bcd70b1196487b433e355127a4f84bf5a5.tar.bz2 samba-8b94f7bcd70b1196487b433e355127a4f84bf5a5.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into pac-verify
(This used to be commit 32143287c7eb452c6ed9ccd15e8cd4e5a907b437)
Diffstat (limited to 'source4/heimdal/kuser')
| -rw-r--r-- | source4/heimdal/kuser/kinit.c | 16 | ||||
| -rw-r--r-- | source4/heimdal/kuser/kuser_locl.h | 2 |
2 files changed, 14 insertions, 4 deletions
diff --git a/source4/heimdal/kuser/kinit.c b/source4/heimdal/kuser/kinit.c index 0e03dc4d37..7880c9e010 100644 --- a/source4/heimdal/kuser/kinit.c +++ b/source4/heimdal/kuser/kinit.c @@ -32,7 +32,7 @@ */ #include "kuser_locl.h" -RCSID("$Id: kinit.c 23418 2008-07-26 18:36:48Z lha $"); +RCSID("$Id$"); #include "krb5-v4compat.h" @@ -67,6 +67,7 @@ char *pk_x509_anchors = NULL; int pk_use_enckey = 0; static int canonicalize_flag = 0; static int ok_as_delegate_flag = 0; +static int use_referrals_flag = 0; static int windows_flag = 0; static char *ntlm_domain; @@ -166,6 +167,9 @@ static struct getargs args[] = { { "ok-as-delegate", 0, arg_flag, &ok_as_delegate_flag, "honor ok-as-delegate on tickets" }, + { "use-referrals", 0, arg_flag, &use_referrals_flag, + "only use referrals, no dns canalisation" }, + { "windows", 0, arg_flag, &windows_flag, "get windows behavior" }, @@ -597,11 +601,17 @@ get_new_tickets(krb5_context context, if (ntlm_domain && ntlmkey.data) store_ntlmkey(context, ccache, ntlm_domain, &ntlmkey); - if (ok_as_delegate_flag || windows_flag) { + if (ok_as_delegate_flag || windows_flag || use_referrals_flag) { + unsigned char d = 0; krb5_data data; + if (ok_as_delegate_flag || windows_flag) + d |= 1; + if (use_referrals_flag || windows_flag) + d |= 2; + data.length = 1; - data.data = "\x01"; + data.data = &d; krb5_cc_set_config(context, ccache, NULL, "realm-config", &data); } diff --git a/source4/heimdal/kuser/kuser_locl.h b/source4/heimdal/kuser/kuser_locl.h index 36ea01a9a5..ad48a0c99c 100644 --- a/source4/heimdal/kuser/kuser_locl.h +++ b/source4/heimdal/kuser/kuser_locl.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -/* $Id: kuser_locl.h 20458 2007-04-19 20:41:27Z lha $ */ +/* $Id$ */ #ifndef __KUSER_LOCL_H__ #define __KUSER_LOCL_H__ |