* configure.in: Use AC_CHECK_FUNCS, AC_CHECK_HEADERS, AC_C_CONST

	instead of the older names AC_HAVE_FUNCS, AC_HEADER_CHECK,
	AC_CONST. Consolidate use of function testing macros.

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

4 files changed, 35 insertions, 10 deletions

diff --git a/src/appl/gssftp/ChangeLog b/src/appl/gssftp/ChangeLog
index ed96d063d..aa6b11a42 100644
--- a/src/appl/gssftp/ChangeLog
+++ b/src/appl/gssftp/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-01  Ezra Peisach  <epeisach@mit.edu>
+
+	* configure.in: Use AC_CHECK_FUNCS, AC_CHECK_HEADERS, AC_C_CONST
+	instead of the older names AC_HAVE_FUNCS, AC_HEADER_CHECK,
+	AC_CONST. Consolidate use of function testing macros.
+
 2000-03-24  Ken Raeburn  <raeburn@mit.edu>
 
 	* configure.in: Check for alpha*-dec-osf* instead of
diff --git a/src/appl/gssftp/configure.in b/src/appl/gssftp/configure.in
index 349cc0478..5a72356cf 100644
--- a/src/appl/gssftp/configure.in
+++ b/src/appl/gssftp/configure.in
@@ -1,6 +1,6 @@
 AC_INIT(README.gssftp)
 CONFIG_RULES
-AC_CONST
+AC_C_CONST
 AC_PROG_INSTALL
 AC_PROG_YACC
 KRB5_SIGTYPE
@@ -13,14 +13,13 @@ AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
 AC_FUNC_VFORK
-AC_HAVE_FUNCS(getcwd getdtablesize)
 AC_HEADER_STDARG
-AC_HEADER_CHECK(termios.h,AC_FUNC_CHECK(cfsetispeed,AC_DEFINE(POSIX_TERMIOS)))
+AC_CHECK_HEADER(termios.h,AC_CHECK_FUNC(cfsetispeed,AC_DEFINE(POSIX_TERMIOS)))
 AC_CHECK_HEADERS(unistd.h stdlib.h string.h sys/select.h sys/sockio.h paths.h)
 CHECK_UTMP
 DECLARE_SYS_ERRLIST
 AC_REPLACE_FUNCS(getdtablesize)
-AC_HAVE_FUNCS(getcwd getusershell seteuid setreuid setresuid)
+AC_CHECK_FUNCS(getcwd getdtablesize getusershell seteuid setreuid setresuid)
 AC_CHECK_LIB(crypt,crypt) dnl 
 AC_CHECK_LIB(util,logwtmp) dnl
 dnl 
diff --git a/src/appl/gssftp/ftpd/popen.c b/src/appl/gssftp/ftpd/popen.c
index d26746107..068706b61 100644
--- a/src/appl/gssftp/ftpd/popen.c
+++ b/src/appl/gssftp/ftpd/popen.c
@@ -50,8 +50,10 @@ static char sccsid[] = "@(#)popen.c	5.9 (Berkeley) 2/25/91";
 #include <vfork.h>
 #endif
 
+#include "extern.h"
+
 /*
- * Special version of popen which avoids call to shell.  This insures noone
+ * Special version of popen which avoids call to shell.  This insures no-one
  * may create a pipe to a hidden program as a side effect of a list or dir
  * command.
  */
@@ -65,13 +67,13 @@ FILE *
 ftpd_popen(program, type)
 	char *program, *type;
 {
-	register char *cp;
-	FILE *volatile iop;
+	char *cp;
+	FILE *iop;
 	int argc, gargc, pdes[2], pid;
 	char **pop, *argv[MAX_ARGV], *gargv[MAX_GARGV], *vv[2];
-	extern char **ftpglob(), **copyblk();
+	extern char **ftpglob();
 
-	if (*type != 'r' && *type != 'w' || type[1])
+	if ((*type != 'r' && *type != 'w') || type[1])
 		return(NULL);
 
 	if (!pids) {
@@ -143,11 +145,14 @@ ftpd_popen(program, type)
 
 pfree:	for (argc = 1; argv[argc] != NULL; argc++) {
 		blkfree((char **)argv[argc]);
+#if 0
 		free((char *)argv[argc]);
+#endif
 	}
 	return(iop);
 }
 
+int
 ftpd_pclose(iop)
 	FILE *iop;
 {
diff --git a/src/appl/gssftp/ftpd/secure.h b/src/appl/gssftp/ftpd/secure.h
index a249998af..60a9db4ce 100644
--- a/src/appl/gssftp/ftpd/secure.h
+++ b/src/appl/gssftp/ftpd/secure.h
@@ -1,4 +1,19 @@
+#include <stdio.h>
+
 #define CRED_DECL	extern AUTH_DAT kdata;
-#define SESSION		&kdata.session
+#define SESSION		kdata.session
 #define myaddr		data_source
 #define hisaddr		data_dest
+
+int secure_flush PROTOTYPE((int));
+int secure_putc PROTOTYPE((int, FILE *));
+int secure_getc PROTOTYPE((FILE *));
+int secure_write PROTOTYPE((int, unsigned char *, unsigned int));
+int secure_read PROTOTYPE((int, char *, unsigned int));
+void secure_gss_error PROTOTYPE((OM_uint32 maj_stat, OM_uint32 min_stat, char *s));
+
+#if defined(STDARG) || (defined(__STDC__) && ! defined(VARARGS)) || defined(HAVE_STDARG_H)
+void secure_error(char *, ...);
+#else
+void secure_error();
+#endif