* init_ctx.c: Provide a full prototype for init_common()

        * recvauth.c (recvauth_common): Declare recvauth_common as static.

        * parse.c, sendauth.c: Changes to prevent shadowing of local
        variables.

        * get_in_tkt.c, tgtname.c: Include int-proto.h for prototypes.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13073 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 73d92914a635304df873a0a6e7c5e88d506faa6d..a76e2704aee8131172f0929495adb8982eb9ec47 100644 (file)
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,14 @@
+2001-03-10  Ezra Peisach  <epeisach@mit.edu>
+
+       * init_ctx.c: Provide a full prototype for init_common().
+
+       * recvauth.c (recvauth_common): Declare recvauth_common as static. 
+
+       * parse.c, sendauth.c: Changes to prevent shadowing of local
+       variables.
+
+       * get_in_tkt.c, tgtname.c: Include int-proto.h for prototypes.
+
 2001-03-03  Ken Raeburn  <raeburn@mit.edu>
 
        * preauth2.c (pa_sam): Return an error if no prompter was

diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c
index 9bd469c2ec83c83254cde75ea94cfdc7f6ed599b..60701ff053c501d5a996d9551e290d0aec315f4a 100644 (file)
--- a/src/lib/krb5/krb/get_in_tkt.c
+++ b/src/lib/krb5/krb/get_in_tkt.c
@@ -30,6 +30,7 @@
 #include <string.h>
 
 #include "k5-int.h"
+#include "int-proto.h"
 
 /*
  All-purpose initial ticket routine, usually called via

diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c
index b04cd971f92617b840684b2edcb80b9b33f28d28..7654da6216728fd3c912b397892dd615b3f83cdb 100644 (file)
--- a/src/lib/krb5/krb/init_ctx.c
+++ b/src/lib/krb5/krb/init_ctx.c
@@ -61,7 +61,7 @@ extern krb5_error_code krb5_vercheck();
 extern void krb5_win_ccdll_load(krb5_context context);
 #endif
 
-static krb5_error_code init_common ();
+static krb5_error_code init_common (krb5_context *, krb5_boolean);
 
 KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_init_context(context)

diff --git a/src/lib/krb5/krb/parse.c b/src/lib/krb5/krb/parse.c
index 366f75447edff74da1048067fb7097f925a376ec..508383cbbd47b653f0aa1f18e6d582f29bf860e7 100644 (file)
--- a/src/lib/krb5/krb/parse.c
+++ b/src/lib/krb5/krb/parse.c
@@ -217,9 +217,9 @@ krb5_parse_name(context, name, nprincipal)
        krb5_princ_set_realm_length(context, principal, realmsize);
        krb5_princ_set_realm_data(context, principal, tmpdata);
        for (i=0; i < components; i++) {
-               char *tmpdata =
+               char *tmpdata2 =
                  malloc(krb5_princ_component(context, principal, i)->length + 1);
-               if (!tmpdata) {
+               if (!tmpdata2) {
                        for (i--; i >= 0; i--)
                                krb5_xfree(krb5_princ_component(context, principal, i)->data);
                        krb5_xfree(krb5_princ_realm(context, principal)->data);
@@ -227,7 +227,7 @@ krb5_parse_name(context, name, nprincipal)
                        krb5_xfree(principal);
                        return(ENOMEM);
                }
-               krb5_princ_component(context, principal, i)->data = tmpdata;
+               krb5_princ_component(context, principal, i)->data = tmpdata2;
                krb5_princ_component(context, principal, i)->magic = KV5M_DATA;
        }
        

diff --git a/src/lib/krb5/krb/recvauth.c b/src/lib/krb5/krb/recvauth.c
index f74041c59c2490a927a35251c92e1e222000e0ae..2aed962da3f44ec99485a961b7e0223e9c34566f 100644 (file)
--- a/src/lib/krb5/krb/recvauth.c
+++ b/src/lib/krb5/krb/recvauth.c
@@ -37,7 +37,7 @@
 
 static char *sendauth_version = "KRB5_SENDAUTH_V1.0";
 
-krb5_error_code
+static krb5_error_code
 recvauth_common(krb5_context context,
                krb5_auth_context FAR * auth_context,
                /* IN */

diff --git a/src/lib/krb5/krb/sendauth.c b/src/lib/krb5/krb/sendauth.c
index b19afdb7ed1ef342bc2eb9551fa30c0d6178eb70..ce2463bfc73b1ab685ec0c147d3d53017b10ebe7 100644 (file)
--- a/src/lib/krb5/krb/sendauth.c
+++ b/src/lib/krb5/krb/sendauth.c
@@ -158,18 +158,20 @@ krb5_sendauth(context, auth_context,
               not to guarantee randomness, but to make it less likely
               that multiple sessions could pick the same subkey.  */
            char rnd_data[1024];
-           size_t len;
+           size_t len2;
            krb5_data d;
            d.length = sizeof (rnd_data);
            d.data = rnd_data;
-           len = sizeof (rnd_data);
-           if (getpeername (*(int*)fd, (struct sockaddr *) rnd_data, &len) == 0) {
-               d.length = len;
+           len2 = sizeof (rnd_data);
+           if (getpeername (*(int*)fd, (struct sockaddr *) rnd_data, 
+                            &len2) == 0) {
+               d.length = len2;
                (void) krb5_c_random_seed (context, &d);
            }
-           len = sizeof (rnd_data);
-           if (getsockname (*(int*)fd, (struct sockaddr *) rnd_data, &len) == 0) {
-               d.length = len;
+           len2 = sizeof (rnd_data);
+           if (getsockname (*(int*)fd, (struct sockaddr *) rnd_data, 
+                            &len2) == 0) {
+               d.length = len2;
                (void) krb5_c_random_seed (context, &d);
            }
        }

diff --git a/src/lib/krb5/krb/tgtname.c b/src/lib/krb5/krb/tgtname.c
index 2f7168656c7849af82bdc36b0acefa9d5a91f45b..1c759e38025749b007302260c6f9472dbfe57bf2 100644 (file)
--- a/src/lib/krb5/krb/tgtname.c
+++ b/src/lib/krb5/krb/tgtname.c
@@ -28,6 +28,7 @@
  */
 
 #include "k5-int.h"
+#include "int-proto.h"
 
 /* This is an internal-only function, used by krb5_get_cred_from_kdc() */