@@ -29,6 +29,7 @@

 #define CFCOOKIENAME "kakumeiauthid"

 #define CFCOOKIEDOMAIN "localhost"

 #define CFBANNERPATH "default.png"

+#define CFSSLPROXY 0

 static int signal_init(int signum, void (*fn)(int));

 static void sigint(int signum);

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

         port=atoi(argv[1]);

         if(kaconfig_exists(CONFIGFILE)!=0) {

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

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

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

         }

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

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

@@ -298,7 +299,7 @@ http_login(wk *web, int connid, wk_uri *uri, void *userptr)

                 /* valid login */

                 snprintf(reply,sizeof(reply),"/posts.html?s=%s",session);

                 reply[sizeof(reply)-1]='\0';

-                wk_serve_cookieadd(web,connid,ka->config->cookiename,authid,ka->config->cookiedomain,21600 /* 6h */,"secure");

+                wk_serve_cookieadd(web,connid,ka->config->cookiename,authid,ka->config->cookiedomain,21600 /* 6h */,(ka->config->sslproxy)?"secure":NULL);

                 wk_serve_buffer_as_file(web,connid,reply,strlen(reply),"text/plain");

                 log_write("LGIN","Reply: %s",reply);

                 return(wkact_finished);

@@ -354,7 +355,7 @@ http_newuser(wk *web, int connid, wk_uri *uri, void *userptr)

         /* valid login */

         snprintf(reply,sizeof(reply),"/posts.html?s=%s",session);

         reply[sizeof(reply)-1]='\0';

-        wk_serve_cookieadd(web,connid,ka->config->cookiename,authid,ka->config->cookiedomain,21600 /* 6h */,"secure");

+        wk_serve_cookieadd(web,connid,ka->config->cookiename,authid,ka->config->cookiedomain,21600 /* 6h */,(ka->config->sslproxy)?"secure":NULL);

         wk_serve_buffer_as_file(web,connid,reply,strlen(reply),"text/plain");

         log_write("NEWU","Reply: %s",reply);

         return(wkact_finished);

@@ -31,6 +31,7 @@ kaconfig_init(char *configfile)

         int generalsection;

         int lineno;

         char **configvalue;

+	char *sslproxydummy;

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

                 return(NULL);

         if((config=malloc(sizeof(kaconfig)))==NULL) {

@@ -91,6 +92,12 @@ kaconfig_init(char *configfile)

                                 configvalue=&(config->cookiedomain);

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

                                 configvalue=&(config->bannerpath);

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

+				if(strcmp(value,"true")==0 || strcmp(value,"1")==0 || strcmp(value,"yes")==0)

+					config->sslproxy=1;

+				else

+					config->sslproxy=0;

+				continue;

                         } else {

                                 log_write("CONF","%s:%i: unknown key, ignoring key-value pair; key:\"%s\"\n",configfile,lineno,ptr);

                                 continue;

@@ -141,7 +148,7 @@ kaconfig_exists(char *configfile)

 }

 int

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

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

 {

         FILE *f;

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

@@ -151,6 +158,7 @@ kaconfig_write(char *configfile,char *cookiename,char *cookiedomain, char *banne

         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");

+        fprintf(f,"sslproxy=%s\n",(sslproxy==0)?"no":"yes");

         return(0);

 }

@@ -15,11 +15,12 @@ typedef struct kaconfig {

         char *cookiename;

         char *cookiedomain;

         char *bannerpath;

+        int sslproxy;

 } kaconfig;

 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 kaconfig_write(char *configfile,char *cookiename,char *cookiedomain, char *bannerpath, int sslproxy);

 #endif