oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

make encrypt, forwardable, forward use appdefault (that also searches

Browse Source 
libdefaults), prompted by Thomas Nystrom <thn@saeab.se>


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13680 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2004-04-02 21:28:48 +00:00
parent 0f7b18e449
commit f651b63831
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
appl/telnet/telnet/main.c
View File

@@ -112,7 +112,6 @@ set_forward_options(void)
} }
#ifdef KRB5 #ifdef KRB5
/* XXX ugly hack to setup dns-proxy stuff */
#define Authenticator asn1_Authenticator #define Authenticator asn1_Authenticator
#include <krb5.h> #include <krb5.h>
static void static void
@@ -120,24 +119,29 @@ krb5_init(void)
{ {
krb5_context context; krb5_context context;
krb5_error_code ret; krb5_error_code ret;
krb5_boolean ret_val;
ret = krb5_init_context(&context); ret = krb5_init_context(&context);
if (ret) if (ret)
return; return;
#if defined(AUTHENTICATION) && defined(KRB5) && defined(FORWARD) #if defined(AUTHENTICATION) && defined(FORWARD)
if (krb5_config_get_bool (context, NULL, krb5_appdefault_boolean(context, NULL,
"libdefaults", "forward", NULL)) { NULL, "forward",
0, &ret_val);
if (ret_val)
kerberos5_set_forward(1); kerberos5_set_forward(1);
} krb5_appdefault_boolean(context, NULL,
if (krb5_config_get_bool (context, NULL, NULL, "forwardable",
"libdefaults", "forwardable", NULL)) { 0, &ret_val);
if (ret_val)
kerberos5_set_forwardable(1); kerberos5_set_forwardable(1);
}
#endif #endif
#ifdef ENCRYPTION #ifdef ENCRYPTION
if (krb5_config_get_bool (context, NULL, krb5_appdefault_boolean(context, NULL,
"libdefaults", "encrypt", NULL)) { NULL, "encrypt",
0, &ret_val);
if (ret_val) {
encrypt_auto(1); encrypt_auto(1);
decrypt_auto(1); decrypt_auto(1);
wantencryption = 1; wantencryption = 1;