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

add kaserver support unconditionally, make kdc only fail to start when

Browse Source 
there are no v4-realm configure and krb4/kaserver is turned on


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14914 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-04-24 13:46:48 +00:00
parent c747d3b0c9
commit 9f607cb090
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kdc/config.c
View File

@@ -106,12 +106,10 @@ static struct getargs args[] = {
{ "524", 0, arg_negative_flag, &enable_524, { "524", 0, arg_negative_flag, &enable_524,
"don't respond to 524 requests" "don't respond to 524 requests"
}, },
#ifdef KRB4
{ {
"kaserver", 'K', arg_flag, &enable_kaserver, "kaserver", 'K', arg_flag, &enable_kaserver,
"enable kaserver support" "enable kaserver support"
}, },
#endif
{ "kerberos4", 0, arg_flag, &enable_v4, { "kerberos4", 0, arg_flag, &enable_v4,
"respond to kerberos 4 requests" "respond to kerberos 4 requests"
}, },
@@ -404,13 +402,11 @@ configure(int argc, char **argv)
krb5_errx(context, 1, "out of memory"); krb5_errx(context, 1, "out of memory");
} }
} }
#ifdef KRB4
if (enable_kaserver == -1) if (enable_kaserver == -1)
enable_kaserver = krb5_config_get_bool_default(context, NULL, FALSE, enable_kaserver = krb5_config_get_bool_default(context, NULL, FALSE,
"kdc", "kdc",
"enable-kaserver", "enable-kaserver",
NULL); NULL);
#endif
encode_as_rep_as_tgs_rep = krb5_config_get_bool(context, NULL, "kdc", encode_as_rep_as_tgs_rep = krb5_config_get_bool(context, NULL, "kdc",
"encode_as_rep_as_tgs_rep", "encode_as_rep_as_tgs_rep",
@@ -469,7 +465,7 @@ configure(int argc, char **argv)
} }
#endif #endif
if(v4_realm == NULL){ if(v4_realm == NULL && (enable_kaserver || enable_v4)){
#ifdef KRB4 #ifdef KRB4
v4_realm = malloc(40); /* REALM_SZ */ v4_realm = malloc(40); /* REALM_SZ */
if (v4_realm == NULL) if (v4_realm == NULL)
@@ -496,8 +492,6 @@ configure(int argc, char **argv)
"and kaserver"); "and kaserver");
enable_v4 = 0; enable_v4 = 0;
enable_524 = 0; enable_524 = 0;
#ifdef KRB4
enable_kaserver = 0; enable_kaserver = 0;
#endif
} }
} }