524 is independent of kerberos 4, so move out enable_v4_cross_realm
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:
24
kdc/config.c
24
kdc/config.c
@@ -71,11 +71,11 @@ krb5_addresses explicit_addresses;
|
||||
#ifdef KRB4
|
||||
char *v4_realm;
|
||||
int enable_v4 = -1;
|
||||
int enable_v4_cross_realm = -1;
|
||||
int enable_kaserver = -1;
|
||||
#endif
|
||||
|
||||
int enable_524 = -1;
|
||||
int enable_v4_cross_realm = -1;
|
||||
|
||||
static int help_flag;
|
||||
static int version_flag;
|
||||
@@ -104,22 +104,22 @@ static struct getargs args[] = {
|
||||
"don't respond to 524 requests"
|
||||
},
|
||||
#ifdef KRB4
|
||||
{
|
||||
"kaserver", 'K', arg_flag, &enable_kaserver,
|
||||
"enable kaserver support"
|
||||
},
|
||||
{ "kerberos4", 0, arg_flag, &enable_v4,
|
||||
"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,
|
||||
"realm to serve v4-requests for"
|
||||
},
|
||||
{
|
||||
"kaserver", 'K', arg_flag, &enable_kaserver,
|
||||
"enable kaserver support"
|
||||
},
|
||||
#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 to listen to", "portspec"
|
||||
},
|
||||
@@ -340,15 +340,15 @@ configure(int argc, char **argv)
|
||||
if(enable_v4 == -1)
|
||||
enable_v4 = krb5_config_get_bool_default(context, NULL, FALSE, "kdc",
|
||||
"enable-kerberos4", NULL);
|
||||
#else
|
||||
#define enable_v4 0
|
||||
#endif
|
||||
if(enable_v4_cross_realm == -1)
|
||||
enable_v4_cross_realm =
|
||||
krb5_config_get_bool_default(context, NULL,
|
||||
FALSE, "kdc",
|
||||
"enable-kerberos4-cross-realm",
|
||||
NULL);
|
||||
#else
|
||||
#define enable_v4 0
|
||||
#endif
|
||||
if(enable_524 == -1)
|
||||
enable_524 = krb5_config_get_bool_default(context, NULL, enable_v4,
|
||||
"kdc", "enable-524", NULL);
|
||||
|
Reference in New Issue
Block a user