svn: 851

src/conf.c

@@ -207,7 +207,11 @@ void init_conf() {
   conffile.bots->next = NULL;
   conffile.bot = NULL;
 
+#ifdef CYGWIN_HACKS
+  conffile.autocron = 0;
+#else
   conffile.autocron = 1;
+#endif /* CYGWIN_HACKS */
   conffile.autouname = 0;
 #ifdef CYGWIN_HACKS
   conffile.binpath = strdup(homedir());
@@ -408,30 +412,38 @@ int parseconf() {
   return 0;
 }
 
-int readconf(char *cfile)
+int readconf(char *cfile, int bits)
 {
   FILE *f = NULL;
-  int i = 0;
+  int i = 0, enc = (bits & CONF_ENC) ? 1 : 0;
   char inbuf[8192] = "";
 
-  sdprintf("readconf(%s)", cfile);
+  sdprintf("readconf(%s, %d)", cfile, enc);
   Context;
   if (!(f = fopen(cfile, "r")))
     fatal("Cannot read config", 0);
 
   while (fgets(inbuf, sizeof inbuf, f) != NULL) {
-    char *line = NULL, *temp_ptr = NULL;
-    line = temp_ptr = decrypt_string(SALT1, inbuf);
+    char *line = NULL, *temp_ptr = NULL, *p = NULL;
+
+    if (p = strchr(inbuf, '\n'))
+      *p = 0;
+
+    if (enc)
+      line = temp_ptr = decrypt_string(SALT1, inbuf);
+    else
+      line = inbuf;
 
     if ((line && !line[0]) || line[0] == '\n') {
-      free(line);
+      if (enc)
+        free(line);
       continue;
     }
 
     i++;
 
-    /* sdprintf("CONF LINE: %s", line); */
-    if (!strchr("*/#-+!abcdefghijklmnopqrstuvwxyzABDEFGHIJKLMNOPWRSTUVWXYZ", line[0])) {
+    sdprintf("CONF LINE: %s", line);
+    if (enc && !strchr("*/#-+!abcdefghijklmnopqrstuvwxyzABDEFGHIJKLMNOPWRSTUVWXYZ", line[0])) {
       sdprintf(STR("line %d, char %c "), i, line[0]);
       werr(ERR_CONFBADENC);
     } else {                    /* line is good to parse */
@@ -529,7 +541,8 @@ int readconf(char *cfile)
         conf_addbot(nick, ip, host, ipsix);
       }
     }
-    free(temp_ptr);
+    if (enc)
+      free(temp_ptr);
   } /* while(fgets()) */
   fclose(f);
 

src/conf.h

@@ -55,7 +55,7 @@ pid_t checkpid(char *, conf_bot *);
 void showconf();
 void init_conf();
 void free_conf();
-int readconf(char *);
+int readconf(char *, int);
 int parseconf();
 int writeconf(char *, FILE *, int);
 void fillconf(conf_t *);

src/main.c

@@ -489,12 +489,20 @@ static void event_resettraffic()
 
 static void startup_checks() {
   char cfile[DIRMAX] = "";
+  int enc = CONF_ENC;
 
+#ifdef LEAF
+  egg_snprintf(cfile, sizeof cfile, STR("%s/.known_hosts"), confdir());
+#endif /* LEAF */
 #ifdef HUB
   egg_snprintf(cfile, sizeof cfile, STR("%s/conf"), confdir());
-#else /* LEAF */
-  egg_snprintf(cfile, sizeof cfile, STR("%s/.known_hosts"), confdir());
 #endif /* HUB */
+
+#ifdef CYGWIN_HACKS
+  egg_snprintf(cfile, sizeof cfile, STR("%s/conf.txt"), confdir());
+  enc =~ CONF_ENC;
+#endif /* CYGWIN_HACKS */
+
   if (!can_stat(confdir())) {
 #ifdef LEAF
     if (mkdir(confdir(),  S_IRUSR | S_IWUSR | S_IXUSR)) {
@@ -528,7 +536,8 @@ static void startup_checks() {
     werr(ERR_TMPMOD);
 
   if (can_stat(cfile))
-    readconf(cfile);
+    readconf(cfile, enc);
+      
 #ifdef LEAF
   if (localhub)
 #endif /* LEAF */
@@ -542,7 +551,7 @@ static void startup_checks() {
 #ifdef LEAF
   if (localhub)
 #endif /* LEAF */
-    writeconf(cfile, NULL, CONF_ENC);
+    writeconf(cfile, NULL, enc);
 
   if (!can_stat(binname))
    werr(ERR_BINSTAT);