From 7cc6650d19f177c5423f6691c497567b18987738 Mon Sep 17 00:00:00 2001 From: Ezra Peisach Date: Thu, 8 Mar 2001 22:45:29 +0000 Subject: [PATCH] * kdc_util.h: Add prototype for process_v4_mode() for main.c to use * kerberos_v4.c: Do not shadow progname and more variables. * rtest.c (make_princ): Declare static. * sock2p.c: Include kdc_util.h for prototypes. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13064 dc483132-0cff-0310-8789-dd5450dbe970 --- src/kdc/ChangeLog | 10 ++++++++++ src/kdc/do_as_req.c | 2 +- src/kdc/kdc_util.h | 1 + src/kdc/kerberos_v4.c | 8 ++++---- src/kdc/rtest.c | 2 +- src/kdc/sock2p.c | 1 + 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog index 01ef6b8f2..4feba5853 100644 --- a/src/kdc/ChangeLog +++ b/src/kdc/ChangeLog @@ -1,3 +1,13 @@ +2001-03-08 Ezra Peisach + + * kdc_util.h: Add prototype for process_v4_mode() for main.c to use. + + * kerberos_v4.c: Do not shadow progname and more variables. + + * rtest.c (make_princ): Declare static. + + * sock2p.c: Include kdc_util.h for prototypes. + 2001-02-08 Tom Yu * kerberos_v4.c (kerberos_v4): Remove references to diff --git a/src/kdc/do_as_req.c b/src/kdc/do_as_req.c index 158747ee5..c61d2e4ff 100644 --- a/src/kdc/do_as_req.c +++ b/src/kdc/do_as_req.c @@ -458,7 +458,7 @@ errout: kdc_active_realm->realm_dbname); krb5_db_init(kdc_context); /* Reset master key */ - krb5_db_set_mkey(kdc_context, &kdc_active_realm->realm_encblock); + krb5_db_set_mkey(kdc_context, &kdc_active_realm->realm_mkey); } #endif /* KRBCONF_KDC_MODIFIES_KDB */ krb5_db_free_principal(kdc_context, &client, c_nprincs); diff --git a/src/kdc/kdc_util.h b/src/kdc/kdc_util.h index ce2377e9d..450d78568 100644 --- a/src/kdc/kdc_util.h +++ b/src/kdc/kdc_util.h @@ -177,6 +177,7 @@ krb5_error_code process_v4 PROTOTYPE((const krb5_data *, const krb5_fulladdr *, int is_secondary, krb5_data **)); +void process_v4_mode PROTOTYPE((const char *, const char *)); #else #define process_v4(foo,bar,quux,foobar) KRB5KRB_AP_ERR_BADVERSION #endif diff --git a/src/kdc/kerberos_v4.c b/src/kdc/kerberos_v4.c index b7c30c07f..3e18ac614 100644 --- a/src/kdc/kerberos_v4.c +++ b/src/kdc/kerberos_v4.c @@ -103,7 +103,6 @@ static C_Block session_key; static char log_text[512]; static char *lt; -static int more; /* fields within the received request packet */ static u_char req_msg_type; @@ -184,8 +183,8 @@ static const struct v4mode_lookup_entry v4mode_table[] = { static const int v4mode_table_nents = sizeof(v4mode_table)/ sizeof(v4mode_table[0]); -void process_v4_mode(progname, string) - const char *progname; +void process_v4_mode(program_name, string) + const char *program_name; const char *string; { int i, found; @@ -205,7 +204,7 @@ void process_v4_mode(progname, string) if(!found) { /* It is considered fatal if we request a mode that is not found */ - com_err(progname, 0, "invalid v4_mode %s", string); + com_err(program_name, 0, "invalid v4_mode %s", string); exit(1); } return; @@ -1163,6 +1162,7 @@ set_tgtkey(r, kvno) int n; static char lastrealm[REALM_SZ] = ""; static int last_kvno = 0; + static int more; Principal p_st; Principal *p = &p_st; C_Block key; diff --git a/src/kdc/rtest.c b/src/kdc/rtest.c index e5f1d896a..8f0e30396 100644 --- a/src/kdc/rtest.c +++ b/src/kdc/rtest.c @@ -31,7 +31,7 @@ #include "kdc_util.h" #include "extern.h" -krb5_principal +static krb5_principal make_princ(ctx, str, prog) krb5_context ctx; const char *str; diff --git a/src/kdc/sock2p.c b/src/kdc/sock2p.c index a9763bd33..f337fda30 100644 --- a/src/kdc/sock2p.c +++ b/src/kdc/sock2p.c @@ -32,6 +32,7 @@ #include #include #include +#include "kdc_util.h" #ifndef HAVE_INET_NTOP char * -- 2.26.2