From d94e0fc97875d6231645e504e14eb0ac2deca5c5 Mon Sep 17 00:00:00 2001 From: he Date: Fri, 8 Oct 1999 16:25:35 +0000 Subject: [PATCH] more integration in isdn4k-utils config/build and some small fixes --- NEWS | 5 +++++ eurofile/examples/eft.conf.in | 11 ++++++++++- eurofile/scripts/eftd.sh.in | 4 ++-- eurofile/src/eftd/eftd.c | 8 ++++---- scripts/config.in | 16 +++------------- 5 files changed, 24 insertions(+), 20 deletions(-) diff --git a/NEWS b/NEWS index 7b094ed4..52d07596 100644 --- a/NEWS +++ b/NEWS @@ -1,8 +1,13 @@ Recent changes made to the isdn4k-utils archive are listed here, most recent on top. ------------------ +1999/10/08 he (Henner Eisen New FAQ is now moved from FAQ2 to FAQ. + 1999/08/18 armin (Armin Schindler ) eiconctrl - XLOG retrieve function for all supported active cards added. diff --git a/eurofile/examples/eft.conf.in b/eurofile/examples/eft.conf.in index 9f6a9040..fbef8359 100644 --- a/eurofile/examples/eft.conf.in +++ b/eurofile/examples/eft.conf.in @@ -1,5 +1,5 @@ # @configure_input@ -# from $Id: eft.conf.in,v 1.1 1999/10/08 00:31:05 he Exp $ +# from $Id: eft.conf.in,v 1.2 1999/10/08 16:25:35 he Exp $ # # MSNs to be used be eurofile server and client. # @@ -30,6 +30,15 @@ EFT_CLIENT_USERID=xxxx # define this if you want x25trace debugging output # EFTD_X25TRACE=1 # +# If this is set then you can test eurofile client and server locallay +# on top of the isdnloop HL driver (no external isdn connection +# required). To do so, just type `eftp -x 1 -u USER' (where USER is +# your login name) +# +# EFTD_WITH_LOOP=y +# # 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 f875cd8d..dfb13a4d 100644 --- a/eurofile/scripts/eftd.sh.in +++ b/eurofile/scripts/eftd.sh.in @@ -1,7 +1,7 @@ #!/bin/sh # @configure_input@ # -# generated from $Id: eftd.sh.in,v 1.5 1999/10/08 00:31:05 he Exp $ +# generated from $Id: eftd.sh.in,v 1.6 1999/10/08 16:25:35 he Exp $ # # Henner Eisen 1998 # @@ -48,7 +48,7 @@ ISDNCTRL=@ISDNCTRL@ LOOPCTRL=@LOOPCTRL@ INSMOD=@INSMOD@ EFTD_BIN_SRC=@EFT_TOPDIR@/src/eftd/eftd -EFTD_BIN_INSTALL=@SBINDIR/eftd +EFTD_BIN_INSTALL=@SBINDIR@/eftd if [ -z "$EFTD_SH_SRC" ]; then EFTD_BIN=$EFTD_BIN_INSTALL diff --git a/eurofile/src/eftd/eftd.c b/eurofile/src/eftd/eftd.c index e4ce9830..6f7e6387 100644 --- a/eurofile/src/eftd/eftd.c +++ b/eurofile/src/eftd/eftd.c @@ -1,4 +1,4 @@ -/* $Id: eftd.c,v 1.4 1999/10/06 18:16:23 he Exp $ */ +/* $Id: eftd.c,v 1.5 1999/10/08 16:25:36 he Exp $ */ /* Copyright 1998 by Henner Eisen @@ -110,11 +110,11 @@ static int eft_check_user( struct eft *eft, char* user, char* pass, char *isdn_n printf("user check: ruid=%d, euid=%d\n",getuid(),geteuid()); /* * Be paranoid about buggy authentification functions that claim - * success but are still runnung as root. + * success but are still running with super user priviliges. */ if (verified && !geteuid()){ tdu_printf(TDU_LOG_ERR, "eftd: BUG in authentification procedure.\n (claims success, but process runs still with root priviliges).\nRejecting login for security reasons.\n"); - /* verified=0; */ + verified=0; } if( ! verified ){ @@ -495,7 +495,7 @@ int main(int argc, char** argv) tdu_stderr_mask |= level2mask(dlevel); tdu_logfile_mask |= level2mask(llevel); /* FIXME: make default location an autoconf option*/ - if( ! logfile_name ) logfile_name = "/var/log/eftd.log"; + if( ! logfile_name ) logfile_name = "/var/log" "/eftd.log"; if(llevel) tdu_open_log(logfile_name); /* tdu_printf(TDU_LOG_DBG, "LogBook level %d, mask %d, Stderr level %d, mask %d\n",llevel,tdu_logfile_mask,dlevel,tdu_stderr_mask); */ if( tdu_stderr_mask & TDU_LOG_ISDNLOG ){ diff --git a/scripts/config.in b/scripts/config.in index 735a4e5d..01f2d7a5 100644 --- a/scripts/config.in +++ b/scripts/config.in @@ -1,5 +1,5 @@ # -# $Id: config.in,v 1.29 1999/07/11 17:19:12 armin Exp $ +# $Id: config.in,v 1.30 1999/10/08 16:25:37 he Exp $ # # The whole configuration stuff is borrowed from the kernel # configuration. @@ -118,18 +118,8 @@ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then bool 'rcapid' CONFIG_RCAPID fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then -# we need to check for the presence of the eurofile subdirectory -# as long as it is listed in the distexclude file - if [ -d eurofile ]; then - bool 'eurofile' CONFIG_EUROFILE -# The source command fails and causes an error in the -# configure script when eurofile directory is not -# present -- even inside this if branch. -# Thus, it is left commented out until eurofile is -# removed from the distexclude file. -# Uncomment the next line for trying the eurofile sub menu -# source eurofile/.Config.in - fi + bool 'eurofile' CONFIG_EUROFILE + source eurofile/.Config.in fi endmenu mainmenu_option nextcomment