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

524 is independent of kerberos 4, so move out enable_v4_cross_realm

Browse Source 
since 524 needs it


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11828 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2003-03-18 00:22:23 +00:00
parent d405140c45
commit 39bc5eff7a
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
kdc/config.c
View File

@@ -71,11 +71,11 @@ krb5_addresses explicit_addresses;
#ifdef KRB4 #ifdef KRB4
char *v4_realm; char *v4_realm;
int enable_v4 = -1; int enable_v4 = -1;
int enable_v4_cross_realm = -1;
int enable_kaserver = -1; int enable_kaserver = -1;
#endif #endif
int enable_524 = -1; int enable_524 = -1;
int enable_v4_cross_realm = -1;
static int help_flag; static int help_flag;
static int version_flag; static int version_flag;
@@ -104,22 +104,22 @@ static struct getargs args[] = {
"don't respond to 524 requests" "don't respond to 524 requests"
}, },
#ifdef KRB4 #ifdef KRB4
{
"kaserver", 'K', arg_flag, &enable_kaserver,
"enable kaserver support"
},
{ "kerberos4", 0, arg_flag, &enable_v4, { "kerberos4", 0, arg_flag, &enable_v4,
"respond to kerberos 4 requests" "respond to kerberos 4 requests"
}, },
{ "kerberos4-cross-realm", 0, arg_flag,
&enable_v4_cross_realm,
"respond to kerberos 4 requests from foreign realms"
},
{ {
"v4-realm", 'r', arg_string, &v4_realm, "v4-realm", 'r', arg_string, &v4_realm,
"realm to serve v4-requests for" "realm to serve v4-requests for"
}, },
{
"kaserver", 'K', arg_flag, &enable_kaserver,
"enable kaserver support"
},
#endif #endif
{ "kerberos4-cross-realm", 0, arg_flag,
&enable_v4_cross_realm,
"respond to kerberos 4 requests from foreign realms"
},
{ "ports", 'P', arg_string, &port_str, { "ports", 'P', arg_string, &port_str,
"ports to listen to", "portspec" "ports to listen to", "portspec"
}, },
@@ -340,15 +340,15 @@ configure(int argc, char **argv)
if(enable_v4 == -1) if(enable_v4 == -1)
enable_v4 = krb5_config_get_bool_default(context, NULL, FALSE, "kdc", enable_v4 = krb5_config_get_bool_default(context, NULL, FALSE, "kdc",
"enable-kerberos4", NULL); "enable-kerberos4", NULL);
#else
#define enable_v4 0
#endif
if(enable_v4_cross_realm == -1) if(enable_v4_cross_realm == -1)
enable_v4_cross_realm = enable_v4_cross_realm =
krb5_config_get_bool_default(context, NULL, krb5_config_get_bool_default(context, NULL,
FALSE, "kdc", FALSE, "kdc",
"enable-kerberos4-cross-realm", "enable-kerberos4-cross-realm",
NULL); NULL);
#else
#define enable_v4 0
#endif
if(enable_524 == -1) if(enable_524 == -1)
enable_524 = krb5_config_get_bool_default(context, NULL, enable_v4, enable_524 = krb5_config_get_bool_default(context, NULL, enable_v4,
"kdc", "enable-524", NULL); "kdc", "enable-524", NULL);