* 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

diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index 01ef6b8f269c90dab07b1d780279ec4e20093ce0..4feba58531d2ebf055a64a7583651bf682807467 100644 (file)
--- a/src/kdc/ChangeLog
+++ b/src/kdc/ChangeLog
@@ -1,3 +1,13 @@
+2001-03-08  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+       * 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  <tlyu@mit.edu>
 
        * 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 158747ee5c0eea3766b487b88a41cbee92651d1a..c61d2e4ffe02fd9978078ad60b3c3e1b8b724531 100644 (file)
--- 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 ce2377e9d1d781d95472b3dc1ee93457b7171f69..450d78568155b82e69fb70b952590bad117d290f 100644 (file)
--- 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 b7c30c07f96efc98b5ba8e1bd72abf085c00ecad..3e18ac61484fd07291fcbb349e866bf1880540ca 100644 (file)
--- 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 e5f1d896a8999015444743caecc3adf4ae2d5211..8f0e30396a5cc0647d1920c7fb757ad1442f8219 100644 (file)
--- 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 a9763bd33cc1c5bc85d1e0c44e211d179660e444..f337fda30ce4c5192caca1c061bb4c60ddee58ea 100644 (file)
--- a/src/kdc/sock2p.c
+++ b/src/kdc/sock2p.c
@@ -32,6 +32,7 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
+#include "kdc_util.h"
 
 #ifndef HAVE_INET_NTOP
 char *