summaryrefslogtreecommitdiff
path: root/package/ipsec-tools/patches/patch-src_racoon_cftoken_c
blob: 29bdf1a7733b6720308272291a07f2b2ef2c3965 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
--- ipsec-tools-0.7.2.orig/src/racoon/cftoken.c	2008-07-23 13:49:19.000000000 +0200
+++ ipsec-tools-0.7.2/src/racoon/cftoken.c	2009-05-29 15:50:16.982910033 +0200
@@ -8,7 +8,7 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 34
+#define YY_FLEX_SUBMINOR_VERSION 35
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -178,13 +178,6 @@ extern FILE *yyin, *yyout;
 
 #define unput(c) yyunput( c, (yytext_ptr)  )
 
-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- * Given that the standard has decreed that size_t exists since 1989,
- * I guess we can afford to depend on it. Manoj.
- */
-
 #ifndef YY_TYPEDEF_YY_SIZE_T
 #define YY_TYPEDEF_YY_SIZE_T
 typedef size_t yy_size_t;
@@ -1634,6 +1627,7 @@ static struct include_stack {
 static int incstackp = 0;
 
 static int yy_first_time = 1;
+int yywrap(void) { return 1; }
 /* common seciton */
 /*octet		(([01]?{digit}?{digit})|((2([0-4]{digit}))|(25[0-5]))) */
 
@@ -1642,7 +1636,7 @@ static int yy_first_time = 1;
 
 
 
-#line 1646 "cftoken.c"
+#line 1640 "cftoken.c"
 
 #define INITIAL 0
 #define S_INI 1
@@ -1679,6 +1673,35 @@ static int yy_first_time = 1;
 
 static int yy_init_globals (void );
 
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int yylex_destroy (void );
+
+int yyget_debug (void );
+
+void yyset_debug (int debug_flag  );
+
+YY_EXTRA_TYPE yyget_extra (void );
+
+void yyset_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *yyget_in (void );
+
+void yyset_in  (FILE * in_str  );
+
+FILE *yyget_out (void );
+
+void yyset_out  (FILE * out_str  );
+
+int yyget_leng (void );
+
+char *yyget_text (void );
+
+int yyget_lineno (void );
+
+void yyset_lineno (int line_number  );
+
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
  */
@@ -1814,7 +1837,7 @@ YY_DECL
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 142 "cftoken.l"
+#line 143 "cftoken.l"
 
 
 	if (yy_first_time) {
@@ -1824,7 +1847,7 @@ YY_DECL
 
 
 	/* privsep */
-#line 1828 "cftoken.c"
+#line 1851 "cftoken.c"
 
 	if ( !(yy_init) )
 		{
@@ -1915,1028 +1938,1028 @@ do_action:	/* This label is used only to
 
 case 1:
 YY_RULE_SETUP
-#line 151 "cftoken.l"
+#line 152 "cftoken.l"
 { BEGIN S_PRIV; YYDB; return(PRIVSEP); }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 152 "cftoken.l"
+#line 153 "cftoken.l"
 { return(BOC); }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 153 "cftoken.l"
+#line 154 "cftoken.l"
 { YYD; return(USER); }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 154 "cftoken.l"
+#line 155 "cftoken.l"
 { YYD; return(GROUP); }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 155 "cftoken.l"
+#line 156 "cftoken.l"
 { YYD; return(CHROOT); }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 156 "cftoken.l"
+#line 157 "cftoken.l"
 { BEGIN S_INI; return(EOC); }
 	YY_BREAK
 /* path */
 case 7:
 YY_RULE_SETUP
-#line 159 "cftoken.l"
+#line 160 "cftoken.l"
 { BEGIN S_PTH; YYDB; return(PATH); }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 160 "cftoken.l"
+#line 161 "cftoken.l"
 { YYD; yylval.num = LC_PATHTYPE_INCLUDE;
 				return(PATHTYPE); }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 162 "cftoken.l"
+#line 163 "cftoken.l"
 { YYD; yylval.num = LC_PATHTYPE_PSK;
 				return(PATHTYPE); }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 164 "cftoken.l"
+#line 165 "cftoken.l"
 { YYD; yylval.num = LC_PATHTYPE_CERT;
 				return(PATHTYPE); }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 166 "cftoken.l"
+#line 167 "cftoken.l"
 { YYD; yylval.num = LC_PATHTYPE_SCRIPT;
 				return(PATHTYPE); }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 168 "cftoken.l"
+#line 169 "cftoken.l"
 { YYD; yylval.num = LC_PATHTYPE_BACKUPSA;
 				return(PATHTYPE); }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 170 "cftoken.l"
+#line 171 "cftoken.l"
 { YYD; yylval.num = LC_PATHTYPE_PIDFILE;
 				return(PATHTYPE); }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 172 "cftoken.l"
+#line 173 "cftoken.l"
 { BEGIN S_INI; YYDB; return(EOS); }
 	YY_BREAK
 /* include */
 case 15:
 YY_RULE_SETUP
-#line 175 "cftoken.l"
+#line 176 "cftoken.l"
 { YYDB; return(INCLUDE); }
 	YY_BREAK
 /* self information */
 case 16:
 YY_RULE_SETUP
-#line 178 "cftoken.l"
+#line 179 "cftoken.l"
 { BEGIN S_INF; YYDB; yywarn("it is obsoleted.  use \"my_identifier\" in each remote directives."); return(IDENTIFIER); }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 179 "cftoken.l"
+#line 180 "cftoken.l"
 { BEGIN S_INI; return(EOS); }
 	YY_BREAK
 /* special */
 case 18:
 YY_RULE_SETUP
-#line 182 "cftoken.l"
+#line 183 "cftoken.l"
 { YYDB; return(COMPLEX_BUNDLE); }
 	YY_BREAK
 /* logging */
 case 19:
 YY_RULE_SETUP
-#line 185 "cftoken.l"
+#line 186 "cftoken.l"
 { BEGIN S_LOG; YYDB; return(LOGGING); }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 186 "cftoken.l"
+#line 187 "cftoken.l"
 { YYD; yylval.num = LLV_ERROR; return(LOGLEV); }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 187 "cftoken.l"
+#line 188 "cftoken.l"
 { YYD; yylval.num = LLV_WARNING; return(LOGLEV); }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 188 "cftoken.l"
+#line 189 "cftoken.l"
 { YYD; yylval.num = LLV_NOTIFY; return(LOGLEV); }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 189 "cftoken.l"
+#line 190 "cftoken.l"
 { YYD; yylval.num = LLV_INFO; return(LOGLEV); }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 190 "cftoken.l"
+#line 191 "cftoken.l"
 { YYD; yylval.num = LLV_DEBUG; return(LOGLEV); }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 191 "cftoken.l"
+#line 192 "cftoken.l"
 { YYD; yylval.num = LLV_DEBUG2; return(LOGLEV); }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 192 "cftoken.l"
+#line 193 "cftoken.l"
 { YYD; yywarn("it is obsoleted.  use \"debug2\""); yylval.num = LLV_DEBUG2; return(LOGLEV); }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 193 "cftoken.l"
+#line 194 "cftoken.l"
 { YYD; yywarn("it is obsoleted.  use \"debug2\""); yylval.num = LLV_DEBUG2; return(LOGLEV); }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 194 "cftoken.l"
+#line 195 "cftoken.l"
 { BEGIN S_INI; return(EOS); }
 	YY_BREAK
 /* padding */
 case 29:
 YY_RULE_SETUP
-#line 197 "cftoken.l"
+#line 198 "cftoken.l"
 { BEGIN S_PAD; YYDB; return(PADDING); }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 198 "cftoken.l"
+#line 199 "cftoken.l"
 { return(BOC); }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 199 "cftoken.l"
+#line 200 "cftoken.l"
 { YYD; return(PAD_RANDOMIZE); }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 200 "cftoken.l"
+#line 201 "cftoken.l"
 { YYD; return(PAD_RANDOMIZELEN); }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 201 "cftoken.l"
+#line 202 "cftoken.l"
 { YYD; return(PAD_MAXLEN); }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 202 "cftoken.l"
+#line 203 "cftoken.l"
 { YYD; return(PAD_STRICT); }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 203 "cftoken.l"
+#line 204 "cftoken.l"
 { YYD; return(PAD_EXCLTAIL); }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 204 "cftoken.l"
+#line 205 "cftoken.l"
 { BEGIN S_INI; return(EOC); }
 	YY_BREAK
 /* listen */
 case 37:
 YY_RULE_SETUP
-#line 207 "cftoken.l"
+#line 208 "cftoken.l"
 { BEGIN S_LST; YYDB; return(LISTEN); }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 208 "cftoken.l"
+#line 209 "cftoken.l"
 { return(BOC); }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 209 "cftoken.l"
+#line 210 "cftoken.l"
 { YYD; return(X_ISAKMP); }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 210 "cftoken.l"
+#line 211 "cftoken.l"
 { YYD; return(X_ISAKMP_NATT); }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 211 "cftoken.l"
+#line 212 "cftoken.l"
 { YYD; return(X_ADMIN); }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 212 "cftoken.l"
+#line 213 "cftoken.l"
 { YYD; return(ADMINSOCK); }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 213 "cftoken.l"
+#line 214 "cftoken.l"
 { YYD; return(DISABLED); }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 214 "cftoken.l"
+#line 215 "cftoken.l"
 { YYD; return(STRICT_ADDRESS); }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 215 "cftoken.l"
+#line 216 "cftoken.l"
 { BEGIN S_INI; return(EOC); }
 	YY_BREAK
 /* ldap config */
 case 46:
 YY_RULE_SETUP
-#line 218 "cftoken.l"
+#line 219 "cftoken.l"
 { BEGIN S_LDAP; YYDB; return(LDAPCFG); }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 219 "cftoken.l"
+#line 220 "cftoken.l"
 { return(BOC); }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 220 "cftoken.l"
+#line 221 "cftoken.l"
 { YYD; return(LDAP_PVER); }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 221 "cftoken.l"
+#line 222 "cftoken.l"
 { YYD; return(LDAP_HOST); }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 222 "cftoken.l"
+#line 223 "cftoken.l"
 { YYD; return(LDAP_PORT); }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 223 "cftoken.l"
+#line 224 "cftoken.l"
 { YYD; return(LDAP_BASE); }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 224 "cftoken.l"
+#line 225 "cftoken.l"
 { YYD; return(LDAP_SUBTREE); }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 225 "cftoken.l"
+#line 226 "cftoken.l"
 { YYD; return(LDAP_BIND_DN); }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 226 "cftoken.l"
+#line 227 "cftoken.l"
 { YYD; return(LDAP_BIND_PW); }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 227 "cftoken.l"
+#line 228 "cftoken.l"
 { YYD; return(LDAP_ATTR_USER); }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 228 "cftoken.l"
+#line 229 "cftoken.l"
 { YYD; return(LDAP_ATTR_ADDR); }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 229 "cftoken.l"
+#line 230 "cftoken.l"
 { YYD; return(LDAP_ATTR_MASK); }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 230 "cftoken.l"
+#line 231 "cftoken.l"
 { YYD; return(LDAP_ATTR_GROUP); }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 231 "cftoken.l"
+#line 232 "cftoken.l"
 { YYD; return(LDAP_ATTR_MEMBER); }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 232 "cftoken.l"
+#line 233 "cftoken.l"
 { BEGIN S_INI; return(EOC); }
 	YY_BREAK
 /* mode_cfg */
 case 61:
 YY_RULE_SETUP
-#line 235 "cftoken.l"
+#line 236 "cftoken.l"
 { BEGIN S_CFG; YYDB; return(MODECFG); }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 236 "cftoken.l"
+#line 237 "cftoken.l"
 { return(BOC); }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 237 "cftoken.l"
+#line 238 "cftoken.l"
 { YYD; return(CFG_NET4); }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 238 "cftoken.l"
+#line 239 "cftoken.l"
 { YYD; return(CFG_MASK4); }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 239 "cftoken.l"
+#line 240 "cftoken.l"
 { YYD; return(CFG_DNS4); }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 240 "cftoken.l"
+#line 241 "cftoken.l"
 { YYD; return(CFG_NBNS4); }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 241 "cftoken.l"
+#line 242 "cftoken.l"
 { YYD; return(CFG_NBNS4); }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 242 "cftoken.l"
+#line 243 "cftoken.l"
 { YYD; return(CFG_DEFAULT_DOMAIN); }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 243 "cftoken.l"
+#line 244 "cftoken.l"
 { YYD; return(CFG_AUTH_SOURCE); }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 244 "cftoken.l"
+#line 245 "cftoken.l"
 { YYD; return(CFG_AUTH_GROUPS); }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 245 "cftoken.l"
+#line 246 "cftoken.l"
 { YYD; return(CFG_GROUP_SOURCE); }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 246 "cftoken.l"
+#line 247 "cftoken.l"
 { YYD; return(CFG_CONF_SOURCE); }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 247 "cftoken.l"
+#line 248 "cftoken.l"
 { YYD; return(CFG_ACCOUNTING); }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 248 "cftoken.l"
+#line 249 "cftoken.l"
 { YYD; return(CFG_SYSTEM); }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 249 "cftoken.l"
+#line 250 "cftoken.l"
 { YYD; return(CFG_LOCAL); }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 250 "cftoken.l"
+#line 251 "cftoken.l"
 { YYD; return(CFG_NONE); }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 251 "cftoken.l"
+#line 252 "cftoken.l"
 { YYD; return(CFG_RADIUS); }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 252 "cftoken.l"
+#line 253 "cftoken.l"
 { YYD; return(CFG_PAM); }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 253 "cftoken.l"
+#line 254 "cftoken.l"
 { YYD; return(CFG_LDAP); }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 254 "cftoken.l"
+#line 255 "cftoken.l"
 { YYD; return(CFG_POOL_SIZE); }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 255 "cftoken.l"
+#line 256 "cftoken.l"
 { YYD; return(CFG_MOTD); }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 256 "cftoken.l"
+#line 257 "cftoken.l"
 { YYD; return(CFG_AUTH_THROTTLE); }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 257 "cftoken.l"
+#line 258 "cftoken.l"
 { YYD; return(CFG_SPLIT_NETWORK); }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 258 "cftoken.l"
+#line 259 "cftoken.l"
 { YYD; return(CFG_SPLIT_LOCAL); }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 259 "cftoken.l"
+#line 260 "cftoken.l"
 { YYD; return(CFG_SPLIT_INCLUDE); }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 260 "cftoken.l"
+#line 261 "cftoken.l"
 { YYD; return(CFG_SPLIT_DNS); }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 261 "cftoken.l"
+#line 262 "cftoken.l"
 { YYD; return(CFG_PFS_GROUP); }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 262 "cftoken.l"
+#line 263 "cftoken.l"
 { YYD; return(CFG_SAVE_PASSWD); }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 263 "cftoken.l"
+#line 264 "cftoken.l"
 { YYD; return(COMMA); }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 264 "cftoken.l"
+#line 265 "cftoken.l"
 { BEGIN S_INI; return(EOC); }
 	YY_BREAK
 /* timer */
 case 91:
 YY_RULE_SETUP
-#line 267 "cftoken.l"
+#line 268 "cftoken.l"
 { BEGIN S_RTRY; YYDB; return(RETRY); }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 268 "cftoken.l"
+#line 269 "cftoken.l"
 { return(BOC); }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 269 "cftoken.l"
+#line 270 "cftoken.l"
 { YYD; return(RETRY_COUNTER); }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 270 "cftoken.l"
+#line 271 "cftoken.l"
 { YYD; return(RETRY_INTERVAL); }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 271 "cftoken.l"
+#line 272 "cftoken.l"
 { YYD; return(RETRY_PERSEND); }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 272 "cftoken.l"
+#line 273 "cftoken.l"
 { YYD; return(RETRY_PHASE1); }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 273 "cftoken.l"
+#line 274 "cftoken.l"
 { YYD; return(RETRY_PHASE2); }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 274 "cftoken.l"
+#line 275 "cftoken.l"
 { YYD; return(NATT_KA); }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 275 "cftoken.l"
+#line 276 "cftoken.l"
 { BEGIN S_INI; return(EOC); }
 	YY_BREAK
 /* sainfo */
 case 100:
 YY_RULE_SETUP
-#line 278 "cftoken.l"
+#line 279 "cftoken.l"
 { BEGIN S_SAINF; YYDB; return(SAINFO); }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 279 "cftoken.l"
+#line 280 "cftoken.l"
 { YYD; return(ANONYMOUS); }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 280 "cftoken.l"
+#line 281 "cftoken.l"
 { YYD; return(PORTANY); }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 281 "cftoken.l"
+#line 282 "cftoken.l"
 { YYD; return(ANY); }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 282 "cftoken.l"
+#line 283 "cftoken.l"
 { YYD; return(FROM); }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 283 "cftoken.l"
+#line 284 "cftoken.l"
 { YYD; return(GROUP); }
 	YY_BREAK
 /* sainfo spec */
 case 106:
 YY_RULE_SETUP
-#line 285 "cftoken.l"
+#line 286 "cftoken.l"
 { BEGIN S_SAINFS; return(BOC); }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 286 "cftoken.l"
+#line 287 "cftoken.l"
 { BEGIN S_INI; return(EOS); }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 287 "cftoken.l"
+#line 288 "cftoken.l"
 { BEGIN S_INI; return(EOC); }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 288 "cftoken.l"
+#line 289 "cftoken.l"
 { YYD; return(PFS_GROUP); }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 289 "cftoken.l"
+#line 290 "cftoken.l"
 { YYD; return(REMOTEID); }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 290 "cftoken.l"
+#line 291 "cftoken.l"
 { YYD; yywarn("it is obsoleted.  use \"my_identifier\"."); return(IDENTIFIER); }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 291 "cftoken.l"
+#line 292 "cftoken.l"
 { YYD; return(MY_IDENTIFIER); }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 292 "cftoken.l"
+#line 293 "cftoken.l"
 { YYD; return(LIFETIME); }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 293 "cftoken.l"
+#line 294 "cftoken.l"
 { YYD; return(LIFETYPE_TIME); }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 294 "cftoken.l"
+#line 295 "cftoken.l"
 { YYD; return(LIFETYPE_BYTE); }
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 295 "cftoken.l"
+#line 296 "cftoken.l"
 { YYD; yylval.num = algclass_ipsec_enc; return(ALGORITHM_CLASS); }
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 296 "cftoken.l"
+#line 297 "cftoken.l"
 { YYD; yylval.num = algclass_ipsec_auth; return(ALGORITHM_CLASS); }
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 297 "cftoken.l"
+#line 298 "cftoken.l"
 { YYD; yylval.num = algclass_ipsec_comp; return(ALGORITHM_CLASS); }
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 298 "cftoken.l"
+#line 299 "cftoken.l"
 { YYD; return(COMMA); }
 	YY_BREAK
 /* remote */
 case 120:
 YY_RULE_SETUP
-#line 301 "cftoken.l"
+#line 302 "cftoken.l"
 { BEGIN S_RMT; YYDB; return(REMOTE); }
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 302 "cftoken.l"
+#line 303 "cftoken.l"
 { YYD; return(ANONYMOUS); }
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 303 "cftoken.l"
+#line 304 "cftoken.l"
 { YYD; return(INHERIT); }
 	YY_BREAK
 /* remote spec */
 case 123:
 YY_RULE_SETUP
-#line 305 "cftoken.l"
+#line 306 "cftoken.l"
 { BEGIN S_RMTS; return(BOC); }
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 306 "cftoken.l"
+#line 307 "cftoken.l"
 { BEGIN S_INI; return(EOC); }
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
-#line 307 "cftoken.l"
+#line 308 "cftoken.l"
 { YYD; return(EXCHANGE_MODE); }
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 308 "cftoken.l"
+#line 309 "cftoken.l"
 { YYD; /* XXX ignored, but to be handled. */ ; }
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 309 "cftoken.l"
+#line 310 "cftoken.l"
 { YYD; yylval.num = ISAKMP_ETYPE_BASE; return(EXCHANGETYPE); }
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 310 "cftoken.l"
+#line 311 "cftoken.l"
 { YYD; yylval.num = ISAKMP_ETYPE_IDENT; return(EXCHANGETYPE); }
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
-#line 311 "cftoken.l"
+#line 312 "cftoken.l"
 { YYD; yylval.num = ISAKMP_ETYPE_AGG; return(EXCHANGETYPE); }
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
-#line 312 "cftoken.l"
+#line 313 "cftoken.l"
 { YYD; return(DOI); }
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
-#line 313 "cftoken.l"
+#line 314 "cftoken.l"
 { YYD; yylval.num = IPSEC_DOI; return(DOITYPE); }
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
-#line 314 "cftoken.l"
+#line 315 "cftoken.l"
 { YYD; return(SITUATION); }
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
-#line 315 "cftoken.l"
+#line 316 "cftoken.l"
 { YYD; yylval.num = IPSECDOI_SIT_IDENTITY_ONLY; return(SITUATIONTYPE); }
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
-#line 316 "cftoken.l"
+#line 317 "cftoken.l"
 { YYD; yylval.num = IPSECDOI_SIT_SECRECY; return(SITUATIONTYPE); }
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
-#line 317 "cftoken.l"
+#line 318 "cftoken.l"
 { YYD; yylval.num = IPSECDOI_SIT_INTEGRITY; return(SITUATIONTYPE); }
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
-#line 318 "cftoken.l"
+#line 319 "cftoken.l"
 { YYD; yywarn("it is obsoleted.  use \"my_identifier\"."); return(IDENTIFIER); }
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
-#line 319 "cftoken.l"
+#line 320 "cftoken.l"
 { YYD; return(MY_IDENTIFIER); }
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
-#line 320 "cftoken.l"
+#line 321 "cftoken.l"
 { YYD; return(XAUTH_LOGIN); /* formerly identifier type login */ }
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
-#line 321 "cftoken.l"
+#line 322 "cftoken.l"
 { YYD; return(PEERS_IDENTIFIER); }
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
-#line 322 "cftoken.l"
+#line 323 "cftoken.l"
 { YYD; return(VERIFY_IDENTIFIER); }
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
-#line 323 "cftoken.l"
+#line 324 "cftoken.l"
 { YYD; return(CERTIFICATE_TYPE); }
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
-#line 324 "cftoken.l"
+#line 325 "cftoken.l"
 { YYD; return(CA_TYPE); }
 	YY_BREAK
 case 143:
 YY_RULE_SETUP
-#line 325 "cftoken.l"
+#line 326 "cftoken.l"
 { YYD; yylval.num = ISAKMP_CERT_X509SIGN; return(CERT_X509); }
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
-#line 326 "cftoken.l"
+#line 327 "cftoken.l"
 { YYD; yylval.num = ISAKMP_CERT_PLAINRSA; return(CERT_PLAINRSA); }
 	YY_BREAK
 case 145:
 YY_RULE_SETUP
-#line 327 "cftoken.l"
+#line 328 "cftoken.l"
 { YYD; return(PEERS_CERTFILE); }
 	YY_BREAK
 case 146:
 YY_RULE_SETUP
-#line 328 "cftoken.l"
+#line 329 "cftoken.l"
 { YYD; return(DNSSEC); }
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
-#line 329 "cftoken.l"
+#line 330 "cftoken.l"
 { YYD; return(VERIFY_CERT); }
 	YY_BREAK
 case 148:
 YY_RULE_SETUP
-#line 330 "cftoken.l"
+#line 331 "cftoken.l"
 { YYD; return(SEND_CERT); }
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
-#line 331 "cftoken.l"
+#line 332 "cftoken.l"
 { YYD; return(SEND_CR); }
 	YY_BREAK
 case 150:
 YY_RULE_SETUP
-#line 332 "cftoken.l"
+#line 333 "cftoken.l"
 { YYD; return(DH_GROUP); }
 	YY_BREAK
 case 151:
 YY_RULE_SETUP
-#line 333 "cftoken.l"
+#line 334 "cftoken.l"
 { YYD; return(NONCE_SIZE); }
 	YY_BREAK
 case 152:
 YY_RULE_SETUP
-#line 334 "cftoken.l"
+#line 335 "cftoken.l"
 { YYD; return(GENERATE_POLICY); }
 	YY_BREAK
 case 153:
 YY_RULE_SETUP
-#line 335 "cftoken.l"
+#line 336 "cftoken.l"
 { YYD; yylval.num = GENERATE_POLICY_UNIQUE; return(GENERATE_LEVEL); }
 	YY_BREAK
 case 154:
 YY_RULE_SETUP
-#line 336 "cftoken.l"
+#line 337 "cftoken.l"
 { YYD; yylval.num = GENERATE_POLICY_REQUIRE; return(GENERATE_LEVEL); }
 	YY_BREAK
 case 155:
 YY_RULE_SETUP
-#line 337 "cftoken.l"
+#line 338 "cftoken.l"
 { YYD; yywarn("it is obsoleted.  use \"support_proxy\"."); return(SUPPORT_PROXY); }
 	YY_BREAK
 case 156:
 YY_RULE_SETUP
-#line 338 "cftoken.l"
+#line 339 "cftoken.l"
 { YYD; return(SUPPORT_PROXY); }
 	YY_BREAK
 case 157:
 YY_RULE_SETUP
-#line 339 "cftoken.l"
+#line 340 "cftoken.l"
 { YYD; return(INITIAL_CONTACT); }
 	YY_BREAK
 case 158:
 YY_RULE_SETUP
-#line 340 "cftoken.l"
+#line 341 "cftoken.l"
 { YYD; return(NAT_TRAVERSAL); }
 	YY_BREAK
 case 159:
 YY_RULE_SETUP
-#line 341 "cftoken.l"
+#line 342 "cftoken.l"
 { YYD; return(REMOTE_FORCE_LEVEL); }
 	YY_BREAK
 case 160:
 YY_RULE_SETUP
-#line 342 "cftoken.l"
+#line 343 "cftoken.l"
 { YYD; return(PROPOSAL_CHECK); }
 	YY_BREAK
 case 161:
 YY_RULE_SETUP
-#line 343 "cftoken.l"
+#line 344 "cftoken.l"
 { YYD; yylval.num = PROP_CHECK_OBEY; return(PROPOSAL_CHECK_LEVEL); }
 	YY_BREAK
 case 162:
 YY_RULE_SETUP
-#line 344 "cftoken.l"
+#line 345 "cftoken.l"
 { YYD; yylval.num = PROP_CHECK_STRICT; return(PROPOSAL_CHECK_LEVEL); }
 	YY_BREAK
 case 163:
 YY_RULE_SETUP
-#line 345 "cftoken.l"
+#line 346 "cftoken.l"
 { YYD; yylval.num = PROP_CHECK_EXACT; return(PROPOSAL_CHECK_LEVEL); }
 	YY_BREAK
 case 164:
 YY_RULE_SETUP
-#line 346 "cftoken.l"
+#line 347 "cftoken.l"
 { YYD; yylval.num = PROP_CHECK_CLAIM; return(PROPOSAL_CHECK_LEVEL); }
 	YY_BREAK
 case 165:
 YY_RULE_SETUP
-#line 347 "cftoken.l"
+#line 348 "cftoken.l"
 { YYD; return(KEEPALIVE); }
 	YY_BREAK
 case 166:
 YY_RULE_SETUP
-#line 348 "cftoken.l"
+#line 349 "cftoken.l"
 { YYD; return(PASSIVE); }
 	YY_BREAK
 case 167:
 YY_RULE_SETUP
-#line 349 "cftoken.l"
+#line 350 "cftoken.l"
 { YYD; return(LIFETIME); }
 	YY_BREAK
 case 168:
 YY_RULE_SETUP
-#line 350 "cftoken.l"
+#line 351 "cftoken.l"
 { YYD; return(LIFETYPE_TIME); }
 	YY_BREAK
 case 169:
 YY_RULE_SETUP
-#line 351 "cftoken.l"
+#line 352 "cftoken.l"
 { YYD; return(LIFETYPE_BYTE); }
 	YY_BREAK
 case 170:
 YY_RULE_SETUP
-#line 352 "cftoken.l"
+#line 353 "cftoken.l"
 { YYD; return(DPD); }
 	YY_BREAK
 case 171:
 YY_RULE_SETUP
-#line 353 "cftoken.l"
+#line 354 "cftoken.l"
 { YYD; return(DPD_DELAY); }
 	YY_BREAK
 case 172:
 YY_RULE_SETUP
-#line 354 "cftoken.l"
+#line 355 "cftoken.l"
 { YYD; return(DPD_RETRY); }
 	YY_BREAK
 case 173:
 YY_RULE_SETUP
-#line 355 "cftoken.l"
+#line 356 "cftoken.l"
 { YYD; return(DPD_MAXFAIL); }
 	YY_BREAK
 case 174:
 YY_RULE_SETUP
-#line 356 "cftoken.l"
+#line 357 "cftoken.l"
 { YYD; return(PH1ID); }
 	YY_BREAK
 case 175:
 YY_RULE_SETUP
-#line 357 "cftoken.l"
+#line 358 "cftoken.l"
 { YYD; return(IKE_FRAG); }
 	YY_BREAK
 case 176:
 YY_RULE_SETUP
-#line 358 "cftoken.l"
+#line 359 "cftoken.l"
 { YYD; return(ESP_FRAG); }
 	YY_BREAK
 case 177:
 YY_RULE_SETUP
-#line 359 "cftoken.l"
+#line 360 "cftoken.l"
 { YYD; return(SCRIPT); }
 	YY_BREAK
 case 178:
 YY_RULE_SETUP
-#line 360 "cftoken.l"
+#line 361 "cftoken.l"
 { YYD; return(PHASE1_UP); }
 	YY_BREAK
 case 179:
 YY_RULE_SETUP
-#line 361 "cftoken.l"
+#line 362 "cftoken.l"
 { YYD; return(PHASE1_DOWN); }
 	YY_BREAK
 case 180:
 YY_RULE_SETUP
-#line 362 "cftoken.l"
+#line 363 "cftoken.l"
 { YYD; return(MODE_CFG); }
 	YY_BREAK
 case 181:
 YY_RULE_SETUP
-#line 363 "cftoken.l"
+#line 364 "cftoken.l"
 { YYD; return(WEAK_PHASE1_CHECK); }
 	YY_BREAK
 /* remote proposal */
 case 182:
 YY_RULE_SETUP
-#line 365 "cftoken.l"
+#line 366 "cftoken.l"
 { BEGIN S_RMTP; YYDB; return(PROPOSAL); }
 	YY_BREAK
 case 183:
 YY_RULE_SETUP
-#line 366 "cftoken.l"
+#line 367 "cftoken.l"
 { return(BOC); }
 	YY_BREAK
 case 184:
 YY_RULE_SETUP
-#line 367 "cftoken.l"
+#line 368 "cftoken.l"
 { BEGIN S_RMTS; return(EOC); }
 	YY_BREAK
 case 185:
 YY_RULE_SETUP
-#line 368 "cftoken.l"
+#line 369 "cftoken.l"
 { YYD; return(LIFETIME); }
 	YY_BREAK
 case 186:
 YY_RULE_SETUP
-#line 369 "cftoken.l"
+#line 370 "cftoken.l"
 { YYD; return(LIFETYPE_TIME); }
 	YY_BREAK
 case 187:
 YY_RULE_SETUP
-#line 370 "cftoken.l"
+#line 371 "cftoken.l"
 { YYD; return(LIFETYPE_BYTE); }
 	YY_BREAK
 case 188:
 YY_RULE_SETUP
-#line 371 "cftoken.l"
+#line 372 "cftoken.l"
 { YYD; yylval.num = algclass_isakmp_enc; return(ALGORITHM_CLASS); }
 	YY_BREAK
 case 189:
 YY_RULE_SETUP
-#line 372 "cftoken.l"
+#line 373 "cftoken.l"
 { YYD; yylval.num = algclass_isakmp_ameth; return(ALGORITHM_CLASS); }
 	YY_BREAK
 case 190:
 YY_RULE_SETUP
-#line 373 "cftoken.l"
+#line 374 "cftoken.l"
 { YYD; yylval.num = algclass_isakmp_hash; return(ALGORITHM_CLASS); }
 	YY_BREAK
 case 191:
 YY_RULE_SETUP
-#line 374 "cftoken.l"
+#line 375 "cftoken.l"
 { YYD; return(DH_GROUP); }
 	YY_BREAK
 case 192:
 YY_RULE_SETUP
-#line 375 "cftoken.l"
+#line 376 "cftoken.l"
 { YYD; return(GSS_ID); }
 	YY_BREAK
 case 193:
 YY_RULE_SETUP
-#line 376 "cftoken.l"
+#line 377 "cftoken.l"
 { YYD; return(GSS_ID); } /* for back compatibility */
 	YY_BREAK
 /* GSS ID encoding type (global) */
 case 194:
 YY_RULE_SETUP
-#line 379 "cftoken.l"
+#line 380 "cftoken.l"
 { BEGIN S_GSSENC; YYDB; return(GSS_ID_ENC); }
 	YY_BREAK
 case 195:
 YY_RULE_SETUP
-#line 380 "cftoken.l"
+#line 381 "cftoken.l"
 { YYD; yylval.num = LC_GSSENC_LATIN1;
 				return(GSS_ID_ENCTYPE); }
 	YY_BREAK
 case 196:
 YY_RULE_SETUP
-#line 382 "cftoken.l"
+#line 383 "cftoken.l"
 { YYD; yylval.num = LC_GSSENC_UTF16LE;
 				return(GSS_ID_ENCTYPE); }
 	YY_BREAK
 case 197:
 YY_RULE_SETUP
-#line 384 "cftoken.l"
+#line 385 "cftoken.l"
 { BEGIN S_INI; YYDB; return(EOS); }
 	YY_BREAK
 /* parameter */
 case 198:
 YY_RULE_SETUP
-#line 387 "cftoken.l"
+#line 388 "cftoken.l"
 { YYD; yylval.num = TRUE; return(SWITCH); }
 	YY_BREAK
 case 199:
 YY_RULE_SETUP
-#line 388 "cftoken.l"
+#line 389 "cftoken.l"
 { YYD; yylval.num = FALSE; return(SWITCH); }
 	YY_BREAK
 /* prefix */
 case 200:
 YY_RULE_SETUP
-#line 391 "cftoken.l"
+#line 392 "cftoken.l"
 {
 			YYD;
 			yytext++;
@@ -2947,7 +2970,7 @@ YY_RULE_SETUP
 /* port number */
 case 201:
 YY_RULE_SETUP
-#line 399 "cftoken.l"
+#line 400 "cftoken.l"
 {
 			char *p = yytext;
 			YYD;
@@ -2961,7 +2984,7 @@ YY_RULE_SETUP
 /* address range */
 case 202:
 YY_RULE_SETUP
-#line 410 "cftoken.l"
+#line 411 "cftoken.l"
 {
                         YYD;
                         yytext++;
@@ -2977,318 +3000,318 @@ YY_RULE_SETUP
 /* upper protocol */
 case 203:
 YY_RULE_SETUP
-#line 423 "cftoken.l"
+#line 424 "cftoken.l"
 { YYD; yylval.num = IPPROTO_ESP; return(UL_PROTO); }
 	YY_BREAK
 case 204:
 YY_RULE_SETUP
-#line 424 "cftoken.l"
+#line 425 "cftoken.l"
 { YYD; yylval.num = IPPROTO_AH; return(UL_PROTO); }
 	YY_BREAK
 case 205:
 YY_RULE_SETUP
-#line 425 "cftoken.l"
+#line 426 "cftoken.l"
 { YYD; yylval.num = IPPROTO_IPCOMP; return(UL_PROTO); }
 	YY_BREAK
 case 206:
 YY_RULE_SETUP
-#line 426 "cftoken.l"
+#line 427 "cftoken.l"
 { YYD; yylval.num = IPPROTO_ICMP; return(UL_PROTO); }
 	YY_BREAK
 case 207:
 YY_RULE_SETUP
-#line 427 "cftoken.l"
+#line 428 "cftoken.l"
 { YYD; yylval.num = IPPROTO_ICMPV6; return(UL_PROTO); }
 	YY_BREAK
 case 208:
 YY_RULE_SETUP
-#line 428 "cftoken.l"
+#line 429 "cftoken.l"
 { YYD; yylval.num = IPPROTO_TCP; return(UL_PROTO); }
 	YY_BREAK
 case 209:
 YY_RULE_SETUP
-#line 429 "cftoken.l"
+#line 430 "cftoken.l"
 { YYD; yylval.num = IPPROTO_UDP; return(UL_PROTO); }
 	YY_BREAK
 /* algorithm type */
 case 210:
 YY_RULE_SETUP
-#line 432 "cftoken.l"
+#line 433 "cftoken.l"
 { YYD; yylval.num = algtype_des_iv64;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 211:
 YY_RULE_SETUP
-#line 433 "cftoken.l"
+#line 434 "cftoken.l"
 { YYD; yylval.num = algtype_des;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 212:
 YY_RULE_SETUP
-#line 434 "cftoken.l"
+#line 435 "cftoken.l"
 { YYD; yylval.num = algtype_3des;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 213:
 YY_RULE_SETUP
-#line 435 "cftoken.l"
+#line 436 "cftoken.l"
 { YYD; yylval.num = algtype_rc5;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 214:
 YY_RULE_SETUP
-#line 436 "cftoken.l"
+#line 437 "cftoken.l"
 { YYD; yylval.num = algtype_idea;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 215:
 YY_RULE_SETUP
-#line 437 "cftoken.l"
+#line 438 "cftoken.l"
 { YYD; yylval.num = algtype_cast128;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 216:
 YY_RULE_SETUP
-#line 438 "cftoken.l"
+#line 439 "cftoken.l"
 { YYD; yylval.num = algtype_blowfish;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 217:
 YY_RULE_SETUP
-#line 439 "cftoken.l"
+#line 440 "cftoken.l"
 { YYD; yylval.num = algtype_3idea;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 218:
 YY_RULE_SETUP
-#line 440 "cftoken.l"
+#line 441 "cftoken.l"
 { YYD; yylval.num = algtype_des_iv32;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 219:
 YY_RULE_SETUP
-#line 441 "cftoken.l"
+#line 442 "cftoken.l"
 { YYD; yylval.num = algtype_rc4;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 220:
 YY_RULE_SETUP
-#line 442 "cftoken.l"
+#line 443 "cftoken.l"
 { YYD; yylval.num = algtype_null_enc;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 221:
 YY_RULE_SETUP
-#line 443 "cftoken.l"
+#line 444 "cftoken.l"
 { YYD; yylval.num = algtype_null_enc;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 222:
 YY_RULE_SETUP
-#line 444 "cftoken.l"
+#line 445 "cftoken.l"
 { YYD; yylval.num = algtype_aes;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 223:
 YY_RULE_SETUP
-#line 445 "cftoken.l"
+#line 446 "cftoken.l"
 { YYD; yylval.num = algtype_aes;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 224:
 YY_RULE_SETUP
-#line 446 "cftoken.l"
+#line 447 "cftoken.l"
 { YYD; yylval.num = algtype_twofish;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 225:
 YY_RULE_SETUP
-#line 447 "cftoken.l"
+#line 448 "cftoken.l"
 { YYD; yylval.num = algtype_camellia;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 226:
 YY_RULE_SETUP
-#line 448 "cftoken.l"
+#line 449 "cftoken.l"
 { YYD; yylval.num = algtype_non_auth;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 227:
 YY_RULE_SETUP
-#line 449 "cftoken.l"
+#line 450 "cftoken.l"
 { YYD; yylval.num = algtype_hmac_md5;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 228:
 YY_RULE_SETUP
-#line 450 "cftoken.l"
+#line 451 "cftoken.l"
 { YYD; yylval.num = algtype_hmac_sha1;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 229:
 YY_RULE_SETUP
-#line 451 "cftoken.l"
+#line 452 "cftoken.l"
 { YYD; yylval.num = algtype_hmac_sha2_256;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 230:
 YY_RULE_SETUP
-#line 452 "cftoken.l"
+#line 453 "cftoken.l"
 { YYD; yylval.num = algtype_hmac_sha2_256;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 231:
 YY_RULE_SETUP
-#line 453 "cftoken.l"
+#line 454 "cftoken.l"
 { YYD; yylval.num = algtype_hmac_sha2_384;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 232:
 YY_RULE_SETUP
-#line 454 "cftoken.l"
+#line 455 "cftoken.l"
 { YYD; yylval.num = algtype_hmac_sha2_384;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 233:
 YY_RULE_SETUP
-#line 455 "cftoken.l"
+#line 456 "cftoken.l"
 { YYD; yylval.num = algtype_hmac_sha2_512;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 234:
 YY_RULE_SETUP
-#line 456 "cftoken.l"
+#line 457 "cftoken.l"
 { YYD; yylval.num = algtype_hmac_sha2_512;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 235:
 YY_RULE_SETUP
-#line 457 "cftoken.l"
+#line 458 "cftoken.l"
 { YYD; yylval.num = algtype_des_mac;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 236:
 YY_RULE_SETUP
-#line 458 "cftoken.l"
+#line 459 "cftoken.l"
 { YYD; yylval.num = algtype_kpdk;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 237:
 YY_RULE_SETUP
-#line 459 "cftoken.l"
+#line 460 "cftoken.l"
 { YYD; yylval.num = algtype_md5;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 238:
 YY_RULE_SETUP
-#line 460 "cftoken.l"
+#line 461 "cftoken.l"
 { YYD; yylval.num = algtype_sha1;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 239:
 YY_RULE_SETUP
-#line 461 "cftoken.l"
+#line 462 "cftoken.l"
 { YYD; yylval.num = algtype_tiger;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 240:
 YY_RULE_SETUP
-#line 462 "cftoken.l"
+#line 463 "cftoken.l"
 { YYD; yylval.num = algtype_sha2_256;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 241:
 YY_RULE_SETUP
-#line 463 "cftoken.l"
+#line 464 "cftoken.l"
 { YYD; yylval.num = algtype_sha2_256;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 242:
 YY_RULE_SETUP
-#line 464 "cftoken.l"
+#line 465 "cftoken.l"
 { YYD; yylval.num = algtype_sha2_384;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 243:
 YY_RULE_SETUP
-#line 465 "cftoken.l"
+#line 466 "cftoken.l"
 { YYD; yylval.num = algtype_sha2_384;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 244:
 YY_RULE_SETUP
-#line 466 "cftoken.l"
+#line 467 "cftoken.l"
 { YYD; yylval.num = algtype_sha2_512;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 245:
 YY_RULE_SETUP
-#line 467 "cftoken.l"
+#line 468 "cftoken.l"
 { YYD; yylval.num = algtype_sha2_512;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 246:
 YY_RULE_SETUP
-#line 468 "cftoken.l"
+#line 469 "cftoken.l"
 { YYD; yylval.num = algtype_oui;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 247:
 YY_RULE_SETUP
-#line 469 "cftoken.l"
+#line 470 "cftoken.l"
 { YYD; yylval.num = algtype_deflate;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 248:
 YY_RULE_SETUP
-#line 470 "cftoken.l"
+#line 471 "cftoken.l"
 { YYD; yylval.num = algtype_lzs;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 249:
 YY_RULE_SETUP
-#line 471 "cftoken.l"
+#line 472 "cftoken.l"
 { YYD; yylval.num = algtype_modp768;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 250:
 YY_RULE_SETUP
-#line 472 "cftoken.l"
+#line 473 "cftoken.l"
 { YYD; yylval.num = algtype_modp1024;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 251:
 YY_RULE_SETUP
-#line 473 "cftoken.l"
+#line 474 "cftoken.l"
 { YYD; yylval.num = algtype_modp1536;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 252:
 YY_RULE_SETUP
-#line 474 "cftoken.l"
+#line 475 "cftoken.l"
 { YYD; yylval.num = algtype_ec2n155;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 253:
 YY_RULE_SETUP
-#line 475 "cftoken.l"
+#line 476 "cftoken.l"
 { YYD; yylval.num = algtype_ec2n185;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 254:
 YY_RULE_SETUP
-#line 476 "cftoken.l"
+#line 477 "cftoken.l"
 { YYD; yylval.num = algtype_modp2048;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 255:
 YY_RULE_SETUP
-#line 477 "cftoken.l"
+#line 478 "cftoken.l"
 { YYD; yylval.num = algtype_modp3072;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 256:
 YY_RULE_SETUP
-#line 478 "cftoken.l"
+#line 479 "cftoken.l"
 { YYD; yylval.num = algtype_modp4096;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 257:
 YY_RULE_SETUP
-#line 479 "cftoken.l"
+#line 480 "cftoken.l"
 { YYD; yylval.num = algtype_modp6144;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 258:
 YY_RULE_SETUP
-#line 480 "cftoken.l"
+#line 481 "cftoken.l"
 { YYD; yylval.num = algtype_modp8192;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 259:
 YY_RULE_SETUP
-#line 481 "cftoken.l"
+#line 482 "cftoken.l"
 { YYD; yylval.num = algtype_psk;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 260:
 YY_RULE_SETUP
-#line 482 "cftoken.l"
+#line 483 "cftoken.l"
 { YYD; yylval.num = algtype_rsasig;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 261:
 YY_RULE_SETUP
-#line 483 "cftoken.l"
+#line 484 "cftoken.l"
 { YYD; yylval.num = algtype_dsssig;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 262:
 YY_RULE_SETUP
-#line 484 "cftoken.l"
+#line 485 "cftoken.l"
 { YYD; yylval.num = algtype_rsaenc;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 263:
 YY_RULE_SETUP
-#line 485 "cftoken.l"
+#line 486 "cftoken.l"
 { YYD; yylval.num = algtype_rsarev;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 264:
 YY_RULE_SETUP
-#line 486 "cftoken.l"
+#line 487 "cftoken.l"
 { YYD; yylval.num = algtype_gssapikrb;	return(ALGORITHMTYPE); }
 	YY_BREAK
 case 265:
 YY_RULE_SETUP
-#line 487 "cftoken.l"
+#line 488 "cftoken.l"
 {
 #ifdef ENABLE_HYBRID
 	YYD; yylval.num = algtype_hybrid_rsa_s; return(ALGORITHMTYPE);
@@ -3299,7 +3322,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 266:
 YY_RULE_SETUP
-#line 494 "cftoken.l"
+#line 495 "cftoken.l"
 {
 #ifdef ENABLE_HYBRID
 	YYD; yylval.num = algtype_hybrid_dss_s; return(ALGORITHMTYPE);
@@ -3310,7 +3333,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 267:
 YY_RULE_SETUP
-#line 501 "cftoken.l"
+#line 502 "cftoken.l"
 {
 #ifdef ENABLE_HYBRID
 	YYD; yylval.num = algtype_hybrid_rsa_c; return(ALGORITHMTYPE);
@@ -3321,7 +3344,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 268:
 YY_RULE_SETUP
-#line 508 "cftoken.l"
+#line 509 "cftoken.l"
 {
 #ifdef ENABLE_HYBRID
 	YYD; yylval.num = algtype_hybrid_dss_c; return(ALGORITHMTYPE);
@@ -3332,7 +3355,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 269:
 YY_RULE_SETUP
-#line 515 "cftoken.l"
+#line 516 "cftoken.l"
 {
 #ifdef ENABLE_HYBRID
 	YYD; yylval.num = algtype_xauth_psk_s; return(ALGORITHMTYPE);
@@ -3343,7 +3366,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 270:
 YY_RULE_SETUP
-#line 522 "cftoken.l"
+#line 523 "cftoken.l"
 {
 #ifdef ENABLE_HYBRID
 	YYD; yylval.num = algtype_xauth_psk_c; return(ALGORITHMTYPE);
@@ -3354,7 +3377,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 271:
 YY_RULE_SETUP
-#line 529 "cftoken.l"
+#line 530 "cftoken.l"
 {
 #ifdef ENABLE_HYBRID
 	YYD; yylval.num = algtype_xauth_rsa_s; return(ALGORITHMTYPE);
@@ -3365,7 +3388,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 272:
 YY_RULE_SETUP
-#line 536 "cftoken.l"
+#line 537 "cftoken.l"
 {
 #ifdef ENABLE_HYBRID
 	YYD; yylval.num = algtype_xauth_rsa_c; return(ALGORITHMTYPE);
@@ -3377,105 +3400,105 @@ YY_RULE_SETUP
 /* identifier type */
 case 273:
 YY_RULE_SETUP
-#line 546 "cftoken.l"
+#line 547 "cftoken.l"
 { YYD; yywarn("it is obsoleted."); return(VENDORID); }
 	YY_BREAK
 case 274:
 YY_RULE_SETUP
-#line 547 "cftoken.l"
+#line 548 "cftoken.l"
 { YYD; yylval.num = IDTYPE_USERFQDN; return(IDENTIFIERTYPE); }
 	YY_BREAK
 case 275:
 YY_RULE_SETUP
-#line 548 "cftoken.l"
+#line 549 "cftoken.l"
 { YYD; yylval.num = IDTYPE_FQDN; return(IDENTIFIERTYPE); }
 	YY_BREAK
 case 276:
 YY_RULE_SETUP
-#line 549 "cftoken.l"
+#line 550 "cftoken.l"
 { YYD; yylval.num = IDTYPE_KEYID; return(IDENTIFIERTYPE); }
 	YY_BREAK
 case 277:
 YY_RULE_SETUP
-#line 550 "cftoken.l"
+#line 551 "cftoken.l"
 { YYD; yylval.num = IDTYPE_ADDRESS; return(IDENTIFIERTYPE); }
 	YY_BREAK
 case 278:
 YY_RULE_SETUP
-#line 551 "cftoken.l"
+#line 552 "cftoken.l"
 { YYD; yylval.num = IDTYPE_SUBNET; return(IDENTIFIERTYPE); }
 	YY_BREAK
 case 279:
 YY_RULE_SETUP
-#line 552 "cftoken.l"
+#line 553 "cftoken.l"
 { YYD; yylval.num = IDTYPE_ASN1DN; return(IDENTIFIERTYPE); }
 	YY_BREAK
 case 280:
 YY_RULE_SETUP
-#line 553 "cftoken.l"
+#line 554 "cftoken.l"
 { YYD; yywarn("certname will be obsoleted in near future."); yylval.num = IDTYPE_ASN1DN; return(IDENTIFIERTYPE); }
 	YY_BREAK
 /* identifier qualifier */
 case 281:
 YY_RULE_SETUP
-#line 556 "cftoken.l"
+#line 557 "cftoken.l"
 { YYD; yylval.num = IDQUAL_TAG;  return(IDENTIFIERQUAL); }
 	YY_BREAK
 case 282:
 YY_RULE_SETUP
-#line 557 "cftoken.l"
+#line 558 "cftoken.l"
 { YYD; yylval.num = IDQUAL_FILE; return(IDENTIFIERQUAL); }
 	YY_BREAK
 /* units */
 case 283:
 YY_RULE_SETUP
-#line 560 "cftoken.l"
+#line 561 "cftoken.l"
 { YYD; return(UNITTYPE_BYTE); }
 	YY_BREAK
 case 284:
 YY_RULE_SETUP
-#line 561 "cftoken.l"
+#line 562 "cftoken.l"
 { YYD; return(UNITTYPE_KBYTES); }
 	YY_BREAK
 case 285:
 YY_RULE_SETUP
-#line 562 "cftoken.l"
+#line 563 "cftoken.l"
 { YYD; return(UNITTYPE_MBYTES); }
 	YY_BREAK
 case 286:
 YY_RULE_SETUP
-#line 563 "cftoken.l"
+#line 564 "cftoken.l"
 { YYD; return(UNITTYPE_TBYTES); }
 	YY_BREAK
 case 287:
 YY_RULE_SETUP
-#line 564 "cftoken.l"
+#line 565 "cftoken.l"
 { YYD; return(UNITTYPE_SEC); }
 	YY_BREAK
 case 288:
 YY_RULE_SETUP
-#line 565 "cftoken.l"
+#line 566 "cftoken.l"
 { YYD; return(UNITTYPE_MIN); }
 	YY_BREAK
 case 289:
 YY_RULE_SETUP
-#line 566 "cftoken.l"
+#line 567 "cftoken.l"
 { YYD; return(UNITTYPE_HOUR); }
 	YY_BREAK
 /* boolean */
 case 290:
 YY_RULE_SETUP
-#line 569 "cftoken.l"
+#line 570 "cftoken.l"
 { YYD; yylval.num = TRUE; return(BOOLEAN); }
 	YY_BREAK
 case 291:
 YY_RULE_SETUP
-#line 570 "cftoken.l"
+#line 571 "cftoken.l"
 { YYD; yylval.num = FALSE; return(BOOLEAN); }
 	YY_BREAK
 case 292:
 YY_RULE_SETUP
-#line 572 "cftoken.l"
+#line 573 "cftoken.l"
 {
 			char *bp;
 
@@ -3486,7 +3509,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 293:
 YY_RULE_SETUP
-#line 580 "cftoken.l"
+#line 581 "cftoken.l"
 {
 			char *p;
 
@@ -3512,7 +3535,7 @@ YY_RULE_SETUP
 case 294:
 /* rule 294 can match eol */
 YY_RULE_SETUP
-#line 602 "cftoken.l"
+#line 603 "cftoken.l"
 {
 			char *p = yytext;
 
@@ -3532,7 +3555,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 295:
 YY_RULE_SETUP
-#line 619 "cftoken.l"
+#line 620 "cftoken.l"
 {
 			YYD;
 
@@ -3566,7 +3589,7 @@ case YY_STATE_EOF(S_RMTS):
 case YY_STATE_EOF(S_RMTP):
 case YY_STATE_EOF(S_SA):
 case YY_STATE_EOF(S_GSSENC):
-#line 632 "cftoken.l"
+#line 633 "cftoken.l"
 {
 			yy_delete_buffer(YY_CURRENT_BUFFER);
 			incstackp--;
@@ -3594,36 +3617,36 @@ case YY_STATE_EOF(S_GSSENC):
 /* ... */
 case 296:
 YY_RULE_SETUP
-#line 657 "cftoken.l"
+#line 658 "cftoken.l"
 { ; }
 	YY_BREAK
 case 297:
 /* rule 297 can match eol */
 YY_RULE_SETUP
-#line 658 "cftoken.l"
+#line 659 "cftoken.l"
 { incstack[incstackp].lineno++; }
 	YY_BREAK
 case 298:
 YY_RULE_SETUP
-#line 659 "cftoken.l"
+#line 660 "cftoken.l"
 { YYD; }
 	YY_BREAK
 case 299:
 YY_RULE_SETUP
-#line 660 "cftoken.l"
+#line 661 "cftoken.l"
 { return(EOS); }
 	YY_BREAK
 case 300:
 YY_RULE_SETUP
-#line 661 "cftoken.l"
+#line 662 "cftoken.l"
 { yymore(); }
 	YY_BREAK
 case 301:
 YY_RULE_SETUP
-#line 663 "cftoken.l"
+#line 664 "cftoken.l"
 ECHO;
 	YY_BREAK
-#line 3627 "cftoken.c"
+#line 3650 "cftoken.c"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -4171,9 +4194,19 @@ static void yy_load_buffer_state  (void)
 	yyfree((void *) b  );
 }
 
-#ifndef __cplusplus
+#ifndef _UNISTD_H /* assume unistd.h has isatty() for us */
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __THROW /* this is a gnuism */
+extern int isatty (int ) __THROW;
+#else
 extern int isatty (int );
-#endif /* __cplusplus */
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
     
 /* Initializes or reinitializes a buffer.
  * This function is sometimes called more than once on the same buffer,
@@ -4619,7 +4652,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 663 "cftoken.l"
+#line 664 "cftoken.l"