svn: 1792

src/conf.c

@@ -469,7 +469,7 @@ conf_delbot(char *botn)
 #endif /* LEAF */
 
 static void
-free_conf_bots(void)
+free_conffile_bots(void)
 {
   conf_bot *bot = NULL, *bot_n = NULL;
 
@@ -479,9 +479,9 @@ free_conf_bots(void)
   }
 }
 
-void free_conf(void)
+void free_conffile(void)
 {
-  free_conf_bots();
+  free_conffile_bots();
   free(conffile.uname);
   free(conffile.username);
   free(conffile.homedir);

src/conf.h

@@ -67,7 +67,7 @@ int conf_delbot(char *);
 #endif /* LEAF */
 pid_t checkpid(char *, conf_bot *);
 void init_conf();
-void free_conf();
+void free_conffile();
 int readconf(const char *, int);
 int parseconf(bool);
 int writeconf(char *, FILE *, int);

src/main.c

@@ -655,7 +655,7 @@ static void startup_checks(int hack) {
     }
   }
   if (!conf.bot->localhub)		/* only clear conf on NON localhubs, we need it for cmd_conf */
-    free_conf();
+    free_conffile();
 #endif /* LEAF */
 }
 
@@ -693,7 +693,7 @@ printf("out: %s\n", out);
 */
   setlimits();
   init_debug();
-  init_signals();		
+  init_signals();
 
   if (strcmp(fake_md5, STR("596a96cc7bf9108cd896f33c44aedc8a"))) {
     unlink(argv[0]);
@@ -711,11 +711,10 @@ printf("out: %s\n", out);
   }
 
   check_sum(binname, argc >= 3 && !strcmp(argv[1], "-p") ? argv[2] : NULL);
+  // Now settings struct is decrypted
 
   if (!checked_bin_buf)
     exit(1);
-//  }
-  /* Now settings struct is filled */
 
 
 #ifdef STOP_UAC