@@ -26,6 +26,7 @@

 #include "kakumei_config.h"

 #define CONFIGFILE "kakumei.conf"

+#define CFLOGFILE "kakumei.log"

 #define CFCOOKIENAME "kakumeiauthid"

 #define CFCOOKIEDOMAIN "localhost"

 #define CFBANNERPATH "default.png"

@@ -60,13 +61,16 @@ main(int argc, char *argv[])

         }

         port=atoi(argv[1]);

         if(kaconfig_exists(CONFIGFILE)!=0) {

+		log_setlogfile(CFLOGFILE);

                 log_write("INIT","Config file not found, writing default file %s",CONFIGFILE);

-                kaconfig_write(CONFIGFILE,CFCOOKIENAME,CFCOOKIEDOMAIN,CFBANNERPATH,CFSSLPROXY);

+                kaconfig_write(CONFIGFILE,CFLOGFILE,CFCOOKIENAME,CFCOOKIEDOMAIN,CFBANNERPATH,CFSSLPROXY);

         }

         if((ka->config=kaconfig_init(CONFIGFILE))==NULL) {

+		log_setlogfile(CFLOGFILE);

                 log_write("INIT","ERROR: insufficient memory or config file error");

                 return(1);

         }

+	log_setlogfile((ka->config->logfile!=NULL)?ka->config->logfile:CFLOGFILE);

         if((ka->ssel=sselect_init())==NULL) {

                 log_write("INIT","ERROR: insufficient memory");

                 return(1);

@@ -86,7 +86,9 @@ kaconfig_init(char *configfile)

                                 continue;

                         }

                         /* identify key-value pair */

-                        if(strcmp(ptr,"cookiename")==0) {

+                        if(strcmp(ptr,"logfile")==0) {

+                                configvalue=&(config->logfile);

+                        } else if(strcmp(ptr,"cookiename")==0) {

                                 configvalue=&(config->cookiename);

                         } else if(strcmp(ptr,"cookiedomain")==0) {

                                 configvalue=&(config->cookiedomain);

@@ -128,6 +130,8 @@ kaconfig_free(kaconfig *config)

 {

         if(config==NULL)

                 return;

+        if(config->logfile!=NULL)

+                free(config->logfile),config->logfile=NULL;

         if(config->cookiename!=NULL)

                 free(config->cookiename),config->cookiename=NULL;

         if(config->cookiedomain!=NULL)

@@ -148,13 +152,14 @@ kaconfig_exists(char *configfile)

 }

 int

-kaconfig_write(char *configfile,char *cookiename,char *cookiedomain, char *bannerpath, int sslproxy)

+kaconfig_write(char *configfile,char *logfile, char *cookiename,char *cookiedomain, char *bannerpath, int sslproxy)

 {

         FILE *f;

         if((f=fopen(configfile,"w"))==NULL)

                 return(-1);

         fprintf(f,"; kakumei config file\n");

         fprintf(f,"[general]\n");

+        fprintf(f,"logfile=%s\n",(logfile!=NULL)?logfile:"kakumei.log");

         fprintf(f,"cookiename=%s\n",(cookiename!=NULL)?cookiename:"kakumeiauthid");

         fprintf(f,"cookiedomain=%s\n",(cookiedomain!=NULL)?cookiedomain:"localhost");

         fprintf(f,"bannerpath=%s\n",(bannerpath!=NULL)?bannerpath:"default.png");

@@ -12,6 +12,7 @@

 #ifndef KAKUMEI_CONFIG_H

 #define KAKUMEI_CONFIG_H

 typedef struct kaconfig {

+        char *logfile;

         char *cookiename;

         char *cookiedomain;

         char *bannerpath;

@@ -22,5 +23,5 @@ kaconfig *kaconfig_init(char *configfile);

 void kaconfig_free(kaconfig *config);

 int kaconfig_exists(char *configfile);

-int kaconfig_write(char *configfile,char *cookiename,char *cookiedomain, char *bannerpath, int sslproxy);

+int kaconfig_write(char *configfile,char *logfile,char *cookiename,char *cookiedomain, char *bannerpath, int sslproxy);

 #endif