From: Dan Harkless Date: Tue, 29 Feb 2000 05:59:16 +0000 (+0000) Subject: Changed "echo > stamp-h.in" in Makefile.in to "date > stamp-h.in" so that X-Git-Tag: nmh-1_0~75 X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=b1450ec537bd31be606633aa363201cc2ed95b9a;p=mmh Changed "echo > stamp-h.in" in Makefile.in to "date > stamp-h.in" so that stamp-h.in will be different each time configure.in and related files are changed, making it easier to check it in (which is necessary to prevent unnecessary autoconf calls). My declaration of initgroups() in slocal.c to eliminate the "no prototype" warning wasn't portable (FreeBSD 3.[23] choked). Now use AC_EGREP_HEADER to see where initgroups() is declared, if anywhere. --- diff --git a/ChangeLog b/ChangeLog index 7a2a57f..9ac95ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Mon Feb 28 21:21:31 2000 Dan Harkless +Mon Feb 28 21:50:29 2000 Dan Harkless * Upped the version number to 1.0.3+dev (ideally this should be done by whoever makes a release tar file, immediately after doing @@ -8,10 +8,21 @@ Mon Feb 28 21:21:31 2000 Dan Harkless patch, posted to comp.mail.mh, which he says prevents loss of mail when inc'ing into a full filesystem. + * Changed "echo > stamp-h.in" in Makefile.in to "date > stamp-h.in" + so that stamp-h.in will be different each time configure.in and + related files are changed, making it easier to check it in (which + is necessary to prevent unnecessary autoconf calls). + + * My declaration of initgroups() in slocal.c to eliminate the "no + prototype" warning wasn't portable (FreeBSD 3.[23] choked). Now + use AC_EGREP_HEADER to see where initgroups() is declared, if + anywhere. + Sun Feb 20 12:17:15 2000 Ruud de Rooij * Fix security hole in mhshowsbr.c which allowed untrusted shell code to be executed. + * Released nmh 1.0.3. Thu Feb 10 10:54:36 2000 Dan Harkless diff --git a/Makefile.in b/Makefile.in index c6594d1..ed09153 100644 --- a/Makefile.in +++ b/Makefile.in @@ -138,13 +138,13 @@ stamp-h: config.h.in config.status config.h.in: stamp-h.in stamp-h.in: configure.in acconfig.h aclocal.m4 cd $(srcdir) && autoheader - echo > $@ + date > $@ # rebuild all autoconf files reset: cd $(srcdir) && autoheader cd $(srcdir) && autoconf - cd $(srcdir) && echo > stamp-h.in + cd $(srcdir) && date > stamp-h.in # name of new nmh distribution tar file tarfile = nmh-$(VERSION).tar.gz diff --git a/acconfig.h b/acconfig.h index dda87bf..146d00a 100644 --- a/acconfig.h +++ b/acconfig.h @@ -264,6 +264,11 @@ /* Define if your system has db1/ndbm.h instead of ndbm.h (ppclinux) */ #undef HAVE_DB1_NDBM_H +/* Define to the header containing the declaration of initgroups() on your + system, if any. AIX 4.[13] and SunOS 4.1.3 have the function in libc but + don't have a declaration anywhere. */ +#undef INITGROUPS_HEADER + /* Define if your system actually has a prototype for snprintf() in (or a file it includes) rather than just having a "stealth" definition of it in libc.a the way AIX 4.1 does. */ diff --git a/config.h.in b/config.h.in index 81af712..e6073bd 100644 --- a/config.h.in +++ b/config.h.in @@ -87,11 +87,11 @@ #define BUILTIN_FTP 1 /* - * If you enable POP support, this is the the port name that nmh will use. Make - * sure this is defined in your /etc/services file (or its NIS/NIS+ equivalent). - * If you are using KPOP, you will need to change this to "kpop" unless you want - * to be able to use both POP3 _and_ Kerberized POP and plan to use inc and - * msgchk's -kpop switch every time in the latter case. + * If you enable POP support, this is the the port name + * that nmh will use. Make sure this is defined in your + * /etc/services file (or its NIS/NIS+ equivalent). If you + * are using KPOP, you will probably need to change this + * to "kpop". */ #define POPSERVICE "pop3" @@ -299,6 +299,11 @@ /* Define if your system has gethostbyname */ #undef HAVE_GETHOSTBYNAME +/* Define to the header containing the declaration of initgroups() on your + system, if any. AIX 4.[13] and SunOS 4.1.3 have the function in libc but + don't have a declaration anywhere. */ +#undef INITGROUPS_HEADER + /* Define if your system actually has a prototype for snprintf() in (or a file it includes) rather than just having a "stealth" definition of it in libc.a the way AIX 4.1 does. */ diff --git a/configure b/configure index 357e2ef..c4b66cb 100755 --- a/configure +++ b/configure @@ -1030,7 +1030,7 @@ else int main() { /* Ultrix mips cc rejects this. */ -typedef int charset[2]; const charset x = {0,0}; +typedef int charset[2]; const charset x; /* SunOS 4.1.1 cc rejects this. */ char const *const *ccp; char **p; @@ -2910,6 +2910,39 @@ done cat > conftest.$ac_ext < +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "initgroups" >/dev/null 2>&1; then + rm -rf conftest* + cat >> confdefs.h <<\EOF +#define INITGROUPS_HEADER +EOF + +else + rm -rf conftest* + cat > conftest.$ac_ext < +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "initgroups" >/dev/null 2>&1; then + rm -rf conftest* + cat >> confdefs.h <<\EOF +#define INITGROUPS_HEADER +EOF + +fi +rm -f conftest* + +fi +rm -f conftest* + + +cat > conftest.$ac_ext < EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | @@ -2924,12 +2957,12 @@ rm -f conftest* echo $ac_n "checking for modf""... $ac_c" 1>&6 -echo "configure:2928: checking for modf" >&5 +echo "configure:2961: checking for modf" >&5 if eval "test \"`echo '$''{'ac_cv_func_modf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_modf=yes" else @@ -2970,7 +3003,7 @@ if eval "test \"`echo '$ac_cv_func_'modf`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for modf in -lm""... $ac_c" 1>&6 -echo "configure:2974: checking for modf in -lm" >&5 +echo "configure:3007: checking for modf in -lm" >&5 ac_lib_var=`echo m'_'modf | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2978,7 +3011,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3020,12 +3053,12 @@ fi echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:3024: checking for gethostbyname" >&5 +echo "configure:3057: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -3066,7 +3099,7 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:3070: checking for gethostbyname in -lnsl" >&5 +echo "configure:3103: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3074,7 +3107,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3111,7 +3144,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lresolv""... $ac_c" 1>&6 -echo "configure:3115: checking for gethostbyname in -lresolv" >&5 +echo "configure:3148: checking for gethostbyname in -lresolv" >&5 ac_lib_var=`echo resolv'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3119,7 +3152,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3162,12 +3195,12 @@ fi fi echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:3166: checking for socket" >&5 +echo "configure:3199: checking for socket" >&5 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -3208,7 +3241,7 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:3212: checking for socket in -lsocket" >&5 +echo "configure:3245: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3216,7 +3249,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3259,12 +3292,12 @@ fi echo $ac_n "checking for ruserpass""... $ac_c" 1>&6 -echo "configure:3263: checking for ruserpass" >&5 +echo "configure:3296: checking for ruserpass" >&5 if eval "test \"`echo '$''{'ac_cv_func_ruserpass'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_ruserpass=yes" else @@ -3305,12 +3338,12 @@ if eval "test \"`echo '$ac_cv_func_'ruserpass`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for _ruserpass""... $ac_c" 1>&6 -echo "configure:3309: checking for _ruserpass" >&5 +echo "configure:3342: checking for _ruserpass" >&5 if eval "test \"`echo '$''{'ac_cv_func__ruserpass'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__ruserpass=yes" else @@ -3351,7 +3384,7 @@ if eval "test \"`echo '$ac_cv_func_'_ruserpass`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for _ruserpass in -lsocket""... $ac_c" 1>&6 -echo "configure:3355: checking for _ruserpass in -lsocket" >&5 +echo "configure:3388: checking for _ruserpass in -lsocket" >&5 ac_lib_var=`echo socket'_'_ruserpass | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3359,7 +3392,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3416,7 +3449,7 @@ fi termcap_curses_order="termcap curses ncurses" for lib in $termcap_curses_order; do echo $ac_n "checking for tgetent in -l${lib}""... $ac_c" 1>&6 -echo "configure:3420: checking for tgetent in -l${lib}" >&5 +echo "configure:3453: checking for tgetent in -l${lib}" >&5 ac_lib_var=`echo ${lib}'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3424,7 +3457,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l${lib} $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3459,12 +3492,12 @@ done echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:3463: checking for dbm_open" >&5 +echo "configure:3496: checking for dbm_open" >&5 if eval "test \"`echo '$''{'ac_cv_func_dbm_open'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dbm_open=yes" else @@ -3505,7 +3538,7 @@ if eval "test \"`echo '$ac_cv_func_'dbm_open`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -lndbm""... $ac_c" 1>&6 -echo "configure:3509: checking for dbm_open in -lndbm" >&5 +echo "configure:3542: checking for dbm_open in -lndbm" >&5 ac_lib_var=`echo ndbm'_'dbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3513,7 +3546,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lndbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3550,7 +3583,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:3554: checking for dbm_open in -ldbm" >&5 +echo "configure:3587: checking for dbm_open in -ldbm" >&5 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3558,7 +3591,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3605,17 +3638,17 @@ for ac_hdr in db1/ndbm.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3609: checking for $ac_hdr" >&5 +echo "configure:3642: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3619: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3648,12 +3681,12 @@ if test x$with_hesiod != x -a x$with_hesiod != xno; then HESIOD_LIBS="-L$with_hesiod/lib" fi echo $ac_n "checking for res_send""... $ac_c" 1>&6 -echo "configure:3652: checking for res_send" >&5 +echo "configure:3685: checking for res_send" >&5 if eval "test \"`echo '$''{'ac_cv_func_res_send'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_res_send=yes" else @@ -3694,7 +3727,7 @@ if eval "test \"`echo '$ac_cv_func_'res_send`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for res_send in -lresolv""... $ac_c" 1>&6 -echo "configure:3698: checking for res_send in -lresolv" >&5 +echo "configure:3731: checking for res_send in -lresolv" >&5 ac_lib_var=`echo resolv'_'res_send | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3702,7 +3735,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3743,7 +3776,7 @@ fi fi echo $ac_n "checking for hes_resolve in -lhesiod""... $ac_c" 1>&6 -echo "configure:3747: checking for hes_resolve in -lhesiod" >&5 +echo "configure:3780: checking for hes_resolve in -lhesiod" >&5 ac_lib_var=`echo hesiod'_'hes_resolve | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3751,7 +3784,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lhesiod $HESIOD_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3796,7 +3829,7 @@ if test x$with_krb4 != x -a x$with_krb4 != xno; then KRB4_INCLUDES="-I/usr/include/kerberosIV" fi echo $ac_n "checking for krb_rd_req in -lkrb4""... $ac_c" 1>&6 -echo "configure:3800: checking for krb_rd_req in -lkrb4" >&5 +echo "configure:3833: checking for krb_rd_req in -lkrb4" >&5 ac_lib_var=`echo krb4'_'krb_rd_req | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3804,7 +3837,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb4 $KRB4_LIBS -ldes425 -lkrb5 -lcrypto -lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3834,7 +3867,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for krb_rd_req in -lkrb""... $ac_c" 1>&6 -echo "configure:3838: checking for krb_rd_req in -lkrb" >&5 +echo "configure:3871: checking for krb_rd_req in -lkrb" >&5 ac_lib_var=`echo krb'_'krb_rd_req | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3842,7 +3875,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb $KRB4_LIBS -ldes $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3883,12 +3916,12 @@ nmh_save_LIBS="$LIBS" LIBS="$TERMLIB $LIBS" echo $ac_n "checking if an include file defines ospeed""... $ac_c" 1>&6 -echo "configure:3887: checking if an include file defines ospeed" >&5 +echo "configure:3920: checking if an include file defines ospeed" >&5 if eval "test \"`echo '$''{'nmh_cv_decl_ospeed_include_defines'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if HAVE_TERMIOS_H @@ -3901,7 +3934,7 @@ int main() { ospeed = 0; ; return 0; } EOF -if { (eval echo configure:3905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* nmh_cv_decl_ospeed_include_defines=yes else @@ -3917,19 +3950,19 @@ echo "$ac_t""$nmh_cv_decl_ospeed_include_defines" 1>&6 if test $nmh_cv_decl_ospeed_include_defines = no; then echo $ac_n "checking if you must define ospeed""... $ac_c" 1>&6 -echo "configure:3921: checking if you must define ospeed" >&5 +echo "configure:3954: checking if you must define ospeed" >&5 if eval "test \"`echo '$''{'nmh_cv_decl_ospeed_must_define'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* nmh_cv_decl_ospeed_must_define=yes else @@ -3964,12 +3997,12 @@ fi LIBS="$nmh_save_LIBS" echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:3968: checking return type of signal handlers" >&5 +echo "configure:4001: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3986,7 +4019,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:3990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -4005,12 +4038,12 @@ EOF echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:4009: checking for pid_t" >&5 +echo "configure:4042: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4038,12 +4071,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:4042: checking for off_t" >&5 +echo "configure:4075: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4071,12 +4104,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:4075: checking for uid_t in sys/types.h" >&5 +echo "configure:4108: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -4105,12 +4138,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:4109: checking for mode_t" >&5 +echo "configure:4142: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4138,12 +4171,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:4142: checking for size_t" >&5 +echo "configure:4175: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4172,12 +4205,12 @@ fi echo $ac_n "checking for sigset_t""... $ac_c" 1>&6 -echo "configure:4176: checking for sigset_t" >&5 +echo "configure:4209: checking for sigset_t" >&5 if eval "test \"`echo '$''{'nmh_cv_type_sigset_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4185,7 +4218,7 @@ int main() { sigset_t tempsigset; ; return 0; } EOF -if { (eval echo configure:4189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* nmh_cv_type_sigset_t=yes else @@ -4206,12 +4239,12 @@ EOF fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:4210: checking for st_blksize in struct stat" >&5 +echo "configure:4243: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4219,7 +4252,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:4223: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -4241,12 +4274,12 @@ fi echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:4245: checking for tm_gmtoff in struct tm" >&5 +echo "configure:4278: checking for tm_gmtoff in struct tm" >&5 if eval "test \"`echo '$''{'nmh_cv_struct_tm_gmtoff'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -4262,7 +4295,7 @@ int main() { struct tm temptm; temptm.tm_gmtoff = 0; ; return 0; } EOF -if { (eval echo configure:4266: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4299: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* nmh_cv_struct_tm_gmtoff=yes else @@ -4283,7 +4316,7 @@ EOF fi echo $ac_n "checking what style of signals to use""... $ac_c" 1>&6 -echo "configure:4287: checking what style of signals to use" >&5 +echo "configure:4320: checking what style of signals to use" >&5 if test $ac_cv_func_sigaction = yes -a $ac_cv_func_sigprocmask = yes; then signals_style=POSIX_SIGNALS cat >> confdefs.h <<\EOF @@ -4321,7 +4354,7 @@ fi echo "$ac_t""$signals_style" 1>&6 echo $ac_n "checking where signal.h is located""... $ac_c" 1>&6 -echo "configure:4325: checking where signal.h is located" >&5 +echo "configure:4358: checking where signal.h is located" >&5 if eval "test \"`echo '$''{'nmh_cv_path_signal_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/configure.in b/configure.in index f211ca0..0afb927 100644 --- a/configure.in +++ b/configure.in @@ -359,7 +359,7 @@ AC_CHECK_FUNCS(waitpid wait3 sigaction sigprocmask sigblock sigsetmask \ sighold sigrelse writev lstat uname tzset killpg mkstemp \ sethostent) -dnl solaris screws ths up +dnl solaris screws this up AC_CHECK_FUNC(gethostbyname, [AC_DEFINE(HAVE_GETHOSTBYNAME)], AC_CHECK_LIB(nsl, gethostbyname, [AC_DEFINE(HAVE_GETHOSTBYNAME)] ) ) @@ -370,6 +370,17 @@ AC_TRY_LINK([#include ], [sigsetjmp((void *)0, 0);], AC_REPLACE_FUNCS(snprintf strerror strdup) +dnl Look for the initgroups() declaration. On AIX 4.[13] and Solaris 4.1.3, +dnl the function is defined in libc but there's no declaration in any system +dnl header. +dnl +dnl On Solaris 2.[456], the declaration is in . On HP-UX 9-11 and +dnl (reportedly) FreeBSD 3.[23], it's in . Any other locations we +dnl need to check? +AC_EGREP_HEADER(initgroups, grp.h, AC_DEFINE(INITGROUPS_HEADER, ), + AC_EGREP_HEADER(initgroups, unistd.h, + AC_DEFINE(INITGROUPS_HEADER, ))) + dnl On AIX 4.1, snprintf() is defined in libc.a but there's no prototype in dnl or elsewhere. Apparently it's not officially supported (though it dnl seems to work perfectly and IBM apparently uses it in internal code). diff --git a/stamp-h.in b/stamp-h.in index 139597f..04a20d9 100644 --- a/stamp-h.in +++ b/stamp-h.in @@ -1,2 +1 @@ - - +Mon Feb 28 21:53:23 PST 2000 diff --git a/uip/slocal.c b/uip/slocal.c index b665280..e12b940 100644 --- a/uip/slocal.c +++ b/uip/slocal.c @@ -29,14 +29,15 @@ #include #include -#include /* initgroups() is here on Solaris 2.6 */ -#include /* initgroups() is here on HP-UX 10.20 */ - +#ifdef INITGROUPS_HEADER +#include INITGROUPS_HEADER +#else /* On AIX 4.1, initgroups() is defined and even documented (giving the parameter - types as "char*" and "int"), but doesn't have a prototype in any of the - system header files. On other OSes, this should be a duplicate prototype - that won't cause any errors or warnings. */ -extern int initgroups(const char*, gid_t); + types as char* and int), but doesn't have a prototype in any of the system + header files. AIX 4.3 and SunOS 4.1.3 have the same problem. */ +extern int initgroups(char*, int); +#endif + #ifdef HAVE_DB1_NDBM_H #include