diff --git a/ChangeLog b/ChangeLog index a635b67d..e5ff6da0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,14 @@ DO NOT USE THIS VERSION ON PRODUCTION SYSTEMS, ONLY FOR TESTING. v0.37.00 26-Dec-2002. + upgrade: + In mbsetup 1.17.3 check if you have the XX,CM,IBN,IFC flags, + which indicates your TCP/IP capabilities. This is only for + systems that use TCP/IP, dialup systems should only have + the XX,CM flags. Important: only protocols that you place + in this entry are supported, so XX,CM,IBN will let your system + only call binkp nodes. + general: A new developer joined the team, David Gonzalez. The settings to suppres some IP protocols (global and nodes) diff --git a/Makefile b/Makefile index e7379d26..8302f7a2 100644 --- a/Makefile +++ b/Makefile @@ -178,7 +178,7 @@ install: dist tar: ${TARFILE} clean: - rm -f .filelist core ${TARFILE} + rm -f .filelist core ${TARFILE} paths.h config.h for d in ${SUBDIRS}; do (cd $$d && ${MAKE} $@) || exit; done; ${TARFILE}: .filelist diff --git a/configure b/configure index 50d01ee8..98db943f 100755 --- a/configure +++ b/configure @@ -8033,6 +8033,45 @@ else echo "${ECHO_T}no" >&6 fi +# Extract the first word of "convert", so it can be a program name with args. +set dummy convert; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_CONVERT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $CONVERT in + [\\/]* | ?:[\\/]*) + ac_cv_path_CONVERT="$CONVERT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_CONVERT="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + ;; +esac +fi +CONVERT=$ac_cv_path_CONVERT + +if test -n "$CONVERT"; then + echo "$as_me:$LINENO: result: $CONVERT" >&5 +echo "${ECHO_T}$CONVERT" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + # Check whether --with-log-compress or --without-log-compress was given. @@ -8751,6 +8790,7 @@ s,@RZ@,$RZ,;t t s,@SZ@,$SZ,;t t s,@GOLDEDBIN@,$GOLDEDBIN,;t t s,@GOLDNODE@,$GOLDNODE,;t t +s,@CONVERT@,$CONVERT,;t t s,@LOG_COMPRESS@,$LOG_COMPRESS,;t t s,@LOG_COMPRESSEXT@,$LOG_COMPRESSEXT,;t t s,@joebin@,$joebin,;t t diff --git a/configure.in b/configure.in index 03f4b469..90e28f09 100644 --- a/configure.in +++ b/configure.in @@ -184,6 +184,7 @@ AC_PATH_PROG(GOLDEDBIN,golded) AC_PATH_PROG(GOLDEDBIN,gedlnx) AC_PATH_PROG(GOLDNODE,goldnode) AC_PATH_PROG(GOLDNODE,gnlnx) +AC_PATH_PROG(CONVERT,convert) dnl AC_ARG_WITH(log-compress,[ --with-log-compress=METHOD Log compression method (default gzip)], LOG_COMPRESS=$with_log_compress, LOG_COMPRESS=gzip) diff --git a/html/setup/global.html b/html/setup/global.html index 458554c9..c53ef307 100644 --- a/html/setup/global.html +++ b/html/setup/global.html @@ -12,7 +12,7 @@
-
Last update 31-Dec-2002
+
Last update 06-Jan-2003

MBSE BBS Setup - Global Setup

@@ -393,7 +393,7 @@ countries with lots of telephone operators with all kind of prefixes for carrier select functions. The setting of TCP/IP flags is important too, this gives the information what this system will do. If you only enter IBN as TCP/IP flags then the system will only call IBN nodes (binkp). The default is -XX,IBN,IFC,ITN::60177 +XX,CM and TCP/IP systems (internet) should use the XX,CM,IBN,IFC flags. 

 Mailer logl.      The logging level for mailer sessions
 Default phone     The default phonenumber for EMSI sessions
diff --git a/mbtask/libs.h b/mbtask/libs.h
index 9d1e47da..d194b8ab 100644
--- a/mbtask/libs.h
+++ b/mbtask/libs.h
@@ -92,55 +92,6 @@ struct icmp_filter {
 # ifndef IP_PKTINFO
 #  define IP_PKTINFO 8
 # endif
-# ifndef CMSG_LEN
-/* ---- from glibc 2.1.2 */
-
-
-/* Ancillary data object manipulation macros.  */
-/*
-#  if !defined __STRICT_ANSI__ && defined __GNUC__ && __GNUC__ >= 2
-#   define CMSG_DATA(cmsg) ((cmsg)->__cmsg_data)
-#  else
-#   define CMSG_DATA(cmsg) ((unsigned char *) ((struct cmsghdr *) (cmsg) + 1))
-#  endif
-*/
-
-/*
-#  define CMSG_NXTHDR(mhdr, cmsg) __cmsg_nxthdr (mhdr, cmsg)
-#  define CMSG_FIRSTHDR(mhdr) \
-  ((size_t) (mhdr)->msg_controllen >= sizeof (struct cmsghdr)                 \
-   ? (struct cmsghdr *) (mhdr)->msg_control : (struct cmsghdr *) NULL)
-#  define CMSG_ALIGN(len) (((len) + sizeof (size_t) - 1) \
-                         & ~(sizeof (size_t) - 1))
-#  define CMSG_SPACE(len) (CMSG_ALIGN (len) \
-                         + CMSG_ALIGN (sizeof (struct cmsghdr)))
-#  define CMSG_LEN(len)   (CMSG_ALIGN (sizeof (struct cmsghdr)) + (len))
-extern struct cmsghdr *__cmsg_nxthdr __P ((struct msghdr *__mhdr,
-                                           struct cmsghdr *__cmsg));
-#  ifdef __USE_EXTERN_INLINES
-#   ifndef _EXTERN_INLINE
-#    define _EXTERN_INLINE extern __inline
-#   endif
-_EXTERN_INLINE struct cmsghdr *
-__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg) __THROW
-{
-  if ((size_t) __cmsg->cmsg_len < sizeof (struct cmsghdr))
-*/    /* The kernel header does this so there may be a reason.  */ /*
-    return 0;
-*/
-/*
-  __cmsg = (struct cmsghdr *) ((unsigned char *) __cmsg
-                               + CMSG_ALIGN (__cmsg->cmsg_len));
-  if ((unsigned char *) (__cmsg + 1) >= ((unsigned char *) __mhdr->msg_control
-                                         + __mhdr->msg_controllen)
-      || ((unsigned char *) __cmsg + CMSG_ALIGN (__cmsg->cmsg_len)
-          >= ((unsigned char *) __mhdr->msg_control + __mhdr->msg_controllen)))
-*/    /* No more entries.  */  /*
-    return 0;
-  return __cmsg;
-}
-#  endif    */    /* Use `extern inline'.  */
-# endif
 
 
 /* A macro to extract the pointer to the address of a struct sockaddr (_in or _in6) */
@@ -169,6 +120,26 @@ typedef struct _faddr {
 
 
 
+/*
+ * ANSI colors
+ */
+#define BLACK           0
+#define BLUE            1
+#define GREEN           2
+#define CYAN            3
+#define RED             4
+#define MAGENTA         5
+#define BROWN           6
+#define LIGHTGRAY       7
+#define DARKGRAY        8
+#define LIGHTBLUE       9
+#define LIGHTGREEN      10
+#define LIGHTCYAN       11
+#define LIGHTRED        12
+#define LIGHTMAGENTA    13
+#define YELLOW          14
+#define WHITE           15
+
 
 #endif
 
diff --git a/mbtask/mbtask.c b/mbtask/mbtask.c
index db357018..73425f3e 100644
--- a/mbtask/mbtask.c
+++ b/mbtask/mbtask.c
@@ -225,28 +225,28 @@ void load_maincfg(void)
         /*
          * Colors
          */
-        CFG.TextColourF         = 3;
-        CFG.TextColourB         = 0;
-        CFG.UnderlineColourF    = 14;
-        CFG.UnderlineColourB    = 0;
-        CFG.InputColourF        = 11;
-        CFG.InputColourB        = 0;
-        CFG.CRColourF           = 15;
-        CFG.CRColourB           = 0;
-        CFG.MoreF               = 13;
-        CFG.MoreB               = 0;
-        CFG.HiliteF             = 15;
-        CFG.HiliteB             = 0;
-        CFG.FilenameF           = 14;
-        CFG.FilenameB           = 0;
-        CFG.FilesizeF           = 13;
-        CFG.FilesizeB           = 0;
-        CFG.FiledateF           = 10;
-        CFG.FiledateB           = 0;
-        CFG.FiledescF           = 3;
-        CFG.FiledescB           = 0;
-        CFG.MsgInputColourF     = 3;
-        CFG.MsgInputColourB     = 0;
+        CFG.TextColourF         = CYAN;
+        CFG.TextColourB         = BLACK;
+        CFG.UnderlineColourF    = YELLOW;
+        CFG.UnderlineColourB    = BLACK;
+        CFG.InputColourF        = LIGHTCYAN;
+        CFG.InputColourB        = BLACK;
+        CFG.CRColourF           = WHITE;
+        CFG.CRColourB           = BLACK;
+        CFG.MoreF               = LIGHTMAGENTA;
+        CFG.MoreB               = BLACK;
+        CFG.HiliteF             = WHITE;
+        CFG.HiliteB             = BLACK;
+        CFG.FilenameF           = YELLOW;
+        CFG.FilenameB           = BLACK;
+        CFG.FilesizeF           = LIGHTMAGENTA;
+        CFG.FilesizeB           = BLACK;
+        CFG.FiledateF           = LIGHTGREEN;
+        CFG.FiledateB           = BLACK;
+        CFG.FiledescF           = CYAN;
+        CFG.FiledescB           = BLACK;
+        CFG.MsgInputColourF     = CYAN;
+        CFG.MsgInputColourB     = BLACK;
 
         /*
          * NextUser Door
@@ -357,7 +357,7 @@ void load_maincfg(void)
         sprintf(CFG.phonetrans[2].repl, "00");
         CFG.Speed = 9600;
         CFG.dialdelay = 60;
-        sprintf(CFG.Flags, "CM,XX,IBN,IFC,ITN::60177");
+        sprintf(CFG.Flags, "CM,XX");
         CFG.cico_loglevel = DLOG_ALLWAYS | DLOG_ERROR | DLOG_ATTENT | DLOG_NORMAL | DLOG_VERBOSE;
 
         /*
@@ -389,7 +389,8 @@ void load_maincfg(void)
         sprintf(CFG.www_url, "http://%s", CFG.sysdomain);
         sprintf(CFG.www_charset, "ISO 8859-1");
         sprintf(CFG.www_author, "Your Name");
-        sprintf(CFG.www_convert,"/usr/X11R6/bin/convert -geometry x100");
+	if (strlen(_PATH_CONVERT))
+	    sprintf(CFG.www_convert,"%s -geometry x100", _PATH_CONVERT);
         CFG.www_files_page = 10;
 
 	CFG.maxarticles = 500;
@@ -429,7 +430,7 @@ void load_taskcfg(void)
 		sprintf(TCFG.cmd_newnews,  "%s/bin/mbfido news web -quiet", getenv("MBSE_ROOT"));
 		sprintf(TCFG.cmd_mbindex1, "%s/bin/mbindex -quiet", getenv("MBSE_ROOT"));
 		if (strlen(_PATH_GOLDNODE))
-		    sprintf(TCFG.cmd_mbindex2, "%s/bin/goldnode -f -q", getenv("MBSE_ROOT"));
+		    sprintf(TCFG.cmd_mbindex2, "%s -f -q", _PATH_GOLDNODE);
 		sprintf(TCFG.cmd_msglink,  "%s/bin/mbmsg link -quiet", getenv("MBSE_ROOT"));
 		sprintf(TCFG.cmd_reqindex, "%s/bin/mbfile index -quiet", getenv("MBSE_ROOT"));
 		TCFG.debug    = FALSE;
diff --git a/paths.h.in b/paths.h.in
index 7e81d92f..ae73e9a4 100644
--- a/paths.h.in
+++ b/paths.h.in
@@ -24,6 +24,13 @@
 
 
 
+/*
+ * Path to convert, to create thumbnails.
+ */
+#define	_PATH_CONVERT	"@CONVERT@"
+
+
+
 /*
  * Paths to some virus scanners
  */