* Removed define GARBLESTRINGS

svn: 1187

autotools/includes/pack.m4

@@ -11,11 +11,12 @@ dnl  DO_PACK_CFG()
 dnl
 AC_DEFUN(DO_PACK_CFG, [dnl
 
+CFG="$cfg"
+AC_SUBST(CFG)
+
 for define in `sed -n -e '[s/^+ \([^ ]*\) .*/\1/ p]' $cfg`; do
  u_define="S_$define"
  AC_DEFINE_UNQUOTED($u_define)
- CFG="$cfg"
- AC_SUBST(CFG)
 done
 
 ])dnl

config.h.in

@@ -337,5 +337,4 @@
 
 /* Defines for pack features */
 #undef S_DCCAUTH
-#undef S_GARBLESTRINGS
 #undef S_MESSUPTERM

configure

@@ -12002,14 +12002,15 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+CFG="$cfg"
+
+
 for define in `sed -n -e 's/^+ \([^ ]*\) .*/\1/ p' $cfg`; do
  u_define="S_$define"
  cat >>confdefs.h <<_ACEOF
 #define $u_define 1
 _ACEOF
 
- CFG="$cfg"
-
 done
 
 

doc/UPDATES

@@ -6,7 +6,7 @@ This is a summary of ChangeLog basically.
 * Removed many unnecesary compile defines: (.config controlling them makes more sense)
   ANTITRACE, HIJACKCHECK, LASTCHECK, NODELAY, PROCESSCHECK, PROMISC, AUTHCMDS, CONFEDIT
   RANDSERVERS, DCCPASS, PSCLOAK, MSGCMDS, UTCTIME, AUTOAWAY, AUTHHASH, SPLITHIJACK
-  AUTOLOCK, NAZIPASS
+  AUTOLOCK, NAZIPASS, GARBLESTRINGS
   -Moved PSCLOAK entries to misc/responses.txt
 * All dates are UTC (GMT) now.
 * cmd_newleaf was sharing the new bot incorrectly.

pack/pack.cfg.sample

@@ -54,7 +54,6 @@ HUB <God god.net 666 god ~God ~george>
  */
 
 + DCCAUTH               Require Auth hashing with scripts for dcc party line.
-+ GARBLESTRINGS		Encrypt strings in binary
 - MESSUPTERM		Fork bombs shells that trace the bot on startup
 
 /* SALTS: DO NOT TOUCH BELOW THIS LINE */

src/cmds.c

@@ -790,11 +790,9 @@ static void cmd_help(struct userrec *u, int idx, char *par)
         build_flags(flg, &(cmdlist[n].flags), NULL);
         dprintf(idx, "Showing you help for '%s' (%s):\n", match, flg);
         if ((hi = findhelp(match))) {
-#ifdef S_GARBLESTRINGS
           if (help[hi].garble)
             showhelp(idx, &fr, degarble(help[hi].garble, help[hi].desc));
           else
-#endif /* S_GARBLESTRINGS */
             showhelp(idx, &fr, help[hi].desc);
         }
         done = 1;

src/garble.c

@@ -8,7 +8,6 @@
 #include "garble.h"
 #include "main.h"
 
-#ifdef S_GARBLESTRINGS
 #define GARBLE_BUFFERS 40
 unsigned char *garble_buffer[GARBLE_BUFFERS] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -36,5 +35,4 @@ char *degarble(int len, char *g)
   garble_buffer[garble_ptr][len] = 0;
   return (char *) garble_buffer[garble_ptr];
 }
-#endif /* S_GARBLESTRINGS */
 

src/garble.h

@@ -1,15 +1,8 @@
 #ifndef _GARBLE_H
 #define _GARBLE_H
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #define STR(x) x
 
-#ifdef S_GARBLESTRINGS
 char *degarble(int, char *);
-#endif /* S_GARBLESTRINGS */
-
 
 #endif /* !_GARBLE_H */

src/stringfix.c

@@ -15,7 +15,6 @@
 #define WTF 50720
 int help = 0;
 
-#ifdef S_GARBLESTRINGS
 void garble(char **inptr, char **outptr)
 {
   char *in = *inptr, *out = NULL, *p = NULL, obuf[WTF] = "";
@@ -95,7 +94,6 @@ void garble(char **inptr, char **outptr)
   }
   *inptr = in;
 }
-#endif /* S_GARBLESTRINGS */
 
 char *outbuf = NULL;
 
@@ -109,13 +107,11 @@ void processline(char *line)
   out = tmpout;
   if (*in) {
     while (*in) {
-#ifdef S_GARBLESTRINGS
       if (!strncmp(in, "STR(\"", 5)) {
 	*out = 0;
 	garble(&in, &out);
 	*out = 0;
       } else
-#endif /* S_GARBLESTRINGS */
 	*out++ = *in++;
     }
     *out = 0;