Browse code

- Added missing ;, reported by Hendrik Scholz

Jan Janak authored on 20/01/2006 10:42:37
Showing 1 changed files
... ...
@@ -96,9 +96,6 @@
96 96
 #include "select.h"
97 97
 
98 98
 #include "config.h"
99
-#ifdef USE_TLS
100
-#include "tls/tls_config.h"
101
-#endif
102 99
 
103 100
 #ifdef DEBUG_DMALLOC
104 101
 #include <dmalloc.h>
... ...
@@ -127,7 +124,6 @@ static select_t sel;
127 124
 static select_t* sel_ptr;
128 125
 static struct action *mod_func_action;
129 126
 
130
-static void warn(char* s);
131 127
 static struct socket_id* mk_listen_id(char*, int, int);
132 128
 
133 129
 %}
... ...
@@ -253,20 +249,7 @@ static struct socket_id* mk_listen_id(char*, int, int);
253 249
 %token TCP_POLL_METHOD
254 250
 %token TCP_MAX_CONNECTIONS
255 251
 %token DISABLE_TLS
256
-%token TLSLOG
257 252
 %token TLS_PORT_NO
258
-%token TLS_METHOD
259
-%token TLS_HANDSHAKE_TIMEOUT
260
-%token TLS_SEND_TIMEOUT
261
-%token SSLv23
262
-%token SSLv2
263
-%token SSLv3
264
-%token TLSv1
265
-%token TLS_VERIFY
266
-%token TLS_REQUIRE_CERTIFICATE
267
-%token TLS_CERTIFICATE
268
-%token TLS_PRIVATE_KEY
269
-%token TLS_CA_LIST
270 253
 %token ADVERTISED_ADDRESS
271 254
 %token ADVERTISED_PORT
272 255
 %token DISABLE_CORE
... ...
@@ -341,7 +324,7 @@ static struct socket_id* mk_listen_id(char*, int, int);
341 324
 %type <attr> attr_id_ass
342 325
 %type <attr> attr_id_val
343 326
 %type <attr> attr_id_any
344
-//%type <intval> class_id
327
+/* %type <intval> class_id */
345 328
 %type <intval> assign_op
346 329
 %type <select> select_id
347 330
 /*%type <route_el> rules;
... ...
@@ -573,121 +556,6 @@ assign_stm:
573 556
 		#endif
574 557
 	}
575 558
 	| TCP_MAX_CONNECTIONS EQUAL error { yyerror("number expected"); }
576
-	| DISABLE_TLS EQUAL NUMBER {
577
-		#ifdef USE_TLS
578
-			tls_disable=$3;
579
-		#else
580
-			warn("tls support not compiled in");
581
-		#endif
582
-	}
583
-	| DISABLE_TLS EQUAL error { yyerror("boolean value expected"); }
584
-	| TLSLOG EQUAL NUMBER {
585
-		#ifdef USE_TLS
586
-			tls_log=$3;
587
-		#else
588
-			warn("tls support not compiled in");
589
-		#endif
590
-	}
591
-	| TLSLOG EQUAL error { yyerror("int value expected"); }
592
-	| TLS_PORT_NO EQUAL NUMBER {
593
-		#ifdef USE_TLS
594
-			tls_port_no=$3;
595
-		#else
596
-			warn("tls support not compiled in");
597
-		#endif
598
-	}
599
-	| TLS_PORT_NO EQUAL error { yyerror("number expected"); }
600
-	| TLS_METHOD EQUAL SSLv23 {
601
-		#ifdef USE_TLS
602
-			tls_method=TLS_USE_SSLv23;
603
-		#else
604
-			warn("tls support not compiled in");
605
-		#endif
606
-	}
607
-	| TLS_METHOD EQUAL SSLv2 {
608
-		#ifdef USE_TLS
609
-			tls_method=TLS_USE_SSLv2;
610
-		#else
611
-			warn("tls support not compiled in");
612
-		#endif
613
-	}
614
-	| TLS_METHOD EQUAL SSLv3 {
615
-		#ifdef USE_TLS
616
-			tls_method=TLS_USE_SSLv3;
617
-		#else
618
-			warn("tls support not compiled in");
619
-		#endif
620
-	}
621
-	| TLS_METHOD EQUAL TLSv1 {
622
-		#ifdef USE_TLS
623
-			tls_method=TLS_USE_TLSv1;
624
-		#else
625
-			warn("tls support not compiled in");
626
-		#endif
627
-	}
628
-	| TLS_METHOD EQUAL error {
629
-		#ifdef USE_TLS
630
-			yyerror("SSLv23, SSLv2, SSLv3 or TLSv1 expected");
631
-		#else
632
-			warn("tls support not compiled in");
633
-		#endif
634
-	}
635
-	| TLS_VERIFY EQUAL NUMBER {
636
-		#ifdef USE_TLS
637
-			tls_verify_cert=$3;
638
-		#else
639
-			warn("tls support not compiled in");
640
-		#endif
641
-	}
642
-	| TLS_VERIFY EQUAL error { yyerror("boolean value expected"); }
643
-	| TLS_REQUIRE_CERTIFICATE EQUAL NUMBER {
644
-		#ifdef USE_TLS
645
-			tls_require_cert=$3;
646
-		#else
647
-			warn( "tls support not compiled in");
648
-		#endif
649
-	}
650
-	| TLS_REQUIRE_CERTIFICATE EQUAL error { yyerror("boolean value expected"); }
651
-	| TLS_CERTIFICATE EQUAL STRING {
652
-		#ifdef USE_TLS
653
-			tls_cert_file=$3;
654
-		#else
655
-			warn("tls support not compiled in");
656
-		#endif
657
-	}
658
-	| TLS_CERTIFICATE EQUAL error { yyerror("string value expected"); }
659
-	| TLS_PRIVATE_KEY EQUAL STRING {
660
-		#ifdef USE_TLS
661
-			tls_pkey_file=$3;
662
-		#else
663
-			warn("tls support not compiled in");
664
-		#endif
665
-	}
666
-	| TLS_PRIVATE_KEY EQUAL error { yyerror("string value expected"); }
667
-	| TLS_CA_LIST EQUAL STRING {
668
-		#ifdef USE_TLS
669
-			tls_ca_file=$3;
670
-		#else
671
-			warn("tls support not compiled in");
672
-		#endif
673
-	}
674
-	| TLS_CA_LIST EQUAL error { yyerror("string value expected"); }
675
-	| TLS_HANDSHAKE_TIMEOUT EQUAL NUMBER {
676
-		#ifdef USE_TLS
677
-			tls_handshake_timeout=$3;
678
-		#else
679
-			warn("tls support not compiled in");
680
-		#endif
681
-	}
682
-	| TLS_HANDSHAKE_TIMEOUT EQUAL error { yyerror("number expected"); }
683
-	| TLS_SEND_TIMEOUT EQUAL NUMBER {
684
-		#ifdef USE_TLS
685
-			tls_send_timeout=$3;
686
-		#else
687
-			warn("tls support not compiled in");
688
-		#endif
689
-	}
690
-	| TLS_SEND_TIMEOUT EQUAL error { yyerror("number expected"); }
691 559
 	| SERVER_SIGNATURE EQUAL NUMBER { server_signature=$3; }
692 560
 	| SERVER_SIGNATURE EQUAL error { yyerror("boolean value expected"); }
693 561
 	| REPLY_TO_VIA EQUAL NUMBER { reply_to_via=$3; }
... ...
@@ -1258,6 +1126,7 @@ select_param:
1258 1126
 		sel.n++;
1259 1127
 	}
1260 1128
 	;
1129
+
1261 1130
 select_params:
1262 1131
 	select_params DOT select_param
1263 1132
 	| select_param
... ...
@@ -1584,7 +1453,7 @@ cmd:
1584 1453
 	| FORCE_SEND_SOCKET LPAREN phostport RPAREN { $$=mk_action(FORCE_SEND_SOCKET_T, 1, SOCKID_ST, $3); }
1585 1454
 	| FORCE_SEND_SOCKET LPAREN error RPAREN { $$=0; yyerror("bad argument, [proto:]host[:port] expected"); }
1586 1455
 	| FORCE_SEND_SOCKET error {$$=0; yyerror("missing '(' or ')' ?"); }
1587
-	| ID {mod_func_action = mk_action(MODULE_T, 2, MODEXP_ST, NULL, NUMBER_ST, 0) } LPAREN func_params RPAREN	{
1456
+	| ID {mod_func_action = mk_action(MODULE_T, 2, MODEXP_ST, NULL, NUMBER_ST, 0); } LPAREN func_params RPAREN	{
1588 1457
 		mod_func_action->val[0].u.data = find_export_record($1, mod_func_action->val[1].u.number, rt);
1589 1458
 		if (mod_func_action->val[0].u.data == 0) {
1590 1459
 			if (find_export_record($1, mod_func_action->val[1].u.number, 0) ) {
... ...
@@ -1629,12 +1498,6 @@ func_param:
1629 1498
 extern int line;
1630 1499
 extern int column;
1631 1500
 extern int startcolumn;
1632
-static void warn(char* s)
1633
-{
1634
-	LOG(L_WARN, "cfg. warning: (%d,%d-%d): %s\n", line, startcolumn,
1635
-			column, s);
1636
-	cfg_errors++;
1637
-}
1638 1501
 
1639 1502
 static void yyerror(char* s)
1640 1503
 {