From 55db31afbeb4482244c1d5edfe399aeb145c1569 Mon Sep 17 00:00:00 2001 From: Unknown User d91-jda Date: Wed, 7 Feb 1996 10:48:34 +0000 Subject: [PATCH] General cleanup of old and ugly code. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@235 ec53bebd-3082-4978-b11e-865c3cabbd6b --- appl/telnet/acconfig.h | 11 ++ appl/telnet/config.h.in | 11 ++ appl/telnet/configure | 312 ++++++++++++++++++++++++--------- appl/telnet/configure.in | 12 +- appl/telnet/telnet/externs.h | 2 +- appl/telnet/telnetd/defs.h | 2 +- appl/telnet/telnetd/sys_term.c | 2 +- lib/des/enc_writ.c | 1 + lib/des/read_pwd.c | 124 +++++++------ lib/des/rnd_keys.c | 6 +- lib/kafs/afssys.c | 9 +- lib/kafs/afssysdefs.h | 4 +- 12 files changed, 331 insertions(+), 165 deletions(-) diff --git a/appl/telnet/acconfig.h b/appl/telnet/acconfig.h index f6691939b..bcbcf5ae6 100644 --- a/appl/telnet/acconfig.h +++ b/appl/telnet/acconfig.h @@ -88,4 +88,15 @@ #define unix /* well, ok... */ #endif +/* + * SunOS braindamage! (Sun include files are generally braindead) + */ +#if (defined(sun) || defined(__sun)) +#if defined(__svr4__) || defined(__SVR4) +#define SunOS 5 +#else +#define SunOS 4 +#endif +#endif + #endif /* T_CONFIG_H */ diff --git a/appl/telnet/config.h.in b/appl/telnet/config.h.in index cf377709a..627aba1f3 100644 --- a/appl/telnet/config.h.in +++ b/appl/telnet/config.h.in @@ -166,4 +166,15 @@ #define unix /* well, ok... */ #endif +/* + * SunOS braindamage! (Sun include files are generally braindead) + */ +#if (defined(sun) || defined(__sun)) +#if defined(__svr4__) || defined(__SVR4) +#define SunOS 5 +#else +#define SunOS 4 +#endif +#endif + #endif /* T_CONFIG_H */ diff --git a/appl/telnet/configure b/appl/telnet/configure index ae2d5e791..485c28e43 100755 --- a/appl/telnet/configure +++ b/appl/telnet/configure @@ -1,7 +1,7 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.4 +# Generated automatically using autoconf version 2.6 # Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -42,9 +42,22 @@ target=NONE verbose= x_includes=NONE x_libraries=NONE +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datadir='${prefix}/share' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +libdir='${exec_prefix}/lib' +includedir='${prefix}/include' +oldincludedir='/usr/include' +infodir='${prefix}/info' +mandir='${prefix}/man' # Initialize some other variables. subdirs= +MFLAGS= MAKEFLAGS= ac_prev= for ac_option @@ -66,9 +79,14 @@ do case "$ac_option" in - -build | --build | --buil | --bui | --bu | --b) + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir="$ac_optarg" ;; + + -build | --build | --buil | --bui | --bu) ac_prev=build ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=* | --b=*) + -build=* | --build=* | --buil=* | --bui=* | --bu=*) build="$ac_optarg" ;; -cache-file | --cache-file | --cache-fil | --cache-fi \ @@ -78,6 +96,12 @@ do | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) cache_file="$ac_optarg" ;; + -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ + | --da=*) + datadir="$ac_optarg" ;; + -disable-* | --disable-*) ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` # Reject names that are not valid shell variable names. @@ -128,12 +152,29 @@ Configuration: Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX [$ac_default_prefix] - --exec-prefix=PREFIX install architecture-dependent files in PREFIX + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX [same as prefix] + --bindir=DIR user executables in DIR [EPREFIX/bin] + --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] + --libexecdir=DIR program executables in DIR [EPREFIX/libexec] + --datadir=DIR read-only architecture-independent data in DIR + [PREFIX/share] + --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data in DIR + [PREFIX/com] + --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] + --libdir=DIR object code libraries in DIR [EPREFIX/lib] + --includedir=DIR C header files in DIR [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] + --infodir=DIR info documentation in DIR [PREFIX/info] + --mandir=DIR man documentation in DIR [PREFIX/man] --srcdir=DIR find the sources in DIR [configure dir or ..] --program-prefix=PREFIX prepend PREFIX to installed program names --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM run sed PROGRAM on installed program names + --program-transform-name=PROGRAM + run sed PROGRAM on installed program names +EOF + cat << EOF Host type: --build=BUILD configure for building on BUILD [BUILD=HOST] --host=HOST configure for HOST [guessed] @@ -145,8 +186,10 @@ Features and packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --x-includes=DIR X include files are in DIR --x-libraries=DIR X library files are in DIR ---enable and --with options recognized:$ac_help EOF + if test -n "$ac_help"; then + echo "--enable and --with options recognized:$ac_help" + fi exit 0 ;; -host | --host | --hos | --ho) @@ -154,6 +197,44 @@ EOF -host=* | --host=* | --hos=* | --ho=*) host="$ac_optarg" ;; + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir="$ac_optarg" ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir="$ac_optarg" ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir="$ac_optarg" ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir="$ac_optarg" ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst \ + | --locals | --local | --loca | --loc | --lo) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* \ + | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + localstatedir="$ac_optarg" ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir="$ac_optarg" ;; + -nfp | --nfp | --nf) # Obsolete; use --without-fp. with_fp=no ;; @@ -166,6 +247,15 @@ EOF | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) no_recursion=yes ;; + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir="$ac_optarg" ;; + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) ac_prev=prefix ;; -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) @@ -206,6 +296,23 @@ EOF | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir="$ac_optarg" ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir="$ac_optarg" ;; + -site | --site | --sit) ac_prev=site ;; -site=* | --site=* | --sit=*) @@ -216,6 +323,13 @@ EOF -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) srcdir="$ac_optarg" ;; + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir="$ac_optarg" ;; + -target | --target | --targe | --targ | --tar | --ta | --t) ac_prev=target ;; -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) @@ -225,7 +339,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.4" + echo "configure generated by autoconf version 2.6" exit 0 ;; -with-* | --with-*) @@ -271,7 +385,7 @@ EOF -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } ;; - *) + *) if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then echo "configure: warning: $ac_option: invalid host type" 1>&2 fi @@ -390,9 +504,12 @@ fi ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_cpp='echo $CPP $CPPFLAGS 1>&5; +$CPP $CPPFLAGS' +ac_compile='echo ${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5; +${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' +ac_link='echo ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5; +${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. @@ -460,6 +577,7 @@ else ac_cv_prog_gcc=no fi fi + echo "$ac_t""$ac_cv_prog_gcc" 1>&6 if test $ac_cv_prog_gcc = yes; then GCC=yes @@ -477,7 +595,8 @@ fi rm -f conftest* fi - echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6 + +echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6 if test $ac_cv_prog_gcc_g = yes; then CFLAGS="-g -O" else @@ -532,7 +651,7 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error @@ -546,7 +665,7 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error @@ -634,10 +753,17 @@ else esac done IFS="$ac_save_ifs" - # As a last resort, use the slow shell script. - test -z "$ac_cv_path_install" && ac_cv_path_install="$ac_install_sh" + fi - INSTALL="$ac_cv_path_install" + if test "${ac_cv_path_install+set}" = set; then + INSTALL="$ac_cv_path_install" + else + # As a last resort, use the slow shell script. We don't cache a + # path for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the path is relative. + INSTALL="$ac_install_sh" + fi fi echo "$ac_t""$INSTALL" 1>&6 @@ -653,7 +779,7 @@ 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 @@ -679,6 +805,7 @@ fi rm -f conftest* fi + echo "$ac_t""$ac_cv_type_signal" 1>&6 cat >> confdefs.h <&6 else cat > conftest.$ac_ext <&6 echo $ac_n "checking for authentication""... $ac_c" 1>&6 # Check whether --enable-authentication or --disable-authentication was given. -enableval="$enable_authentication" -if test -n "$enableval"; then +if test "${enable_authentication+set}" = set; then + enableval="$enable_authentication" if test "$enableval" = no; then do_authentication=no @@ -769,8 +896,8 @@ echo "$ac_t""$telnet_cv_opt_authentication" 1>&6 echo $ac_n "checking for encryption""... $ac_c" 1>&6 # Check whether --enable-encryption or --disable-encryption was given. -enableval="$enable_encryption" -if test -n "$enableval"; then +if test "${enable_encryption+set}" = set; then + enableval="$enable_encryption" if test "$enableval" = no; then do_encryption=no @@ -817,8 +944,8 @@ echo "$ac_t""$telnet_cv_opt_encryption" 1>&6 echo $ac_n "checking for kerberos tree""... $ac_c" 1>&6 telnet_athena_default=yes # Check whether --with-athena or --without-athena was given. -withval="$with_athena" -if test -n "$withval"; then +if test "${with_athena+set}" = set; then + withval="$with_athena" case "$withval" in yes) @@ -885,8 +1012,8 @@ echo "$ac_t""$telnet_msg" 1>&6 echo $ac_n "checking for default im""... $ac_c" 1>&6 # Check whether --enable-default-im or --disable-default-im was given. -enableval="$enable_default_im" -if test -n "$enableval"; then +if test "${enable_default_im+set}" = set; then + enableval="$enable_default_im" if test "$enableval" != yes; then @@ -958,13 +1085,14 @@ EOF if test -f /lib/pse.exp ; then LIBS="$LIBS -bI:/lib/pse.exp"; fi echo $ac_n "checking for -ltermcap""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_lib_termcap'+set}'`\" = set"; then +ac_lib_var=`echo termcap | tr './+' '__p'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&6 - ac_tr_lib=HAVE_LIB`echo termcap | tr '[a-z]' '[A-Z]'` + ac_tr_lib=HAVE_LIB`echo termcap | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` cat >> confdefs.h <&6 -if eval "test \"`echo '$''{'ac_cv_lib_curses'+set}'`\" = set"; then +ac_lib_var=`echo curses | tr './+' '__p'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&6 - ac_tr_lib=HAVE_LIB`echo curses | tr '[a-z]' '[A-Z]'` + ac_tr_lib=HAVE_LIB`echo curses | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` cat >> confdefs.h <&6 -if eval "test \"`echo '$''{'ac_cv_lib_socket'+set}'`\" = set"; then +ac_lib_var=`echo socket | tr './+' '__p'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&6 - ac_tr_lib=HAVE_LIB`echo socket | tr '[a-z]' '[A-Z]'` + ac_tr_lib=HAVE_LIB`echo socket | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` cat >> confdefs.h <&6 -if eval "test \"`echo '$''{'ac_cv_lib_nsl'+set}'`\" = set"; then +ac_lib_var=`echo nsl | tr './+' '__p'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&6 - ac_tr_lib=HAVE_LIB`echo nsl | tr '[a-z]' '[A-Z]'` + ac_tr_lib=HAVE_LIB`echo nsl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` cat >> confdefs.h <&6 else cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -char $ac_func(); +char $ac_func(); int main() { return 0; } int t() { @@ -1171,13 +1302,13 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -char $ac_func(); +char $ac_func(); int main() { return 0; } int t() { @@ -1205,7 +1336,7 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'` + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` cat >> confdefs.h <&6 else cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -char $ac_func(); +char $ac_func(); int main() { return 0; } int t() { @@ -1256,7 +1387,7 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'` + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` cat >> confdefs.h <&6 else cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -char $ac_func(); +char $ac_func(); int main() { return 0; } int t() { @@ -1307,7 +1438,7 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'` + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` cat >> confdefs.h <&6 -if eval "test \"`echo '$''{'ac_cv_lib_util'+set}'`\" = set"; then +ac_lib_var=`echo util | tr './+' '__p'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" cat > conftest.$ac_ext <&6 - ac_tr_lib=HAVE_LIB`echo util | tr '[a-z]' '[A-Z]'` + ac_tr_lib=HAVE_LIB`echo util | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` cat >> confdefs.h <&6 else cat > conftest.$ac_ext < EOF @@ -1388,7 +1520,7 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'` + ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'` cat >> confdefs.h <&6 else cat > conftest.$ac_ext < EOF @@ -1424,7 +1556,7 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'` + ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'` cat >> confdefs.h <&6 else cat > conftest.$ac_ext < EOF @@ -1460,7 +1592,7 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'` + ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'` cat >> confdefs.h <&6 -krb_cv_sys_streamspty="$ac_cv_func_getmsg" - +krb_cv_sys_streamspty="no" +if expr "`uname -sr`" : "SunOS 4" > /dev/null; then :; else + krb_cv_sys_streamspty="$ac_cv_func_getmsg" +fi if test "$krb_cv_sys_streamspty" = yes; then cat >> confdefs.h <<\EOF #define STREAMSPTY 1 @@ -1568,7 +1700,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.4" + echo "$CONFIG_STATUS generated by autoconf version 2.6" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -1581,8 +1713,8 @@ ac_given_INSTALL="$INSTALL" trap 'rm -fr `echo "Makefile libtelnet/Makefile telnet/Makefile telnetd/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -# Protect against being on the right side of a sed subst in config.status. -sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\\\&%]/\\\\&/g; +# Protect against being on the right side of a sed subst in config.status. +sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\\\&%]/\\\\&/g; s/@@/%@/; s/@@/@%/; s/@g$/%g/' > conftest.subs <<\CEOF $ac_vpsub $extrasub @@ -1595,6 +1727,18 @@ s%@LIBS@%$LIBS%g s%@exec_prefix@%$exec_prefix%g s%@prefix@%$prefix%g s%@program_transform_name@%$program_transform_name%g +s%@bindir@%$bindir%g +s%@sbindir@%$sbindir%g +s%@libexecdir@%$libexecdir%g +s%@datadir@%$datadir%g +s%@sysconfdir@%$sysconfdir%g +s%@sharedstatedir@%$sharedstatedir%g +s%@localstatedir@%$localstatedir%g +s%@libdir@%$libdir%g +s%@includedir@%$includedir%g +s%@oldincludedir@%$oldincludedir%g +s%@infodir@%$infodir%g +s%@mandir@%$mandir%g s%@CC@%$CC%g s%@RANLIB@%$RANLIB%g s%@CPP@%$CPP%g @@ -1716,7 +1860,7 @@ EOF # Transform confdefs.h into a sed script conftest.vals that substitutes # the proper values into config.h.in to produce config.h. And first: -# Protect against being on the right side of a sed subst in config.status. +# Protect against being on the right side of a sed subst in config.status. # Protect against being in an unquoted here document in config.status. rm -f conftest.vals cat > conftest.hdr <<\EOF diff --git a/appl/telnet/configure.in b/appl/telnet/configure.in index 264b1f2ca..594b012a6 100644 --- a/appl/telnet/configure.in +++ b/appl/telnet/configure.in @@ -275,14 +275,14 @@ AC_CHECK_HEADERS(sys/select.h sys/stream.h sys/strtty.h sys/str_tty.h) AC_CHECK_HEADERS(sys/tty.h termio.h termios.h utmpx.h sys/uio.h) -# -# Simple test for streamspty, based on the existance of getmsg() -# - +# Simple test for streamspty, based on the existance of getmsg(), alas +# this breaks on SunOS4 which have streams but BSD-like ptys AC_MSG_CHECKING(for streamspty) -krb_cv_sys_streamspty="$ac_cv_func_getmsg" - +krb_cv_sys_streamspty="no" +if expr "`uname -sr`" : "SunOS 4" > /dev/null; then :; else + krb_cv_sys_streamspty="$ac_cv_func_getmsg" +fi if test "$krb_cv_sys_streamspty" = yes; then AC_DEFINE(STREAMSPTY) fi diff --git a/appl/telnet/telnet/externs.h b/appl/telnet/telnet/externs.h index e51ce1fdc..e63dc7a3c 100644 --- a/appl/telnet/telnet/externs.h +++ b/appl/telnet/telnet/externs.h @@ -39,7 +39,7 @@ #include #endif /* not with SunOS 4 */ -#if defined(HAVE_SYS_IOCTL_H) && !(defined(sun) && !defined(__svr4__)) +#if defined(HAVE_SYS_IOCTL_H) && SunOS != 4 #include #endif #ifdef HAVE_SYS_FILIO_H diff --git a/appl/telnet/telnetd/defs.h b/appl/telnet/telnetd/defs.h index 98cc6d433..32b10ae1c 100644 --- a/appl/telnet/telnetd/defs.h +++ b/appl/telnet/telnetd/defs.h @@ -64,7 +64,7 @@ /* including both and in SunOS 4 generates a lot of warnings */ -#if defined(HAVE_SYS_IOCTL_H) && !(defined(sun) && !defined(__svr4__)) +#if defined(HAVE_SYS_IOCTL_H) && SunOS != 4 #include #endif #ifdef HAVE_SYS_FILIO_H diff --git a/appl/telnet/telnetd/sys_term.c b/appl/telnet/telnetd/sys_term.c index a4598a4fa..d599276ed 100644 --- a/appl/telnet/telnetd/sys_term.c +++ b/appl/telnet/telnetd/sys_term.c @@ -178,7 +178,7 @@ char *new_login = LOGIN_PATH; * set_termbuf() writes the structure into the kernel. */ - void +void init_termbuf() { # ifdef STREAMSPTY diff --git a/lib/des/enc_writ.c b/lib/des/enc_writ.c index 1ad8c3bc3..1267ba771 100644 --- a/lib/des/enc_writ.c +++ b/lib/des/enc_writ.c @@ -3,6 +3,7 @@ #include #include +#include #include "des_locl.h" extern int LEFT_JUSTIFIED; diff --git a/lib/des/read_pwd.c b/lib/des/read_pwd.c index 90cbc2261..55121dc9c 100644 --- a/lib/des/read_pwd.c +++ b/lib/des/read_pwd.c @@ -44,11 +44,6 @@ struct IOSB { #define NSIG 32 #endif -static void read_till_nl(); -static int read_pw(); -static void recsig(); -static void pushsig(); -static void popsig(); #ifdef MSDOS static int noecho_fgets(); #endif @@ -56,69 +51,43 @@ static int noecho_fgets(); static void (*savsig[NSIG])(); static jmp_buf save; -int des_read_password(key,prompt,verify) -des_cblock *key; -char *prompt; -int verify; - { - int ok; - char buf[BUFSIZ],buff[BUFSIZ]; +static void recsig(int sig) +{ + longjmp(save,1); +} - if ((ok=read_pw(buf,buff,BUFSIZ,prompt,verify)) == 0) - des_string_to_key(buf,key); - bzero(buf,BUFSIZ); - bzero(buff,BUFSIZ); - return(ok); - } +static void pushsig(void) +{ + int i; -int des_read_2passwords(key1,key2,prompt,verify) -des_cblock *key1; -des_cblock *key2; -char *prompt; -int verify; - { - int ok; - char buf[BUFSIZ],buff[BUFSIZ]; + for (i=0; iBUFSIZ)?BUFSIZ:length,prompt,verify); - bzero(buff,BUFSIZ); - return(ret); - } -static void read_till_nl(in) -FILE *in; - { +static void read_till_nl(FILE *in) +{ #define SIZE 4 char buf[SIZE+1]; do { fgets(buf,SIZE,in); - } while (strchr(buf,'\n') == NULL); - } + } while (strchr(buf,'\n') == NULL); +} + + /* return 0 if ok, 1 (or -1) otherwise */ -static int read_pw(buf,buff,size,prompt,verify) -char *buf,*buff; -int size; -char *prompt; -int verify; - { +static int read_pw(char *buf, char *buff, int size, char *prompt,int verify) +{ #ifndef VMS #ifndef MSDOS struct sgttyb tty_orig,tty_new; @@ -235,27 +204,52 @@ error: return(!ok); } -static void pushsig() +int des_read_password(key,prompt,verify) +des_cblock *key; +char *prompt; +int verify; { - int i; + int ok; + char buf[BUFSIZ],buff[BUFSIZ]; - for (i=0; iBUFSIZ)?BUFSIZ:length,prompt,verify); + bzero(buff,BUFSIZ); + return(ret); } + #ifdef MSDOS static int noecho_fgets(buf,size,tty) char *buf; diff --git a/lib/des/rnd_keys.c b/lib/des/rnd_keys.c index efddf2777..9af036a71 100644 --- a/lib/des/rnd_keys.c +++ b/lib/des/rnd_keys.c @@ -4,7 +4,11 @@ #include #include +#ifdef HAVE_SYS_IOCTL_H +#include +#endif +#include #include #include #include @@ -23,7 +27,7 @@ static u_int32_t sequence_index[2]; static int initialized; static des_cblock default_seed = {0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef}; static void -do_initialize() +do_initialize(void) { des_set_odd_parity(&default_seed); des_set_random_generator_seed(&default_seed); diff --git a/lib/kafs/afssys.c b/lib/kafs/afssys.c index e446b42ee..8de4be731 100644 --- a/lib/kafs/afssys.c +++ b/lib/kafs/afssys.c @@ -14,6 +14,8 @@ RCSID("$Header$"); #include #include #include +#include +#include #include #include @@ -31,8 +33,7 @@ RCSID("$Header$"); #define ToAsciiUpper(c) ((c) - 'a' + 'A') static void -foldup(a, b) - char *a, *b; +foldup(char *a, char *b) { for (; *b; a++, b++) if (IsAsciiLower(*b)) @@ -45,7 +46,7 @@ foldup(a, b) #define _PATH_THISCELL "/usr/vice/etc/ThisCell" static char * -k_cell() +k_cell(void) { static char cell[64]; @@ -245,7 +246,7 @@ k_setpag(void) static jmp_buf catch_SIGSYS; static void -SIGSYS_handler() +SIGSYS_handler(int sig) { errno = 0; signal(SIGSYS, SIGSYS_handler); /* Need to reinstall handler on SYSV */ diff --git a/lib/kafs/afssysdefs.h b/lib/kafs/afssysdefs.h index 6a2a1d298..5c593be93 100644 --- a/lib/kafs/afssysdefs.h +++ b/lib/kafs/afssysdefs.h @@ -4,11 +4,11 @@ * This section is for machines using multiple entry point AFS syscalls! */ -#if defined(sun) && !defined(__svr4__) +#if SunOS == 4 #define AFS_SYSCALL 31 #endif -#if defined(sun) && defined(__svr4__) +#if SunOS == 5 #define AFS_SYSCALL 105 #endif