diff options
Diffstat (limited to 'src/lib/krb5/krb')
-rw-r--r-- | src/lib/krb5/krb/preauth2.c | 2 | ||||
-rw-r--r-- | src/lib/krb5/krb/preauth_ec.c | 7 | ||||
-rw-r--r-- | src/lib/krb5/krb/preauth_encts.c | 7 | ||||
-rw-r--r-- | src/lib/krb5/krb/preauth_otp.c | 7 | ||||
-rw-r--r-- | src/lib/krb5/krb/preauth_sam2.c | 7 |
5 files changed, 2 insertions, 28 deletions
diff --git a/src/lib/krb5/krb/preauth2.c b/src/lib/krb5/krb/preauth2.c index fbf7a44..d25a3a9 100644 --- a/src/lib/krb5/krb/preauth2.c +++ b/src/lib/krb5/krb/preauth2.c @@ -249,6 +249,8 @@ static int clpreauth_is_real(krb5_context context, clpreauth_handle h, krb5_preauthtype pa_type) { + if (h->vt.flags == NULL) + return 1; return (h->vt.flags(context, pa_type) & PA_REAL) != 0; } diff --git a/src/lib/krb5/krb/preauth_ec.c b/src/lib/krb5/krb/preauth_ec.c index bd72322..b197833 100644 --- a/src/lib/krb5/krb/preauth_ec.c +++ b/src/lib/krb5/krb/preauth_ec.c @@ -33,12 +33,6 @@ #include <krb5/clpreauth_plugin.h> #include "int-proto.h" -static int -ec_flags(krb5_context context, krb5_preauthtype pa_type) -{ - return PA_REAL; -} - static krb5_error_code ec_prep_questions(krb5_context context, krb5_clpreauth_moddata moddata, krb5_clpreauth_modreq modreq, krb5_get_init_creds_opt *opt, @@ -166,7 +160,6 @@ clpreauth_encrypted_challenge_initvt(krb5_context context, int maj_ver, vt = (krb5_clpreauth_vtable)vtable; vt->name = "encrypted_challenge"; vt->pa_type_list = ec_types; - vt->flags = ec_flags; vt->prep_questions = ec_prep_questions; vt->process = ec_process; return 0; diff --git a/src/lib/krb5/krb/preauth_encts.c b/src/lib/krb5/krb/preauth_encts.c index 88647e2..b8295aa 100644 --- a/src/lib/krb5/krb/preauth_encts.c +++ b/src/lib/krb5/krb/preauth_encts.c @@ -29,12 +29,6 @@ #include <krb5/clpreauth_plugin.h> #include "int-proto.h" -static int -encts_flags(krb5_context context, krb5_preauthtype pa_type) -{ - return PA_REAL; -} - static krb5_error_code encts_prep_questions(krb5_context context, krb5_clpreauth_moddata moddata, krb5_clpreauth_modreq modreq, @@ -137,7 +131,6 @@ clpreauth_encrypted_timestamp_initvt(krb5_context context, int maj_ver, vt = (krb5_clpreauth_vtable)vtable; vt->name = "encrypted_timestamp"; vt->pa_type_list = encts_pa_types; - vt->flags = encts_flags; vt->prep_questions = encts_prep_questions; vt->process = encts_process; return 0; diff --git a/src/lib/krb5/krb/preauth_otp.c b/src/lib/krb5/krb/preauth_otp.c index 4823b7d..e610d47 100644 --- a/src/lib/krb5/krb/preauth_otp.c +++ b/src/lib/krb5/krb/preauth_otp.c @@ -978,12 +978,6 @@ filter_config_tokeninfos(krb5_context context, return 0; } -static int -otp_client_get_flags(krb5_context context, krb5_preauthtype pa_type) -{ - return PA_REAL; -} - static void otp_client_request_init(krb5_context context, krb5_clpreauth_moddata moddata, krb5_clpreauth_modreq *modreq_out) @@ -1164,7 +1158,6 @@ clpreauth_otp_initvt(krb5_context context, int maj_ver, int min_ver, vt = (krb5_clpreauth_vtable)vtable; vt->name = "otp"; vt->pa_type_list = otp_client_supported_pa_types; - vt->flags = otp_client_get_flags; vt->request_init = otp_client_request_init; vt->prep_questions = otp_client_prep_questions; vt->process = otp_client_process; diff --git a/src/lib/krb5/krb/preauth_sam2.c b/src/lib/krb5/krb/preauth_sam2.c index 53f3601..c52564e 100644 --- a/src/lib/krb5/krb/preauth_sam2.c +++ b/src/lib/krb5/krb/preauth_sam2.c @@ -30,12 +30,6 @@ #include "int-proto.h" #include "init_creds_ctx.h" -static int -sam2_flags(krb5_context context, krb5_preauthtype pa_type) -{ - return PA_REAL; -} - /* this macro expands to the int,ptr necessary for "%.*s" in an sprintf */ #define SAMDATA(kdata, str, maxsize) \ @@ -431,7 +425,6 @@ clpreauth_sam2_initvt(krb5_context context, int maj_ver, int min_ver, vt = (krb5_clpreauth_vtable)vtable; vt->name = "sam2"; vt->pa_type_list = sam2_pa_types; - vt->flags = sam2_flags; vt->process = sam2_process; return 0; } |