From 8ea93aa530d9b07ae9180cb9363f518a3cccb829 Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Sun, 12 Jul 1998 20:59:42 +0000 Subject: [PATCH] Preliminary fixes for AIX4.3: * Fix static libs on platforms using .a for shared libs * Fix utmp handling for non-hpux platforms with ut_exit different from utmpx. * Include librarymacros in ss configure.in * Remove declarations of h_errno git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10632 dc483132-0cff-0310-8789-dd5450dbe970 --- src/ChangeLog | 6 ++++++ src/aclocal.m4 | 3 +++ src/appl/gssftp/ftpd/ChangeLog | 5 +++++ src/appl/gssftp/ftpd/ftpd.c | 1 - src/appl/user_user/ChangeLog | 4 ++++ src/appl/user_user/client.c | 2 +- src/kadmin/configure.in | 1 + src/kadmin/v5passwdd/proto_serv.c | 2 +- src/util/pty/ChangeLog | 7 +++++++ src/util/pty/update_utmp.c | 2 +- src/util/ss/configure.in | 1 + 11 files changed, 30 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 101976645..3e225822a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -8,6 +8,12 @@ Thu Jul 2 20:41:02 1998 Theodore Y. Ts'o * Makefile.in: Update commands to build the Macintosh MPW Makefile +1998-07-05 + + * aclocal.m4 (enable_shared): If we aren't building shared, then + make sure that SHLIBEXT and friends are not set so that we don't + break on AIX and anything else where STLIBEXT == SHLIBEXT + 1998-05-27 Theodore Ts'o * Makefile.in: Don't depend on $(RM) macro being defined when diff --git a/src/aclocal.m4 b/src/aclocal.m4 index 152246e66..af2d8a923 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -915,6 +915,9 @@ AC_ARG_ENABLE([shared], else RUN_ENV= CC_LINK="$CC_LINK_STATIC" + SHLIBEXT=.so-nobuild + SHLIBVEXT=.so.v-nobuild + SHLIBSEXT=.so.s-nobuild fi], RUN_ENV= CC_LINK="$CC_LINK_STATIC" diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog index a9e0c0ab4..c35c8f8d3 100644 --- a/src/appl/gssftp/ftpd/ChangeLog +++ b/src/appl/gssftp/ftpd/ChangeLog @@ -1,3 +1,8 @@ +1998-07-11 + + * ftpd.c (data;): do not declare h_errno; breaks on AIX and + possibly with other multithreaded systems. + 1998-05-26 Theodore Ts'o * logwtmp.c: Include paths.h if present, and use _PATH_WTMP to diff --git a/src/appl/gssftp/ftpd/ftpd.c b/src/appl/gssftp/ftpd/ftpd.c index 9fa9af2c1..3d027e9ac 100644 --- a/src/appl/gssftp/ftpd/ftpd.c +++ b/src/appl/gssftp/ftpd/ftpd.c @@ -1978,7 +1978,6 @@ char *data; return 0; } if (!(hp = gethostbyname(localname))) { - extern int h_errno; reply(501, "couldn't canonicalize local hostname (%d)\n", h_errno); syslog(LOG_ERR, "Couldn't canonicalize local hostname (%d)", h_errno); return 0; diff --git a/src/appl/user_user/ChangeLog b/src/appl/user_user/ChangeLog index 62f172a1f..f9f76b81d 100644 --- a/src/appl/user_user/ChangeLog +++ b/src/appl/user_user/ChangeLog @@ -1,3 +1,7 @@ +1998-07-05 + + * client.c (main): do not declare h_errno + Wed Feb 18 15:39:14 1998 Tom Yu * Makefile.in: Remove trailing slash from thisconfigdir. Fix up diff --git a/src/appl/user_user/client.c b/src/appl/user_user/client.c index 2cf85ae94..bd5c8a408 100644 --- a/src/appl/user_user/client.c +++ b/src/appl/user_user/client.c @@ -83,7 +83,7 @@ char *argv[]; if ((host = gethostbyname (argv[1])) == NULL) { - extern int h_errno; + if (h_errno == HOST_NOT_FOUND) fprintf (stderr, "uu-client: unknown host \"%s\".\n", argv[1]); diff --git a/src/kadmin/configure.in b/src/kadmin/configure.in index acc8d77bb..189a9aaa2 100644 --- a/src/kadmin/configure.in +++ b/src/kadmin/configure.in @@ -6,6 +6,7 @@ AC_PROG_AWK AC_CHECK_HEADERS(unistd.h stdlib.h krb_db.h kdc.h alloca.h sys/time.h sys/select.h) AC_CHECK_FUNCS(ftime timezone getcwd strstr waitpid vsprintf) AC_REPLACE_FUNCS([memmove strftime]) +AC_HEADER_TIME CHECK_SIGNALS CHECK_WAIT_TYPE CHECK_SETJMP diff --git a/src/kadmin/v5passwdd/proto_serv.c b/src/kadmin/v5passwdd/proto_serv.c index bda5e3660..5978786a2 100644 --- a/src/kadmin/v5passwdd/proto_serv.c +++ b/src/kadmin/v5passwdd/proto_serv.c @@ -27,9 +27,9 @@ * protocol as implemented in lib/krb5/os/adm_conn.c. Any changes * in one module must be reflected in the other. */ -#include #define NEED_SOCKETS #include "k5-int.h" +#include #include "com_err.h" #include "kadm5_defs.h" #include "adm.h" diff --git a/src/util/pty/ChangeLog b/src/util/pty/ChangeLog index 48d50d05b..46919b61f 100644 --- a/src/util/pty/ChangeLog +++ b/src/util/pty/ChangeLog @@ -1,3 +1,10 @@ +1998-07-05 + + * update_utmp.c (pty_update_utmp): If the ut_exit differs test + indicates the structures differ, and we don't have a special case, + do nothing rather than trying to copy the field. It's not worth + breaking the build over. + Mon Apr 6 19:35:33 1998 Tom Yu * update_utmp.c (pty_update_utmp): Don't record LOGIN_PROCESS diff --git a/src/util/pty/update_utmp.c b/src/util/pty/update_utmp.c index d60d99fa5..d131b046e 100644 --- a/src/util/pty/update_utmp.c +++ b/src/util/pty/update_utmp.c @@ -146,7 +146,7 @@ long pty_update_utmp (process_type, pid, username, line, host, flags) utx.ut_exit.__e_termination = ent.ut_exit.e_termination; utx.ut_exit.__e_exit = ent.ut_exit.e_exit; #else - utx.ut_exit = ent.ut_exit; + /*xxx do nothing for now; we don't even know the structure member exists*/ #endif #endif utx.ut_tv.tv_sec = ent.ut_time; diff --git a/src/util/ss/configure.in b/src/util/ss/configure.in index 6a24f459f..d3cae5064 100644 --- a/src/util/ss/configure.in +++ b/src/util/ss/configure.in @@ -1,5 +1,6 @@ AC_INIT(ct.y) CONFIG_RULES +AC_PROG_INSTALL AC_PROG_LEX AC_PROG_YACC AC_PROG_AWK -- 2.26.2