Merge pull request #90 from stash/ssl-flag

Jamie Turner · Jamie Turner · commit 19a7f19686bc · 2012-09-04T01:14:05.000-07:00
Honor the ssl config file &amp; command-line option
diff --git a/configuration.c b/configuration.c
@@ -538,10 +538,10 @@ void config_param_validate (char *k, char *v, stud_config *cfg, char *file, int
   struct stat st;
 
   if (strcmp(k, "tls") == 0) {
-    //cfg->ENC_TLS = 1;
+    cfg->ETYPE = ENC_TLS;
   }
   else if (strcmp(k, "ssl") == 0) {
-    //cfg->ENC_TLS = 0;
+    cfg->ETYPE = ENC_SSL;
   }
   else if (strcmp(k, CFG_CIPHERS) == 0) {
     if (v != NULL && strlen(v) > 0) {

Original file line number	Diff line number	Diff line change
`@@ -538,10 +538,10 @@ void config_param_validate (char k, char v, stud_config cfg, char file, int`
`538`	`538`	`struct stat st;`
`539`	`539`
`540`	`540`	`if (strcmp(k, "tls") == 0) {`
`541`		`- //cfg->ENC_TLS = 1;`
	`541`	`+ cfg->ETYPE = ENC_TLS;`
`542`	`542`	`}`
`543`	`543`	`else if (strcmp(k, "ssl") == 0) {`
`544`		`- //cfg->ENC_TLS = 0;`
	`544`	`+ cfg->ETYPE = ENC_SSL;`
`545`	`545`	`}`
`546`	`546`	`else if (strcmp(k, CFG_CIPHERS) == 0) {`
`547`	`547`	`if (v != NULL && strlen(v) > 0) {`