diff options
| author | Theodore Tso <tytso@mit.edu> | 1996-12-21 06:35:49 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1996-12-21 06:35:49 +0000 |
| commit | e31ff65597ca946574d74b51c72b266c843f8245 (patch) | |
| tree | 3f91b885e9f853935ff8271247478833dd6f7fbb /src/lib | |
| parent | 79b1cb7532d744d408f0269f52bbe8db646a0d64 (diff) | |
| download | krb5-e31ff65597ca946574d74b51c72b266c843f8245.tar.gz krb5-e31ff65597ca946574d74b51c72b266c843f8245.tar.xz krb5-e31ff65597ca946574d74b51c72b266c843f8245.zip | |
Use new call krb5_vercheck() for Windows timebomb checking; this call
returns an error code, which is returned to the user if the timebomb
should be activated.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9671 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/krb5/krb/ChangeLog | 7 | ||||
| -rw-r--r-- | src/lib/krb5/krb/init_ctx.c | 14 |
2 files changed, 15 insertions, 6 deletions
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index 18bf885944..00c7d361f3 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,10 @@ +Sat Dec 21 01:26:11 1996 Theodore Y. Ts'o <tytso@mit.edu> + + * init_ctx.c (krb5_init_context): Use new call krb5_vercheck() for + Windows timebomb checking; this call returns an error + code, which is returned to the user if the timebomb should + be activated. + Thu Nov 21 13:54:01 1996 Ezra Peisach <epeisach@mit.edu> * recvauth.c (krb5_recvauth): If there is an error, and the server diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c index 19aaf66424..2794fbcf65 100644 --- a/src/lib/krb5/krb/init_ctx.c +++ b/src/lib/krb5/krb/init_ctx.c @@ -27,7 +27,7 @@ #include <ctype.h> #if (defined(_MSDOS) || defined(_WIN32)) -extern void krb5_win_do_init(); +extern krb5_error_code krb5_vercheck(); #endif krb5_error_code INTERFACE @@ -38,12 +38,17 @@ krb5_init_context(context) krb5_error_code retval; int tmp; + /* Initialize error tables */ + krb5_init_ets(ctx); + #if (defined(_MSDOS) || defined(_WIN32)) /* - * krb5_win_do_init() is defined in win_glue.c, and this is + * krb5_vercheck() is defined in win_glue.c, and this is * where we handle the timebomb and version server checks. */ - krb5_win_do_init(); + retval = krb5_vercheck(); + if (retval) + return retval; #endif *context = 0; @@ -54,9 +59,6 @@ krb5_init_context(context) memset(ctx, 0, sizeof(struct _krb5_context)); ctx->magic = KV5M_CONTEXT; - /* Initialize error tables */ - krb5_init_ets(ctx); - /* Set the default encryption types, possible defined in krb5/conf */ if ((retval = krb5_set_default_in_tkt_ktypes(ctx, NULL))) goto cleanup; |