(make_keys): also support `[kadmin]use_v4_salt' for backwards

compatability


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8569 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2000-07-07 16:39:38 +00:00
parent bdc807d4ce
commit f30bc712c9

View File

@@ -104,6 +104,7 @@ make_keys(krb5_context context, krb5_principal principal, const char *password,
Key key; Key key;
int i; int i;
char *v4_ktypes[] = {"des3:pw-salt", "v4", NULL};
ktypes = krb5_config_get_strings(context, NULL, "kadmin", ktypes = krb5_config_get_strings(context, NULL, "kadmin",
"default_keys", NULL); "default_keys", NULL);
@@ -113,10 +114,15 @@ make_keys(krb5_context context, krb5_principal principal, const char *password,
[(des|des3|etype):](pw|afs3)[:string], if etype is omitted it [(des|des3|etype):](pw|afs3)[:string], if etype is omitted it
means everything, and if string is omitted is means the default means everything, and if string is omitted is means the default
string (for that principal). Additional special values: string (for that principal). Additional special values:
v5 == pw, and v5 == pw-salt, and
v4 == pw: v4 == pw-salt:
*/ */
if (ktypes == NULL
&& krb5_config_get_bool (context, NULL, "kadmin",
"use_v4_salt", NULL))
ktypes = v4_ktypes;
for(kp = ktypes; kp && *kp; kp++) { for(kp = ktypes; kp && *kp; kp++) {
krb5_enctype *etypes; krb5_enctype *etypes;
int num_etypes; int num_etypes;