diff --git a/eurofile/.Config.in b/eurofile/.Config.in index 59834350..68de77ae 100644 --- a/eurofile/.Config.in +++ b/eurofile/.Config.in @@ -3,12 +3,17 @@ comment 'Options for eurofile' comment 'eftp4linux, an implementation of the EUROFILE transfer protocol' bool 'eftd, an EUROFILE server / daemon' CONFIG_EFTD if [ "$CONFIG_EFTD" = "y" ]; then - CONFIG_EFTD_WUAUTH=${CONFIG_EFTD_WUAUTH:-"y"} - bool ' use wu-ftpd authentification for eftd' CONFIG_EFTD_WUAUTH + bool ' use wu-ftpd authentication for eftd' CONFIG_EFTD_WUAUTH + string ' default MSN used to listen on for incoming connections' CONFIG_EFTD_SERVER_MSN + bool ' install a default sysvinit compatible eftd.sh file' CONFIG_EFT_INSTALL_EFTD_SH fi bool 'eftp, an EUROFILE client with command line user interface' CONFIG_EFTP if [ "$CONFIG_EFTP" = "y" ]; then - CONFIG_EFTP_READLINE=${CONFIG_EFTP_READLINE:-"y"} - bool ' command line editing with GNU readline for eftp' CONFIG_EFTP_READLINE + bool ' command line editing with GNU readline for eftp' CONFIG_EFTP_READLINE + bool ' install eftp client suid root' CONFIG_EFTP_SETUID + string ' default MSN used for outgoing connections' CONFIG_EFTP_CLIENT_MSN fi +bool 'install a default eft.conf file' CONFIG_EFT_INSTALL_CONF endmenu + + diff --git a/eurofile/Makefile b/eurofile/Makefile index deed8a30..d0d2fb1c 100644 --- a/eurofile/Makefile +++ b/eurofile/Makefile @@ -1,4 +1,7 @@ -# $Id: Makefile,v 1.10 1999/10/05 21:57:26 he Exp $ +# $Id: Makefile,v 1.11 1999/10/08 00:31:04 he Exp $ + +-include Rules.make + SHELL = /bin/sh @@ -50,8 +53,14 @@ configureclean: distclean # This (dummy) target is required by the isdn4k-utils # root makefile but not implemented yet. # -install: - @echo "NOTE: eurofile install not yet implemented. Install by hand for now!" +install: + make -C src install +ifeq ($(CONFIG_EFT_INSTALL_EFTD_SH),y) + cd scripts; $(INSTALL_SCRIPT) eftd.sh $(SYSVINIT_RC_DIR)/ +endif +ifeq ($(CONFIG_EFT_INSTALL_CONF),y) + cd examples; $(INSTALL_DATA) eft.conf $(I4LCONFDIR)/ +endif commit: distclean configure $(CVS) commit . diff --git a/eurofile/Rules.make.in b/eurofile/Rules.make.in index c76526ce..c7db8362 100644 --- a/eurofile/Rules.make.in +++ b/eurofile/Rules.make.in @@ -1,8 +1,31 @@ -@EFT_AUTOCONF_WARNING@ -# generated from $Id: Rules.make.in,v 1.3 1999/06/30 22:56:09 he Exp $ -CRYPTLIB = @CONFIG_LIBCRYPT@ +# @configure_input@ +# generated from $Id: Rules.make.in,v 1.4 1999/10/08 00:31:04 he Exp $ +CRYPTLIB = @LIBCRYPT@ CONFIG_EFTD = @CONFIG_EFTD@ CONFIG_EFTD_WUAUTH = @CONFIG_EFTD_WUAUTH@ CONFIG_EFTP = @CONFIG_EFTP@ +CONFIG_EFTP_SETUID = @CONFIG_EFTP_SETUID@ CONFIG_EFTP_READLINE = @CONFIG_EFTP_READLINE@ -CONFIG_KERNELDIR = @CONFIG_KERNELDIR@ +CONFIG_EFT_INSTALL_CONF = @CONFIG_EFT_INSTALL_CONF@ +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_DATA = @INSTALL_DATA@ +# +# default values as inherited from gnu autoconf. +# +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +sbindir = @sbindir@ +localstatedir = @localstatedir@ +# +# +SBINDIR = @SBINDIR@ +BINDIR = @BINDIR@ +RUNDIR = @RUNDIR@ +SYSVINIT_RC_DIR = @SYSVINIT_RC_DIR@ +KERNELDIR = @KERNELDIR@ +I4LCONFDIR = @I4LCONFDIR@ + + diff --git a/eurofile/configure b/eurofile/configure index 0f861498..d5f8baf4 100755 --- a/eurofile/configure +++ b/eurofile/configure @@ -1,5 +1,6 @@ #! /bin/sh +# From configure.in Id: configure.in # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. @@ -525,20 +526,45 @@ fi # # Set these according to your preferrences # -CONFIG_EFTD=${CONFIG_EFTD:-"y"} +env | grep CONFIG_ |sort +#if called from isdn4k-utils configure script, empty values mean 'n' +# +if test -n "${CONFIG_EUROFILE}"; then +echo +echo execting $1 on behalf of isdn4k-utils make config +echo +CONFIG_EFTD=${CONFIG_EFTD:-n} +CONFIG_EFTD_WUAUTH=${CONFIG_EFTD_WUAUTH:-n} +CONFIG_EFTP=${CONFIG_EFTP:-n} +CONFIG_EFTP_READLINE=${CONFIG_EFTP_READLINE:-n} +CONFIG_EFTP_SETUID=${CONFIG_EFTP_SETUID:-n} +CONFIG_EFT_INSTALL_CONF=${CONFIG_EFT_INSTALL_CONF:-n} +fi +# +# Default config options to be appled when configuring stand-alone +# +CONFIG_EFTD=${CONFIG_EFTD:-y} # Shall eurofile daemon use authentification modules from wu-ftpd? -CONFIG_EFTD_WUAUTH=${CONFIG_EFTD_WUAUTH:-"y"} -CONFIG_EFTP=${CONFIG_EFTP:-"y"} +CONFIG_EFTD_WUAUTH=${CONFIG_EFTD_WUAUTH:-y} +CONFIG_EFTP=${CONFIG_EFTP:-y} # This will be redefined to "n" by the configure script if no readline # library supporting the alternate interface is found -CONFIG_EFTP_READLINE=${CONFIG_EFTP_READLINE:-"y"} +CONFIG_EFTP_READLINE=${CONFIG_EFTP_READLINE:-y} +CONFIG_EFTP_SETUID=${CONFIG_EFTP_SETUID:-n} +CONFIG_EFT_INSTALL_CONF=${CONFIG_EFT_INSTALL_CONF:-n} + + +EFTP_CLIENT_MSN=`eval echo ${CONFIG_EFTP_CLIENT_MSN:-"XXX"}` +EFTD_SERVER_MSN=`eval echo ${CONFIG_EFTD_SERVER_MSN:-"YYY"}` I4LCONFDIR=`eval echo ${CONFIG_I4LCONFDIR:-"/etc/isdn"}` -I4LCONFFILE=`eval echo ${CONFIG_CONFFILE:-"/etc/isdn"}` I4LVERSION=${I4LVERSION:-"?.?"} -CONFIG_KERNELDIR=${CONFIG_KERNELDIR:-"/usr/src/linux"} -CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"} -CONFIG_MANDIR=${CONFIG_MANDIR:-"/usr/man"} +BINDIR=`eval echo ${CONFIG_BINDIR:-'\\${bindir}'}` +SBINDIR=`eval echo ${CONFIG_SBINDIR:-'\\${sbindir}'}` +KERNELDIR=`eval echo ${CONFIG_KERNELDIR:-"/usr/src/linux"}` +RUNDIR=`eval echo ${CONFIG_RUNDIR:-"/var/run"}` + +SYSVINIT_RC_DIR=`eval echo ${CONFIG_SYSVINIT_RC_DIR:-"/sbin/init.d"}` EFT_TOPDIR=${EFT_TOPDIR:-$PWD} @@ -577,7 +603,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:581: checking for a BSD compatible install" >&5 +echo "configure:607: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -632,7 +658,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:636: checking for $ac_word" >&5 +echo "configure:662: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -662,7 +688,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:666: checking for $ac_word" >&5 +echo "configure:692: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -713,7 +739,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:717: checking for $ac_word" >&5 +echo "configure:743: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -745,7 +771,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:749: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:775: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -756,12 +782,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 760 "configure" +#line 786 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -787,12 +813,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:791: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:817: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:796: checking whether we are using GNU C" >&5 +echo "configure:822: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -801,7 +827,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:805: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:831: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -820,7 +846,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:824: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:850: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -852,46 +878,10 @@ else fi -# Extract the first word of "perl", so it can be a program name with args. -set dummy perl; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:859: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$PERL" in - /*) - ac_cv_path_PERL="$PERL" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_PERL="$PERL" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_PERL="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="/usr/bin/perl" - ;; -esac -fi -PERL="$ac_cv_path_PERL" -if test -n "$PERL"; then - echo "$ac_t""$PERL" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - # Extract the first word of "isdnctrl", so it can be a program name with args. set dummy isdnctrl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:895: checking for $ac_word" >&5 +echo "configure:885: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ISDNCTRL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -927,7 +917,7 @@ fi # Extract the first word of "loopctrl", so it can be a program name with args. set dummy loopctrl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:931: checking for $ac_word" >&5 +echo "configure:921: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LOOPCTRL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -963,7 +953,7 @@ fi # Extract the first word of "insmod", so it can be a program name with args. set dummy insmod; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:967: checking for $ac_word" >&5 +echo "configure:957: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_INSMOD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -999,7 +989,7 @@ fi # Extract the first word of "rmmod", so it can be a program name with args. set dummy rmmod; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1003: checking for $ac_word" >&5 +echo "configure:993: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_RMMOD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1035,7 +1025,7 @@ fi # Extract the first word of "ifconfig", so it can be a program name with args. set dummy ifconfig; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1039: checking for $ac_word" >&5 +echo "configure:1029: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_IFCONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1071,7 +1061,7 @@ fi # Extract the first word of "x25route", so it can be a program name with args. set dummy x25route; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1075: checking for $ac_word" >&5 +echo "configure:1065: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_X25ROUTE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1104,13 +1094,49 @@ else echo "$ac_t""no" 1>&6 fi +# Extract the first word of "x25trace", so it can be a program name with args. +set dummy x25trace; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1101: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_X25TRACE'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$X25TRACE" in + /*) + ac_cv_path_X25TRACE="$X25TRACE" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_X25TRACE="$X25TRACE" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_X25TRACE="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_X25TRACE" && ac_cv_path_X25TRACE="/usr/local/sbin/x25trace" + ;; +esac +fi +X25TRACE="$ac_cv_path_X25TRACE" +if test -n "$X25TRACE"; then + echo "$ac_t""$X25TRACE" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + echo $ac_n "checking for rl_callback_handler_install in -lreadline""... $ac_c" 1>&6 -echo "configure:1114: checking for rl_callback_handler_install in -lreadline" >&5 +echo "configure:1140: checking for rl_callback_handler_install in -lreadline" >&5 ac_lib_var=`echo readline'_'rl_callback_handler_install | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1118,7 +1144,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline -lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1159: \"$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 @@ -1160,7 +1186,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1164: checking how to run the C preprocessor" >&5 +echo "configure:1190: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1175,13 +1201,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1211: \"$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 : @@ -1192,13 +1218,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1202: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1228: \"$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 : @@ -1209,13 +1235,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1245: \"$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 : @@ -1240,12 +1266,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1244: checking for ANSI C header files" >&5 +echo "configure:1270: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1253,7 +1279,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1283: \"$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* @@ -1270,7 +1296,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1288,7 +1314,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1309,7 +1335,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1320,7 +1346,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1347,17 +1373,17 @@ for ac_hdr in fcntl.h sys/ioctl.h unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1351: checking for $ac_hdr" >&5 +echo "configure:1377: 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:1361: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1387: \"$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* @@ -1388,17 +1414,17 @@ for ac_hdr in linux/isdn.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1392: checking for $ac_hdr" >&5 +echo "configure:1418: 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:1402: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1428: \"$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* @@ -1431,12 +1457,12 @@ done echo $ac_n "checking for crypt""... $ac_c" 1>&6 -echo "configure:1435: checking for crypt" >&5 +echo "configure:1461: checking for crypt" >&5 if eval "test \"`echo '$''{'ac_cv_func_crypt'+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:1489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_crypt=yes" else @@ -1473,61 +1499,21 @@ fi if eval "test \"`echo '$ac_cv_func_'crypt`\" = yes"; then echo "$ac_t""yes" 1>&6 - CONFIG_LIBCRYPT="" + LIBCRYPT="" else echo "$ac_t""no" 1>&6 -CONFIG_LIBCRYPT="-lcrypt" +LIBCRYPT="-lcrypt" fi -echo $ac_n "checking for getdelim""... $ac_c" 1>&6 -echo "configure:1485: checking for getdelim" >&5 -if eval "test \"`echo '$''{'ac_cv_func_getdelim'+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. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char getdelim(); -int main() { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_getdelim) || defined (__stub___getdelim) -choke me -#else -getdelim(); -#endif -; return 0; } -EOF -if { (eval echo configure:1513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_getdelim=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_getdelim=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_func_'getdelim`\" = yes"; then - echo "$ac_t""yes" 1>&6 - HAVE_GETDELIM="HAVE_GETDELIM" -else - echo "$ac_t""no" 1>&6 -HAVE_GETDELIM="DUMMY" -fi + + + + @@ -1658,8 +1644,7 @@ done ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "scripts/eftp.sh scripts/eftd.sh - src/config.h Rules.make" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "Rules.make src/config.h scripts/eftp.sh scripts/eftd.sh examples/eft.conf" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then diff --git a/eurofile/configure.in b/eurofile/configure.in index ab225baf..6a2251ec 100644 --- a/eurofile/configure.in +++ b/eurofile/configure.in @@ -1,25 +1,55 @@ +dnl dnl Process this file with autoconf to produce a configure script. -dnl $Id: configure.in,v 1.5 1999/07/25 21:55:30 he Exp $ +dnl + +AC_REVISION($Id: configure.in,v 1.6 1999/10/08 00:31:04 he Exp $)dnl AC_INIT(COPYING.authlib) # # Set these according to your preferrences # -CONFIG_EFTD=${CONFIG_EFTD:-"y"} +env | grep CONFIG_ |sort +#if called from isdn4k-utils configure script, empty values mean 'n' +# +if test -n "${CONFIG_EUROFILE}"; then +echo +echo execting $1 on behalf of isdn4k-utils make config +echo +CONFIG_EFTD=${CONFIG_EFTD:-n} +CONFIG_EFTD_WUAUTH=${CONFIG_EFTD_WUAUTH:-n} +CONFIG_EFTP=${CONFIG_EFTP:-n} +CONFIG_EFTP_READLINE=${CONFIG_EFTP_READLINE:-n} +CONFIG_EFTP_SETUID=${CONFIG_EFTP_SETUID:-n} +CONFIG_EFT_INSTALL_CONF=${CONFIG_EFT_INSTALL_CONF:-n} +fi +# +# Default config options to be appled when configuring stand-alone +# +CONFIG_EFTD=${CONFIG_EFTD:-y} # Shall eurofile daemon use authentification modules from wu-ftpd? -CONFIG_EFTD_WUAUTH=${CONFIG_EFTD_WUAUTH:-"y"} -CONFIG_EFTP=${CONFIG_EFTP:-"y"} +CONFIG_EFTD_WUAUTH=${CONFIG_EFTD_WUAUTH:-y} +CONFIG_EFTP=${CONFIG_EFTP:-y} # This will be redefined to "n" by the configure script if no readline # library supporting the alternate interface is found -CONFIG_EFTP_READLINE=${CONFIG_EFTP_READLINE:-"y"} +CONFIG_EFTP_READLINE=${CONFIG_EFTP_READLINE:-y} +CONFIG_EFTP_SETUID=${CONFIG_EFTP_SETUID:-n} +CONFIG_EFT_INSTALL_CONF=${CONFIG_EFT_INSTALL_CONF:-n} + + +EFTP_CLIENT_MSN=`eval echo ${CONFIG_EFTP_CLIENT_MSN:-"XXX"}` +EFTD_SERVER_MSN=`eval echo ${CONFIG_EFTD_SERVER_MSN:-"YYY"}` I4LCONFDIR=`eval echo ${CONFIG_I4LCONFDIR:-"/etc/isdn"}` -I4LCONFFILE=`eval echo ${CONFIG_CONFFILE:-"/etc/isdn"}` I4LVERSION=${I4LVERSION:-"?.?"} -CONFIG_KERNELDIR=${CONFIG_KERNELDIR:-"/usr/src/linux"} -CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"} -CONFIG_MANDIR=${CONFIG_MANDIR:-"/usr/man"} +BINDIR=`eval echo ${CONFIG_BINDIR:-'\\${bindir}'}` +SBINDIR=`eval echo ${CONFIG_SBINDIR:-'\\${sbindir}'}` +KERNELDIR=`eval echo ${CONFIG_KERNELDIR:-"/usr/src/linux"}` +dnl RUNDIR=`eval echo ${CONFIG_RUNDIR:-'\\${localstatedir}/run'}` +dnl enforce a unique dire for pidfiles, independent of install patch +RUNDIR=`eval echo ${CONFIG_RUNDIR:-"/var/run"}` + +SYSVINIT_RC_DIR=`eval echo ${CONFIG_SYSVINIT_RC_DIR:-"/sbin/init.d"}` EFT_TOPDIR=${EFT_TOPDIR:-$PWD} @@ -33,13 +63,14 @@ dnl Checks for programs. AC_PROG_INSTALL AC_PROG_CC -AC_PATH_PROG(PERL, perl, /usr/bin/perl, /usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin) +dnl AC_PATH_PROG(PERL, perl, /usr/bin/perl, /usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin) AC_PATH_PROG(ISDNCTRL, isdnctrl, /usr/local/sbin/isdnctrl, /usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin) AC_PATH_PROG(LOOPCTRL, loopctrl, /usr/local/sbin/loopctrl, /usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin) AC_PATH_PROG(INSMOD, insmod, /sbin/insmod, /usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin) AC_PATH_PROG(RMMOD, rmmod, /sbin/rmmod, /usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin) AC_PATH_PROG(IFCONFIG, ifconfig, /sbin/ifconfig, /usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin) AC_PATH_PROG(X25ROUTE, x25route, /usr/local/sbin/x25route, /usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin) +AC_PATH_PROG(X25TRACE, x25trace, /usr/local/sbin/x25trace, /usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin) @@ -67,24 +98,36 @@ dnl Checks for library functions. dnl some systems don't contain crypt() in the std C library. Linking servers dnl with passwd based authentication need -lcrypt in that case. -AC_CHECK_FUNC(crypt,CONFIG_LIBCRYPT="",CONFIG_LIBCRYPT="-lcrypt") +AC_CHECK_FUNC(crypt,LIBCRYPT="",LIBCRYPT="-lcrypt") + +dnl AC_CHECK_FUNC(getdelim,HAVE_GETDELIM="HAVE_GETDELIM",HAVE_GETDELIM="DUMMY") -AC_CHECK_FUNC(getdelim,HAVE_GETDELIM="HAVE_GETDELIM",HAVE_GETDELIM="DUMMY") -AC_SUBST(INSTALL) AC_SUBST(I4LCONFDIR) AC_SUBST(EFT_TOPDIR) AC_SUBST_FILE(EFT_AUTOCONF_WARNING) AC_SUBST(I4LVERSION) -AC_SUBST(CONFIG_KERNELDIR) -AC_SUBST(CONFIG_SBINDIR) -AC_SUBST(CONFIG_MANDIR) -AC_SUBST(CONFIG_LIBCRYPT) -AC_SUBST(CONFIG_EFTP) +AC_SUBST(KERNELDIR) + +AC_SUBST(BINDIR) +AC_SUBST(SBINDIR) +AC_SUBST(RUNDIR) +AC_SUBST(SYSVINIT_RC_DIR) +AC_SUBST(LIBCRYPT) AC_SUBST(CONFIG_EFTD) -AC_SUBST(CONFIG_EFTP_READLINE) AC_SUBST(CONFIG_EFTD_WUAUTH) -AC_SUBST(HAVE_GETDELIM) -AC_OUTPUT(scripts/eftp.sh scripts/eftd.sh - src/config.h Rules.make) +AC_SUBST(CONFIG_EFTP) +AC_SUBST(CONFIG_EFTP_READLINE) +AC_SUBST(CONFIG_EFTP_SETUID) +AC_SUBST(CONFIG_EFT_INSTALL_CONF) +dnl AC_SUBST(INSTALL) +dnl AC_SUBST(INSTALL_PROGRAM) +dnl AC_SUBST(INSTALL_SCRIPT) +AC_SUBST(EFTP_CLIENT_MSN) +AC_SUBST(EFTD_SERVER_MSN) + + + +dnl AC_SUBST(HAVE_GETDELIM) +AC_OUTPUT(Rules.make src/config.h scripts/eftp.sh scripts/eftd.sh examples/eft.conf) diff --git a/eurofile/examples/eft.conf b/eurofile/examples/eft.conf.in similarity index 89% rename from eurofile/examples/eft.conf rename to eurofile/examples/eft.conf.in index 3560af3a..9f6a9040 100644 --- a/eurofile/examples/eft.conf +++ b/eurofile/examples/eft.conf.in @@ -1,4 +1,5 @@ -# $Id: eft.conf,v 1.2 1999/07/26 22:04:40 he Exp $ +# @configure_input@ +# from $Id: eft.conf.in,v 1.1 1999/10/08 00:31:05 he Exp $ # # MSNs to be used be eurofile server and client. # @@ -12,10 +13,10 @@ # isdn network interface MSNs. (otherwise, you need to tune the # default scripts) # -EFT_SERVER_MSN=xxxx +EFT_SERVER_MSN=@EFTD_SERVER_MSN@ # dont use quotes around or trailing blanks after the next parameter # because it is parsed from the eftp binary -EFT_CLIENT_MSN=xxxx +EFT_CLIENT_MSN=@EFTP_CLIENT_MSN@ # # As currently the eurofile client script "eftp.sh" needs to be run as # root in order to configure the network interfaces, that script will @@ -32,6 +33,3 @@ EFT_CLIENT_USERID=xxxx # other variables which are set in eftd.sh before this file is # included, might also be (re-)set here # - - - diff --git a/eurofile/scripts/eftd.sh.in b/eurofile/scripts/eftd.sh.in index a9e2270b..f875cd8d 100644 --- a/eurofile/scripts/eftd.sh.in +++ b/eurofile/scripts/eftd.sh.in @@ -1,7 +1,7 @@ #!/bin/sh -@EFT_AUTOCONF_WARNING@ +# @configure_input@ # -# generated from $Id: eftd.sh.in,v 1.4 1999/10/05 21:23:20 he Exp $ +# generated from $Id: eftd.sh.in,v 1.5 1999/10/08 00:31:05 he Exp $ # # Henner Eisen 1998 # @@ -15,6 +15,11 @@ # This script can be called from sysvinit, but be sure that the common # isdn setup below is done before. # +# By default, the script executes the eftd binary from the installation +# directory @SBINDIR@/. However, if the environment variable $EFTD_SH_SRC +# is set to a non-empty value, it loads the binary directly from the +# eftp4linux source directory @EFT_TOPDIR@/src/eftd/ +# # READ and EDIT this script before using it! # # For this script to work, the basic setup for the isdn and x25 @@ -42,18 +47,25 @@ ISDNCTRL=@ISDNCTRL@ # LOOPCTRL=@LOOPCTRL@ INSMOD=@INSMOD@ -EFTD_BIN=@EFT_TOPDIR@/src/eftd/eftd +EFTD_BIN_SRC=@EFT_TOPDIR@/src/eftd/eftd +EFTD_BIN_INSTALL=@SBINDIR/eftd +if [ -z "$EFTD_SH_SRC" ]; then + EFTD_BIN=$EFTD_BIN_INSTALL +else + EFTD_BIN=$EFTD_BIN_SRC +fi + # Where to put the eftd-pid-file? Default is /var/run/eftd.pid. -#FIXME: use autoconf/i4l-cvs config option for locating pid file directory. -EFTD_PIDFILE=/var/run/eftd.pid +EFTD_PIDFILE=@RUNDIR@/eftd.pid -X25TRACE_PIDFILE=/var/run/x25trace.pid +X25TRACE_PIDFILE=@RUNDIR@/x25trace.pid -KHOME=/home/kernel -X25UTIL=$KHOME/util/x25/x25-utils-2.1.20 -X25TRACE=$X25UTIL/trace/x25trace +#KHOME=/home/kernel +#X25UTIL=$KHOME/util/x25/x25-utils-2.1.20 +#X25TRACE=$X25UTIL/trace/x25trace +X25TRACE=@X25TRACE@ X25ROUTE=@X25ROUTE@ diff --git a/eurofile/src/Makefile b/eurofile/src/Makefile index 00acbcec..c3435263 100644 --- a/eurofile/src/Makefile +++ b/eurofile/src/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1999/06/30 21:05:21 he Exp $ +# $Id: Makefile,v 1.3 1999/10/08 00:31:05 he Exp $ SHELL = /bin/sh @@ -14,11 +14,11 @@ CURRENT_DIR := $(shell pwd) EFT_LIBDIR = $(CURRENT_DIR)/eft EFT_INCDIR = $(CURRENT_DIR)/eft/include EFT_AUTHDIR = $(CURRENT_DIR)/wuauth -KERNEL_INCDIR = $(CONFIG_KERNELDIR)/include +KERNEL_INCDIR = $(KERNELDIR)/include -CFLAGS = -g -Wall +CFLAGS += -g -Wall -export EFT_LIBDIR EFT_INCDIR EFT_AUTHDIR CONFIG_EFTP_READLINE CONFIG_EFTD_WUAUTH CRYPTLIB CFLAGS KERNEL_INCDIR +export EFT_LIBDIR EFT_INCDIR EFT_AUTHDIR CONFIG_EFTP_READLINE CONFIG_EFTD_WUAUTH CRYPTLIB CFLAGS KERNEL_INCDIR INSTALL INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SYSVINIT_RC_DIR prefix exec_prefix bindir sbindir BINDIR SBINDIR CONFIG_EFTP_SETUID LIBDIRS = eft wuauth CLIENTDIRS = eftp @@ -26,20 +26,25 @@ SERVERDIRS = eftd TESTDIRS = testing EFTDIRS = $(CLIENTDIRS) $(SERVERDIRS) -SUBDIRS := $(LIBDIRS) $(EFTDIRS) -ALL_SUBDIRS := $(SUBDIRS) $(TESTDIRS) +BASIC_SUBDIRS := $(LIBDIRS) $(EFTDIRS) +ALL_SUBDIRS := $(BASIC_SUBDIRS) $(TESTDIRS) -DEFAULT_SUBDIRS := $(LIBDIRS) ifeq ($(CONFIG_EFTP),y) -DEFAULT_SUBDIRS += eftp +APP_SUBDIRS += eftp endif ifeq ($(CONFIG_EFTD),y) -DEFAULT_SUBDIRS += eftd +APP_SUBDIRS += eftd endif -default: $(DEFAULT_SUBDIRS) +DEFAULT_SUBDIRS := $(LIBDIRS) +DEFAULT_SUBDIRS += $(APP_SUBDIRS) + +default: $(DEFAULT_SUBDIRS) +# echo $(DEFAULT_SUBDIRS) +# echo $(MAKEFLAGS) +# all: $(ALL_SUBDIRS) @@ -58,9 +63,10 @@ clean: distclean: clean rm -f config.h `find . \( -name '*~' -o -name '#*#' -o -name core \)` -install: eftp/eftp eftd/eftd - cp eftp/eftp /usr/local/bin - cp eftd/eftd /usr/local/sbin +install: $(APP_SUBDIRS) +ifneq ($(APP_SUBDIRS),) + for i in $(APP_SUBDIRS); do $(MAKE) -C $$i install; done +endif new_version: make -C eft new_version diff --git a/eurofile/src/config.h.in b/eurofile/src/config.h.in index 9f256129..1f37fd58 100644 --- a/eurofile/src/config.h.in +++ b/eurofile/src/config.h.in @@ -1,7 +1,6 @@ -/*@EFT_AUTOCONF_WARNING@ +/* @configure_input@ -generated from $Id: config.h.in,v 1.2 1999/10/05 21:23:21 he Exp $ +generated from $Id: config.h.in,v 1.3 1999/10/08 00:31:05 he Exp $ */ #define CONFIG_I4L_CONFDIR "@I4LCONFDIR@" #define USE_I4L_CONFDIR /* for wuauth pathnames.h */ -#define @HAVE_GETDELIM@ diff --git a/eurofile/src/eftd/Makefile b/eurofile/src/eftd/Makefile index 3ca266db..6508afe7 100644 --- a/eurofile/src/eftd/Makefile +++ b/eurofile/src/eftd/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1999/06/30 17:19:01 he Exp $ +# $Id: Makefile,v 1.2 1999/10/08 00:31:05 he Exp $ default: eftd @@ -44,7 +44,10 @@ eftd.o: eftd.c eftd: eftd.o $(LINK.o) eftd.o $(EFT_LIBDIR_FLAGS) $(AUTH_LIB) -left $(CRYPTLIB) -o eftd -.PHONY: clean default +install: eftd + $(INSTALL_PROGRAM) eftd $(SBINDIR)/ + +.PHONY: clean default install clean: rm -f eftd *.o diff --git a/eurofile/src/eftp/Makefile b/eurofile/src/eftp/Makefile index 00e8ba8a..3ae6143c 100644 --- a/eurofile/src/eftp/Makefile +++ b/eurofile/src/eftp/Makefile @@ -1,4 +1,4 @@ -#$Id: Makefile,v 1.2 1999/07/01 18:00:31 he Exp $ +#$Id: Makefile,v 1.3 1999/10/08 00:31:06 he Exp $ # This Makefile uses GNU-make extensions default: eftp @@ -29,13 +29,18 @@ READLINE_LDFLAGS= -lncurses -lreadline endif eftp.o: eftp.c - cc $(CFLAGS) $(EFT_INCDIR_FLAGS) -c $(READLINE_CFLAGS) eftp.c -o eftp.o + $(CC) $(CFLAGS) $(EFT_INCDIR_FLAGS) -c $(READLINE_CFLAGS) eftp.c -o eftp.o eftp: eftp.o $(READLINE_O) - cc -g eftp.o $(EFT_LIBDIR_FLAGS) $(READLINE_LDFLAGS) -left -o eftp + $(LINK.C) eftp.o $(EFT_LIBDIR_FLAGS) $(READLINE_LDFLAGS) -left -o eftp + +install: eftp + $(INSTALL_PROGRAM) eftp $(BINDIR)/ +ifeq ($(CONFIG_EFTP_SETUID),y) + chmod u+s $(BINDIR)/eftp +endif clean: rm -f eftp *.o .PHONY: clean default - diff --git a/eurofile/src/eftp/eftp.c b/eurofile/src/eftp/eftp.c index defac351..99c438a5 100644 --- a/eurofile/src/eftp/eftp.c +++ b/eurofile/src/eftp/eftp.c @@ -1,4 +1,4 @@ -/* $Id: eftp.c,v 1.5 1999/10/06 18:16:24 he Exp $ */ +/* $Id: eftp.c,v 1.6 1999/10/08 00:31:06 he Exp $ */ /* Copyright 1997 by Henner Eisen @@ -561,7 +561,7 @@ int main(int argc, char **argv) */ struct sockaddr_x25 x25bind, x25connect; struct x25_route_struct x25_route; - int s, count, on=1, selval, prompt_for_pw = 1, use_readline=1; + int s, on=1, selval, prompt_for_pw = 1, use_readline=1; unsigned char called[TDU_PLEN_ADDR+1], udata[TDU_PLEN_UDATA+1]; uid_t ruid, euid;