pull up some gcc-4.0 changes from #2876

Pull up some changes to build under gcc-4.0.  Exclude
telnet/configure.in change for now.

ticket: new
target_version: 1.4
version_fixed: 1.4
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@17061 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog
index f9ac141618823a1b0017977bfba4f36efc2a3c1a..2817768335a21a3d6404bec16f01617f6045a9ab 100644 (file)
--- a/src/appl/gssftp/ftpd/ChangeLog
+++ b/src/appl/gssftp/ftpd/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-13  Ezra Peisach  <epeisach@mit.edu>
+
+       * ftpd.c: GCC 4.0 fixes... Move static declaration of gunique out
+       of function.
+
 2004-11-26  Sam Hartman  <hartmans@mit.edu>
 
        * ftpcmd.y: nbby should be 8 for anything platform we care about.

diff --git a/src/appl/gssftp/ftpd/ftpd.c b/src/appl/gssftp/ftpd/ftpd.c
index 4e3ef9064b91dc885bb58cd45fd7b3a515c80b2b..6655e0d62a7bbdc6812a86535b5b2a72129a489c 100644 (file)
--- a/src/appl/gssftp/ftpd/ftpd.c
+++ b/src/appl/gssftp/ftpd/ftpd.c
@@ -260,6 +260,7 @@ static void end_login(void);
 static int disallowed_user(char *);
 static int restricted_user(char *);
 static int checkuser(char *);
+static char *gunique(char *);
 
 #ifdef SETPROCTITLE
 char   **Argv = NULL;          /* pointer to argument vector */
@@ -1279,7 +1280,6 @@ store_file(name, fmode, unique)
        FILE *fout, *din;
        struct stat st;
        int (*closefunc)();
-       static char *gunique();
 
        if (logging > 1) syslog(LOG_NOTICE, "put %s", path_expand(name));
 

diff --git a/src/lib/crypto/yarrow/ChangeLog b/src/lib/crypto/yarrow/ChangeLog
index 96cc35c14fed769ac8c67f90f1e91c9a474e6e9b..cf08dc9ed91ec0430ead3d43089e6c69257ba8d1 100644 (file)
--- a/src/lib/crypto/yarrow/ChangeLog
+++ b/src/lib/crypto/yarrow/ChangeLog
@@ -9,6 +9,10 @@
        (krb5int_yarrow_final): Hold the lock until after clearing the
        Yarrow context data.
 
+2005-01-13  Ezra Peisach  <epeisach@mit.edu>
+
+       * yarrow.c: Declare yarrow_gate_locked static before first use.
+
 2004-11-22  Ken Raeburn  <raeburn@mit.edu>
 
        * yarrow.c (yarrow_input_maybe_locking): Renamed from

diff --git a/src/lib/crypto/yarrow/yarrow.c b/src/lib/crypto/yarrow/yarrow.c
index 472f042e3fd72c721babe23e04c3e9e067a44094..29c10f79e0fe2bc8899c828f2b8e908f722b9eec 100644 (file)
--- a/src/lib/crypto/yarrow/yarrow.c
+++ b/src/lib/crypto/yarrow/yarrow.c
@@ -71,6 +71,8 @@ static int Yarrow_Load_State( Yarrow_CTX *y );
 static int Yarrow_Save_State( Yarrow_CTX *y );
 #endif
 
+static int yarrow_gate_locked(Yarrow_CTX* y);
+
 static const byte zero_block[CIPHER_BLOCK_SIZE] = { 0, };
 
 static const char* const yarrow_str_error[] = {