- Re-create autogenerated files

git-svn-id: svn://svn.ircd-hybrid.org/svnroot/hopm/trunk@6223 82007160-df01-0410-b94d-b575c5fd34c7

diff --git a/Makefile.in b/Makefile.in
index 2b2a7329b4e179fc26d38332f96ea343ddb11b36..c77fd0995ed538df3bbf1a4dcf4de67e02e7b4b5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -93,6 +93,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \
        $(top_srcdir)/m4/ax_append_flag.m4 \
        $(top_srcdir)/m4/ax_arg_enable_assert.m4 \
        $(top_srcdir)/m4/ax_arg_enable_warnings.m4 \
+       $(top_srcdir)/m4/ax_arg_openssl.m4 \
        $(top_srcdir)/m4/ax_check_compile_flag.m4 \
        $(top_srcdir)/m4/ax_library_net.m4 \
        $(top_srcdir)/m4/ax_require_defined.m4 \

diff --git a/aclocal.m4 b/aclocal.m4
index a21f6378440b4e9b6f6b5fbf8d2eb1900abc6374..7f188b1da86d5c8d7b4d3c049e93fc439ab6ca9f 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1208,6 +1208,7 @@ m4_include([m4/ax_append_compile_flags.m4])
 m4_include([m4/ax_append_flag.m4])
 m4_include([m4/ax_arg_enable_assert.m4])
 m4_include([m4/ax_arg_enable_warnings.m4])
+m4_include([m4/ax_arg_openssl.m4])
 m4_include([m4/ax_check_compile_flag.m4])
 m4_include([m4/ax_library_net.m4])
 m4_include([m4/ax_require_defined.m4])

diff --git a/configure b/configure
index f4f94b71cb1a18afdd6eb091f19c24cff5c40aa4..6ce351b953dcacffbca737407557d5f373d7fc1e 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Id: configure.ac 6133 2015-06-11 19:20:00Z michael .
+# From configure.ac Id: configure.ac 6222 2015-07-01 18:09:27Z michael .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69 for hopm TRUNK.
 #
@@ -638,6 +638,8 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+ENABLE_SSL_FALSE
+ENABLE_SSL_TRUE
 LEXLIB
 LEX_OUTPUT_ROOT
 LEX
@@ -773,6 +775,7 @@ with_aix_soname
 with_gnu_ld
 with_sysroot
 enable_libtool_lock
+enable_openssl
 enable_assert
 enable_warnings
 '
@@ -1420,6 +1423,8 @@ Optional Features:
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
+  --enable-openssl=DIR       Enable LibreSSL/OpenSSL support (DIR optional).
+  --disable-openssl            Disable LibreSSL/OpenSSL support.
   --enable-assert         Enable assert() statements
   --enable-warnings       Enable compiler warnings.
 
@@ -12577,6 +12582,203 @@ fi
 
 
 
+# Check whether --enable-openssl was given.
+if test "${enable_openssl+set}" = set; then :
+  enableval=$enable_openssl;  cf_enable_openssl=$enableval
+else
+   cf_enable_openssl="auto"
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LibreSSL/OpenSSL" >&5
+$as_echo_n "checking for LibreSSL/OpenSSL... " >&6; }
+if test "$cf_enable_openssl" != "no"; then
+  cf_openssl_basedir=""
+  if test "$cf_enable_openssl" != "auto" &&
+     test "$cf_enable_openssl" != "yes"; then
+          cf_openssl_basedir="${cf_enable_openssl}"
+  else
+        for dirs in /usr/local/ssl /usr/pkg /usr/local /usr/lib /usr/lib/ssl\
+                /opt /opt/openssl /usr/local/openssl; do
+      if test -f "${dirs}/include/openssl/opensslv.h"; then
+        cf_openssl_basedir="${dirs}"
+        break
+      fi
+    done
+    unset dirs
+  fi
+
+    if test ! -z "$cf_openssl_basedir"; then
+    if test -f "${cf_openssl_basedir}/include/openssl/opensslv.h"; then
+      CPPFLAGS="-I${cf_openssl_basedir}/include $CPPFLAGS"
+      LDFLAGS="-L${cf_openssl_basedir}/lib $LDFLAGS"
+    else
+                  cf_openssl_basedir=""
+    fi
+  else
+                            if test -f "/usr/include/openssl/opensslv.h"; then
+      cf_openssl_basedir="/usr"
+    fi
+  fi
+
+      if test ! -z "$cf_openssl_basedir"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cf_openssl_basedir" >&5
+$as_echo "$cf_openssl_basedir" >&6; }
+    cf_enable_openssl="yes"
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found. Please check your path." >&5
+$as_echo "not found. Please check your path." >&6; }
+    cf_enable_openssl="no"
+  fi
+  unset cf_openssl_basedir
+else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
+fi
+
+if test "$cf_enable_openssl" != "no"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LibreSSL or OpenSSL 0.9.8o and above" >&5
+$as_echo_n "checking for LibreSSL or OpenSSL 0.9.8o and above... " >&6; }
+  if test "$cross_compiling" = yes; then :
+  cf_openssl_version_ok=no
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+    #include <openssl/opensslv.h>
+    #include <stdlib.h>
+int
+main ()
+{
+ exit(!(OPENSSL_VERSION_NUMBER >= 0x009080ffL));
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  cf_openssl_version_ok=yes
+else
+  cf_openssl_version_ok=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+  if test "$cf_openssl_version_ok" = "yes"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSA_free in -lcrypto" >&5
+$as_echo_n "checking for RSA_free in -lcrypto... " >&6; }
+if ${ac_cv_lib_crypto_RSA_free+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcrypto  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char RSA_free ();
+int
+main ()
+{
+return RSA_free ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_crypto_RSA_free=yes
+else
+  ac_cv_lib_crypto_RSA_free=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RSA_free" >&5
+$as_echo "$ac_cv_lib_crypto_RSA_free" >&6; }
+if test "x$ac_cv_lib_crypto_RSA_free" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBCRYPTO 1
+_ACEOF
+
+  LIBS="-lcrypto $LIBS"
+
+fi
+
+    if test "$ac_cv_lib_crypto_RSA_free" = "yes"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_connect in -lssl" >&5
+$as_echo_n "checking for SSL_connect in -lssl... " >&6; }
+if ${ac_cv_lib_ssl_SSL_connect+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lssl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char SSL_connect ();
+int
+main ()
+{
+return SSL_connect ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_ssl_SSL_connect=yes
+else
+  ac_cv_lib_ssl_SSL_connect=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_connect" >&5
+$as_echo "$ac_cv_lib_ssl_SSL_connect" >&6; }
+if test "x$ac_cv_lib_ssl_SSL_connect" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSSL 1
+_ACEOF
+
+  LIBS="-lssl $LIBS"
+
+fi
+
+fi
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - LibreSSL/OpenSSL support disabled" >&5
+$as_echo "no - LibreSSL/OpenSSL support disabled" >&6; }
+    cf_enable_openssl="no"
+fi
+fi
+
+ if test "$ac_cv_lib_ssl_SSL_connect" = yes; then
+  ENABLE_SSL_TRUE=
+  ENABLE_SSL_FALSE='#'
+else
+  ENABLE_SSL_TRUE='#'
+  ENABLE_SSL_FALSE=
+fi
+
+
+
   # Check whether --enable-assert was given.
 if test "${enable_assert+set}" = set; then :
   enableval=$enable_assert; assert=$enableval
@@ -14783,6 +14985,10 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${ENABLE_SSL_TRUE}" && test -z "${ENABLE_SSL_FALSE}"; then
+  as_fn_error $? "conditional \"ENABLE_SSL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 
 : "${CONFIG_STATUS=./config.status}"

diff --git a/doc/Makefile.in b/doc/Makefile.in
index b65f0f20e63bdf39999010f43c092df276cad2a4..50335b89c32bc9eda669858e03ac2d5cc9a3e07d 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -94,6 +94,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \
        $(top_srcdir)/m4/ax_append_flag.m4 \
        $(top_srcdir)/m4/ax_arg_enable_assert.m4 \
        $(top_srcdir)/m4/ax_arg_enable_warnings.m4 \
+       $(top_srcdir)/m4/ax_arg_openssl.m4 \
        $(top_srcdir)/m4/ax_check_compile_flag.m4 \
        $(top_srcdir)/m4/ax_library_net.m4 \
        $(top_srcdir)/m4/ax_require_defined.m4 \

diff --git a/src/Makefile.in b/src/Makefile.in
index ffeddf4171b5dd1d8cefd45df38859a81d024caf..e057f0523b5b31da25fc4f2dad164410ac130a9e 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -95,6 +95,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \
        $(top_srcdir)/m4/ax_append_flag.m4 \
        $(top_srcdir)/m4/ax_arg_enable_assert.m4 \
        $(top_srcdir)/m4/ax_arg_enable_warnings.m4 \
+       $(top_srcdir)/m4/ax_arg_openssl.m4 \
        $(top_srcdir)/m4/ax_check_compile_flag.m4 \
        $(top_srcdir)/m4/ax_library_net.m4 \
        $(top_srcdir)/m4/ax_require_defined.m4 \

diff --git a/src/config-lexer.c b/src/config-lexer.c
index f387bf9a257dec0186adc8068fb55ab4c3e78eda..9855861200be65485f8b5ffe160d6c99109b2e67 100644 (file)
--- a/src/config-lexer.c
+++ b/src/config-lexer.c
@@ -365,8 +365,8 @@ static void yy_fatal_error (yyconst char msg[]  );
        *yy_cp = '\0'; \
        (yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 95
-#define YY_END_OF_BUFFER 96
+#define YY_NUM_RULES 97
+#define YY_END_OF_BUFFER 98
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -374,51 +374,51 @@ struct yy_trans_info
        flex_int32_t yy_verify;
        flex_int32_t yy_nxt;
        };
-static yyconst flex_int16_t yy_accept[393] =
+static yyconst flex_int16_t yy_accept[398] =
     {   0,
-       93,   93,   96,   94,   93,   92,   94,    2,   94,   85,
-       94,   94,   94,   94,   94,   94,   94,   94,   94,   94,
-       94,   94,   94,   94,   94,   94,   94,   94,   94,   94,
-       93,   92,    0,    3,    2,    1,    2,   85,    0,    0,
+       95,   95,   98,   96,   95,   94,   96,    2,   96,   87,
+       96,   96,   96,   96,   96,   96,   96,   96,   96,   96,
+       96,   96,   96,   96,   96,   96,   96,   96,   96,   96,
+       95,   94,    0,    3,    2,    1,    2,   87,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,   14,
         0,    0,    0,    0,   72,    0,    0,    0,    0,   77,
-        0,    0,    0,    0,    0,    0,   90,    0,   88,    0,
+        0,    0,    0,    0,    0,    0,   92,    0,   90,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,   59,    0,    0,    0,    0,
 
         0,    0,    0,   16,    0,   18,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,   91,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,   93,
         0,   29,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,   87,    4,    0,    0,
+        0,    0,    0,    0,    0,    0,   89,    4,    0,    0,
        67,    0,    0,   58,    0,    0,    0,    0,    0,   61,
        78,    0,    0,    0,    0,   19,    0,    0,    0,    0,
        21,    0,   22,    0,   25,    0,   28,    0,    0,    0,
         0,   34,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,   86,   48,   49,    0,   57,
+        0,    0,    0,    0,    0,   88,   48,   49,    0,   57,
 
         0,   53,    0,    0,   66,    0,    0,    0,    0,    0,
-        0,    0,   89,   60,    0,    0,   71,    0,   17,    0,
-       76,    0,    0,   55,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,   39,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,   51,   56,    0,   52,
-        0,    0,    0,    0,    0,    0,    0,    0,   13,    0,
-       15,   70,    0,    0,   75,    0,   63,   54,    0,    0,
-       27,    0,    0,    0,    0,    0,    0,    0,    0,   83,
-        0,    0,   65,    0,   43,   80,   81,    0,    0,    0,
-        0,    0,    0,    7,    0,    0,    0,    0,    0,    0,
-
-        0,    0,    0,    0,   62,    0,    0,   30,    0,   32,
-       33,    0,    0,    0,    0,   40,   41,   64,    0,    0,
-       47,    0,   82,    0,    0,    0,    0,   12,    0,    0,
-       84,   79,   69,   20,   74,   23,   26,   31,   35,    0,
-       37,    0,   42,    0,    0,    0,   50,    0,    6,    8,
-        0,    0,    0,   68,   73,    0,    0,    0,   44,    0,
-        0,    0,   11,    0,    0,    0,    0,    0,    0,    0,
-        5,    9,   10,    0,   36,    0,   45,    0,    0,    0,
-        0,    0,    0,   46,    0,    0,    0,    0,   24,    0,
-       38,    0
+        0,    0,   91,   60,    0,   80,    0,   71,    0,   17,
+        0,   76,    0,    0,   55,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,   39,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   51,   56,    0,
+       52,    0,    0,    0,    0,    0,    0,    0,    0,   13,
+        0,    0,   15,   70,    0,    0,   75,    0,   63,   54,
+        0,    0,   27,    0,    0,    0,    0,    0,    0,    0,
+        0,   85,    0,    0,   65,    0,   43,   82,   83,    0,
+        0,    0,    0,    0,    0,    7,    0,    0,    0,    0,
+
+        0,    0,    0,    0,    0,    0,    0,   62,    0,    0,
+       30,    0,   32,   33,    0,    0,    0,    0,   40,   41,
+       64,    0,    0,   47,    0,   84,    0,    0,    0,    0,
+       12,    0,    0,   86,   79,    0,   69,   20,   74,   23,
+       26,   31,   35,    0,   37,    0,   42,    0,    0,    0,
+       50,    0,    6,    8,    0,    0,    0,   81,   68,   73,
+        0,    0,    0,   44,    0,    0,    0,   11,    0,    0,
+        0,    0,    0,    0,    0,    5,    9,   10,    0,   36,
+        0,   45,    0,    0,    0,    0,    0,    0,   46,    0,
+        0,    0,    0,   24,    0,   38,    0
 
     } ;
 
@@ -464,103 +464,103 @@ static yyconst flex_int32_t yy_meta[58] =
         1,    1,    1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int16_t yy_base[396] =
+static yyconst flex_int16_t yy_base[401] =
     {   0,
-        0,    0,  230,  786,  167,    0,   55,    0,   54,   54,
+        0,    0,  230,  795,  167,    0,   55,    0,   54,   54,
        34,   55,   49,   57,   37,   60,   51,   55,   94,  129,
        99,  103,  167,   72,  112,  155,   43,   59,  116,   69,
-      165,    0,   82,  786,    0,  786,    0,  148,  110,   99,
-      150,  135,  159,  148,  140,  148,  161,  164,  159,  786,
+      165,    0,   82,  795,    0,  795,    0,  148,  110,   99,
+      150,  135,  159,  148,  140,  148,  161,  164,  159,  795,
       154,  156,  159,  179,  163,  168,  188,  192,  187,  185,
-      204,  199,  209,  202,  209,  214,  200,  213,  786,  239,
+      204,  199,  209,  202,  209,  214,  200,  213,  795,  239,
       204,  208,  222,  213,  216,  246,  212,  233,  249,  236,
       240,  247,  241,  249,  261,  253,  264,  257,  278,  249,
       128,  271,  272,  265,  269,  270,  290,  296,  287,  283,
 
-      288,  290,  298,  786,  290,  786,  295,  297,  302,  120,
-      295,  314,  298,  313,  302,  317,  322,  316,  318,  786,
-      314,  786,  326,  321,  334,  337,  327,  329,  344,  338,
+      288,  290,  298,  795,  290,  795,  295,  297,  302,  120,
+      295,  314,  298,  313,  302,  317,  322,  316,  318,  795,
+      314,  795,  326,  321,  334,  337,  327,  329,  344,  338,
       342,  338,  344,  344,  356,  341,  353,  358,  361,  363,
-      365,  357,  357,  365,  371,  367,  786,  786,  367,  378,
-      374,  380,  379,  786,  385,  395,  388,  388,  399,  388,
-      391,  390,  404,  409,  409,  786,  400,  413,  419,  404,
-      786,  415,  786,  425,  414,  431,  786,  422,  418,  427,
-      434,  786,  430,  430,  436,  438,  429,  448,  443,  444,
-      447,  456,  445,  459,  452,  786,  786,  456,  452,  454,
-
-      473,  462,  469,  473,  786,  482,  484,   98,  487,  483,
-      494,  479,  786,  786,  485,  495,  484,  479,  786,  499,
-      488,  484,  504,  493,  509,  509,  512,  505,  505,  506,
-      516,  527,  523,  534,  524,  786,  523,  526,  539,  541,
-      546,  532,  107,  531,  531,  551,  786,  786,  535,  786,
-      545,  548,  547,  553,  560,  551,  553,  553,  786,  553,
-      786,  786,  557,  579,  786,  565,  568,  786,  579,  572,
-      786,  575,  577,  583,  591,  583,  586,  588,  596,  786,
-      596,  589,  589,  599,  786,  786,  786,   95,  592,  601,
-      609,  602,  601,  786,  618,  610,  614,  622,  628,  613,
-
-      618,  635,  637,  638,  786,  639,  625,  786,  642,  786,
-      786,  637,  644,  646,  650,  786,  786,  786,  643,  665,
-      786,  656,  786,  648,  645,  644,  657,  786,  664,  665,
-      786,  786,  664,  786,  666,   90,  786,  786,  786,  670,
-      786,  670,  786,  674,  677,  674,  786,  672,  786,  786,
-      682,  687,  678,  786,  786,  683,  682,  693,  786,  693,
-      694,  698,  786,  696,  701,  717,  706,  714,  710,  720,
-      786,  786,  786,  728,  786,  713,  786,  719,  717,  732,
-      732,  731,  725,  786,  731,  724,  741,  746,  786,  738,
-      786,  786,   81,  783,   71
+      365,  357,  357,  365,  371,  367,  795,  795,  367,  378,
+      374,  380,  379,  795,  385,  395,  388,  388,  399,  388,
+      391,  391,  406,  412,  411,  795,  402,  416,  420,  405,
+      795,  418,  795,  430,  417,  433,  795,  425,  420,  429,
+      435,  795,  434,  431,  438,  439,  430,  449,  446,  443,
+      449,  457,  447,  461,  455,  795,  795,  457,  453,  457,
+
+      478,  465,  471,  476,  795,  484,  486,   98,  488,  487,
+      495,  481,  795,  795,  486,  486,  497,  487,  482,  795,
+      502,  492,  487,  507,  497,  514,  513,  514,  509,  513,
+      514,  521,  532,  528,  538,  527,  795,  528,  531,  542,
+      544,  548,  534,  107,  534,  534,  554,  795,  795,  539,
+      795,  548,  551,  551,  558,  560,  556,  558,  561,  795,
+      563,  569,  795,  795,  567,  586,  795,  570,  575,  795,
+      585,  579,  795,  579,  581,  586,  595,  587,  591,  593,
+      601,  795,  601,  594,  596,  605,  795,  795,  795,   95,
+      597,  606,  618,  613,  611,  795,  626,  617,  621,  627,
+
+      635,  619,  625,  627,  640,  642,  643,  795,  644,  631,
+      795,  649,  795,  795,  643,  651,  653,  658,  795,  795,
+      795,  651,  672,  795,  661,  795,  657,  656,  654,  665,
+      795,  671,  670,  795,  795,  670,  674,  795,  675,   90,
+      795,  795,  795,  679,  795,  676,  795,  681,  683,  681,
+      795,  680,  795,  795,  690,  695,  687,  795,  795,  795,
+      693,  691,  705,  795,  703,  706,  711,  795,  709,  711,
+      726,  714,  722,  718,  728,  795,  795,  795,  737,  795,
+      722,  795,  728,  723,  739,  738,  738,  733,  795,  739,
+      732,  750,  756,  795,  747,  795,  795,   81,  792,   71
 
     } ;
 
-static yyconst flex_int16_t yy_def[396] =
+static yyconst flex_int16_t yy_def[401] =
     {   0,
-      392,    1,  392,  392,  392,  393,  394,  395,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  393,  394,  392,  395,  392,  395,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,    0,  392,  392,  392
+      397,    1,  397,  397,  397,  398,  399,  400,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  398,  399,  397,  400,  397,  400,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,    0,  397,  397,  397
 
     } ;
 
-static yyconst flex_int16_t yy_nxt[844] =
+static yyconst flex_int16_t yy_nxt[853] =
     {   0,
         4,    5,    6,    7,    8,    4,    9,   10,   10,   10,
        11,   12,   13,   14,   15,   16,    4,   17,   18,   19,
@@ -574,9 +574,9 @@ static yyconst flex_int16_t yy_nxt[844] =
        43,   45,   48,   85,   49,   77,   44,   50,   51,   41,
 
        86,   53,   52,   46,   54,   55,   47,   89,   56,   64,
-       76,   42,   57,   65,   58,  286,  287,   66,   68,   77,
-       90,   91,   67,  356,   78,   69,   79,   70,  320,   55,
-       87,  255,   56,   64,   88,   80,   57,   65,   58,   59,
+       76,   42,   57,   65,   58,  288,  289,   66,   68,   77,
+       90,   91,   67,  361,   78,   69,   79,   70,  323,   55,
+       87,  256,   56,   64,   88,   80,   57,   65,   58,   59,
        60,   66,   68,   61,   90,   91,   67,   62,   78,   69,
        79,   70,   63,  167,   87,   38,   38,   38,   88,   80,
        92,  149,   93,   59,   60,   81,   31,   61,   31,   94,
@@ -586,8 +586,8 @@ static yyconst flex_int16_t yy_nxt[844] =
 
       106,   71,   99,  100,   83,   72,  101,  102,  107,   73,
       108,   84,  103,  109,   74,  104,   75,  111,  110,  105,
-      112,  113,  114,  116,  106,  117,  118,  119,  120,  392,
-      124,  115,  107,  125,  108,  126,  392,  109,  127,  128,
+      112,  113,  114,  116,  106,  117,  118,  119,  120,  397,
+      124,  115,  107,  125,  108,  126,  397,  109,  127,  128,
       132,  111,  110,  133,  112,  113,  114,  116,  137,  117,
       118,  119,  120,  121,  124,  115,  129,  125,  130,  126,
       122,  134,  127,  128,  132,  138,  123,  133,  139,  140,
@@ -612,52 +612,53 @@ static yyconst flex_int16_t yy_nxt[844] =
       222,  223,  224,  211,  209,  225,  212,  213,  214,  215,
       226,  216,  217,  227,  218,  228,  210,  219,  229,  220,
       230,  221,  231,  232,  222,  223,  224,  233,  234,  225,
-      235,  236,  237,  238,  226,  239,  240,  227,  241,  228,
+      235,  236,  237,  238,  226,  241,  239,  227,  240,  228,
       242,  243,  229,  244,  230,  245,  231,  232,  246,  247,
-      248,  233,  234,  249,  235,  236,  237,  238,  250,  239,
-      240,  251,  241,  252,  242,  243,  253,  244,  254,  245,
+      248,  233,  234,  249,  235,  236,  237,  238,  250,  241,
+      239,  251,  240,  252,  242,  243,  253,  244,  254,  245,
 
-      256,  257,  246,  247,  248,  258,  259,  249,  260,  261,
+      255,  257,  246,  247,  248,  258,  259,  249,  260,  261,
       262,  263,  250,  264,  265,  251,  266,  252,  267,  268,
-      253,  269,  254,  270,  256,  257,  271,  272,  273,  258,
+      253,  269,  254,  270,  255,  257,  271,  272,  273,  258,
       259,  274,  260,  261,  262,  263,  275,  264,  265,  276,
       266,  277,  267,  268,  278,  269,  279,  270,  280,  281,
-      271,  272,  273,  282,  283,  274,  284,  285,  288,  289,
+      271,  272,  273,  282,  283,  274,  284,  285,  286,  287,
       275,  290,  291,  276,  292,  277,  293,  294,  278,  295,
-      279,  298,  280,  281,  299,  296,  300,  282,  283,  301,
-      284,  285,  288,  289,  302,  290,  291,  297,  292,  303,
-      293,  294,  304,  295,  305,  298,  306,  307,  299,  296,
+      279,  296,  280,  281,  297,  298,  300,  282,  283,  301,
+      284,  285,  286,  287,  302,  290,  291,  299,  292,  303,
+      293,  294,  304,  295,  305,  296,  306,  307,  297,  298,
 
       300,  308,  309,  301,  310,  311,  312,  313,  302,  314,
-      315,  297,  316,  303,  317,  318,  304,  319,  305,  321,
-      306,  307,  322,  323,  324,  308,  309,  325,  310,  311,
+      315,  299,  316,  303,  317,  318,  304,  319,  305,  320,
+      306,  307,  321,  322,  324,  308,  309,  325,  310,  311,
       312,  313,  326,  314,  315,  327,  316,  328,  317,  318,
-      329,  319,  330,  321,  331,  332,  322,  323,  324,  333,
+      329,  319,  330,  320,  331,  332,  321,  322,  324,  333,
       334,  325,  335,  336,  337,  338,  326,  339,  340,  327,
-      341,  328,  342,  343,  329,  392,  330,  392,  331,  332,
-      347,  348,  349,  333,  334,  350,  335,  336,  337,  338,
-      351,  339,  340,  344,  341,  352,  342,  343,  353,  345,
-      354,  346,  355,  357,  347,  348,  349,  358,  359,  350,
-
-      360,  361,  362,  363,  351,  364,  365,  344,  366,  352,
-      367,  368,  353,  345,  354,  346,  355,  357,  369,  370,
-      371,  358,  359,  372,  360,  361,  362,  363,  373,  364,
-      365,  374,  366,  375,  367,  368,  376,  377,  378,  379,
-      380,  381,  369,  370,  371,  382,  383,  372,  384,  385,
-      386,  387,  373,  388,  389,  374,  390,  375,  391,  392,
-      376,  377,  378,  379,  380,  381,  392,  392,  392,  382,
-      383,  392,  384,  385,  386,  387,  392,  388,  389,  392,
-      390,  392,  391,   33,   33,    3,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392
+      341,  328,  342,  343,  329,  344,  330,  345,  331,  332,
+      346,  347,  397,  333,  334,  351,  335,  336,  337,  338,
+      352,  339,  340,  353,  341,  354,  342,  343,  355,  344,
+      348,  345,  356,  357,  346,  347,  349,  358,  350,  351,
+
+      359,  360,  362,  363,  352,  364,  365,  353,  366,  354,
+      367,  368,  355,  369,  348,  370,  356,  357,  371,  372,
+      349,  358,  350,  373,  359,  360,  362,  363,  374,  364,
+      365,  375,  366,  376,  367,  368,  377,  369,  378,  370,
+      379,  380,  371,  372,  381,  382,  383,  373,  384,  385,
+      386,  387,  374,  388,  389,  375,  390,  376,  391,  392,
+      377,  393,  378,  394,  379,  380,  395,  396,  381,  382,
+      383,  397,  384,  385,  386,  387,  397,  388,  389,  397,
+      390,  397,  391,  392,  397,  393,  397,  394,  397,  397,
+      395,  396,   33,   33,    3,  397,  397,  397,  397,  397,
+
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397
     } ;
 
-static yyconst flex_int16_t yy_chk[844] =
+static yyconst flex_int16_t yy_chk[853] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -666,13 +667,13 @@ static yyconst flex_int16_t yy_chk[844] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    7,    7,    9,
         9,   10,   10,   10,   11,   12,   13,   14,   15,   27,
-       16,  395,   13,   16,   17,   12,   28,   18,   17,   14,
-       18,  393,   14,   30,   33,   33,   24,   12,   11,   12,
+       16,  400,   13,   16,   17,   12,   28,   18,   17,   14,
+       18,  398,   14,   30,   33,   33,   24,   12,   11,   12,
        13,   14,   15,   27,   16,   24,   13,   16,   17,   12,
 
        28,   18,   17,   14,   18,   19,   14,   30,   19,   21,
-       24,   12,   19,   21,   19,  243,  243,   21,   22,   24,
-       39,   40,   21,  336,   25,   22,   25,   22,  288,   19,
+       24,   12,   19,   21,   19,  244,  244,   21,   22,   24,
+       39,   40,   21,  340,   25,   22,   25,   22,  290,   19,
        29,  208,   19,   21,   29,   25,   19,   21,   19,   20,
        20,   21,   22,   20,   39,   40,   21,   20,   25,   22,
        25,   22,   20,  110,   29,   38,   38,   38,   29,   25,
@@ -704,54 +705,55 @@ static yyconst flex_int16_t yy_chk[844] =
       133,  134,  146,  135,  136,  149,  137,  150,  138,  139,
 
       151,  140,  152,  141,  153,  155,  142,  143,  144,  157,
-      156,  145,  158,  159,  160,  161,  146,  162,  163,  149,
-      164,  150,  156,  165,  151,  167,  152,  168,  153,  155,
-      169,  170,  172,  157,  156,  174,  158,  159,  160,  161,
-      175,  162,  163,  176,  164,  178,  156,  165,  179,  167,
-      180,  168,  181,  183,  169,  170,  172,  184,  185,  174,
-      186,  187,  188,  189,  175,  189,  190,  176,  191,  178,
-      192,  193,  179,  194,  180,  195,  181,  183,  198,  199,
-      200,  184,  185,  201,  186,  187,  188,  189,  202,  189,
-      190,  203,  191,  204,  192,  193,  206,  194,  207,  195,
-
-      209,  210,  198,  199,  200,  211,  212,  201,  215,  216,
-      217,  218,  202,  220,  221,  203,  222,  204,  223,  224,
-      206,  225,  207,  226,  209,  210,  227,  228,  229,  211,
-      212,  230,  215,  216,  217,  218,  231,  220,  221,  232,
-      222,  233,  223,  224,  234,  225,  235,  226,  237,  238,
-      227,  228,  229,  239,  240,  230,  241,  242,  244,  245,
-      231,  246,  249,  232,  251,  233,  252,  253,  234,  254,
-      235,  256,  237,  238,  257,  255,  258,  239,  240,  260,
-      241,  242,  244,  245,  263,  246,  249,  255,  251,  264,
-      252,  253,  266,  254,  267,  256,  269,  270,  257,  255,
-
-      258,  272,  273,  260,  274,  275,  276,  277,  263,  278,
-      279,  255,  281,  264,  282,  283,  266,  284,  267,  289,
-      269,  270,  290,  291,  292,  272,  273,  293,  274,  275,
-      276,  277,  295,  278,  279,  296,  281,  297,  282,  283,
-      298,  284,  299,  289,  300,  301,  290,  291,  292,  302,
-      303,  293,  304,  306,  307,  309,  295,  312,  313,  296,
-      314,  297,  315,  319,  298,    0,  299,    0,  300,  301,
-      322,  324,  325,  302,  303,  326,  304,  306,  307,  309,
-      327,  312,  313,  320,  314,  329,  315,  319,  330,  320,
-      333,  320,  335,  340,  322,  324,  325,  342,  344,  326,
-
-      345,  346,  348,  351,  327,  352,  353,  320,  356,  329,
-      357,  358,  330,  320,  333,  320,  335,  340,  360,  361,
-      362,  342,  344,  364,  345,  346,  348,  351,  365,  352,
-      353,  366,  356,  367,  357,  358,  368,  369,  370,  374,
-      376,  378,  360,  361,  362,  379,  380,  364,  381,  382,
-      383,  385,  365,  386,  387,  366,  388,  367,  390,    0,
-      368,  369,  370,  374,  376,  378,    0,    0,    0,  379,
-      380,    0,  381,  382,  383,  385,    0,  386,  387,    0,
-      388,    0,  390,  394,  394,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392,  392,  392,  392,  392,  392,  392,  392,
-      392,  392,  392
+      156,  145,  158,  159,  160,  161,  146,  161,  162,  149,
+      163,  150,  156,  164,  151,  165,  152,  167,  153,  155,
+      168,  169,  170,  157,  156,  172,  158,  159,  160,  161,
+      174,  161,  162,  175,  163,  176,  156,  164,  178,  165,
+      179,  167,  180,  181,  168,  169,  170,  183,  184,  172,
+      185,  186,  187,  188,  174,  190,  189,  175,  189,  176,
+      191,  192,  178,  193,  179,  194,  180,  181,  195,  198,
+      199,  183,  184,  200,  185,  186,  187,  188,  201,  190,
+      189,  202,  189,  203,  191,  192,  204,  193,  206,  194,
+
+      207,  209,  195,  198,  199,  210,  211,  200,  212,  215,
+      216,  217,  201,  218,  219,  202,  221,  203,  222,  223,
+      204,  224,  206,  225,  207,  209,  226,  227,  228,  210,
+      211,  229,  212,  215,  216,  217,  230,  218,  219,  231,
+      221,  232,  222,  223,  233,  224,  234,  225,  235,  236,
+      226,  227,  228,  238,  239,  229,  240,  241,  242,  243,
+      230,  245,  246,  231,  247,  232,  250,  252,  233,  253,
+      234,  254,  235,  236,  255,  256,  257,  238,  239,  258,
+      240,  241,  242,  243,  259,  245,  246,  256,  247,  261,
+      250,  252,  262,  253,  265,  254,  266,  268,  255,  256,
+
+      257,  269,  271,  258,  272,  274,  275,  276,  259,  277,
+      278,  256,  279,  261,  280,  281,  262,  283,  265,  284,
+      266,  268,  285,  286,  291,  269,  271,  292,  272,  274,
+      275,  276,  293,  277,  278,  294,  279,  295,  280,  281,
+      297,  283,  298,  284,  299,  300,  285,  286,  291,  301,
+      302,  292,  303,  304,  305,  306,  293,  307,  309,  294,
+      310,  295,  312,  315,  297,  316,  298,  317,  299,  300,
+      318,  322,    0,  301,  302,  325,  303,  304,  305,  306,
+      327,  307,  309,  328,  310,  329,  312,  315,  330,  316,
+      323,  317,  332,  333,  318,  322,  323,  336,  323,  325,
+
+      337,  339,  344,  346,  327,  348,  349,  328,  350,  329,
+      352,  355,  330,  356,  323,  357,  332,  333,  361,  362,
+      323,  336,  323,  363,  337,  339,  344,  346,  365,  348,
+      349,  366,  350,  367,  352,  355,  369,  356,  370,  357,
+      371,  372,  361,  362,  373,  374,  375,  363,  379,  381,
+      383,  384,  365,  385,  386,  366,  387,  367,  388,  390,
+      369,  391,  370,  392,  371,  372,  393,  395,  373,  374,
+      375,    0,  379,  381,  383,  384,    0,  385,  386,    0,
+      387,    0,  388,  390,    0,  391,    0,  392,    0,    0,
+      393,  395,  399,  399,  397,  397,  397,  397,  397,  397,
+
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397,  397,  397,  397,  397,  397,  397,  397,  397,
+      397,  397
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -804,7 +806,7 @@ static void ccomment(void);
 unsigned int linenum = 1;
 char linebuf[512];
 
-#line 808 "config-lexer.c"
+#line 810 "config-lexer.c"
 
 #define INITIAL 0
 
@@ -1014,7 +1016,7 @@ YY_DECL
 #line 46 "config-lexer.l"
 
 
-#line 1018 "config-lexer.c"
+#line 1020 "config-lexer.c"
 
        while ( 1 )             /* loops until end-of-file is reached */
                {
@@ -1047,13 +1049,13 @@ yy_match:
                        while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                                {
                                yy_current_state = (int) yy_def[yy_current_state];
-                               if ( yy_current_state >= 393 )
+                               if ( yy_current_state >= 398 )
                                        yy_c = yy_meta[(unsigned int) yy_c];
                                }
                        yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
                        ++yy_cp;
                        }
-               while ( yy_current_state != 392 );
+               while ( yy_current_state != 397 );
                yy_cp = (yy_last_accepting_cpos);
                yy_current_state = (yy_last_accepting_state);
 
@@ -1515,7 +1517,7 @@ case 80:
 YY_RULE_SETUP
 #line 177 "config-lexer.l"
 {
-                          yylval.number = OPM_TYPE_SOCKS4;
+                          yylval.number = OPM_TYPE_HTTPS;
                           return PROTOCOLTYPE;
                         }
        YY_BREAK
@@ -1523,7 +1525,7 @@ case 81:
 YY_RULE_SETUP
 #line 182 "config-lexer.l"
 {
-                          yylval.number = OPM_TYPE_SOCKS5;
+                          yylval.number = OPM_TYPE_HTTPSPOST;
                           return PROTOCOLTYPE;
                         }
        YY_BREAK
@@ -1531,7 +1533,7 @@ case 82:
 YY_RULE_SETUP
 #line 187 "config-lexer.l"
 {
-                          yylval.number = OPM_TYPE_WINGATE;
+                          yylval.number = OPM_TYPE_SOCKS4;
                           return PROTOCOLTYPE;
                         }
        YY_BREAK
@@ -1539,7 +1541,7 @@ case 83:
 YY_RULE_SETUP
 #line 192 "config-lexer.l"
 {
-                          yylval.number = OPM_TYPE_ROUTER;
+                          yylval.number = OPM_TYPE_SOCKS5;
                           return PROTOCOLTYPE;
                         }
        YY_BREAK
@@ -1547,92 +1549,108 @@ case 84:
 YY_RULE_SETUP
 #line 197 "config-lexer.l"
 {
-                          yylval.number = OPM_TYPE_DREAMBOX;
+                          yylval.number = OPM_TYPE_WINGATE;
                           return PROTOCOLTYPE;
                         }
        YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 204 "config-lexer.l"
+#line 202 "config-lexer.l"
+{
+                          yylval.number = OPM_TYPE_ROUTER;
+                          return PROTOCOLTYPE;
+                        }
+       YY_BREAK
+case 86:
+YY_RULE_SETUP
+#line 207 "config-lexer.l"
+{
+                          yylval.number = OPM_TYPE_DREAMBOX;
+                          return PROTOCOLTYPE;
+                        }
+       YY_BREAK
+case 87:
+YY_RULE_SETUP
+#line 214 "config-lexer.l"
 {
                            yylval.number=atoi(yytext);
                            return NUMBER;
                         }
        YY_BREAK
-case 86:
+case 88:
 YY_RULE_SETUP
-#line 213 "config-lexer.l"
+#line 223 "config-lexer.l"
 {
                            yylval.number=1;
                            return NUMBER;
                          }
        YY_BREAK
-case 87:
+case 89:
 YY_RULE_SETUP
-#line 217 "config-lexer.l"
+#line 227 "config-lexer.l"
 {
                            yylval.number=1;
                            return NUMBER;
                          }
        YY_BREAK
-case 88:
+case 90:
 YY_RULE_SETUP
-#line 221 "config-lexer.l"
+#line 231 "config-lexer.l"
 {
                            yylval.number=1;
                            return NUMBER;
                          }
        YY_BREAK
-case 89:
+case 91:
 YY_RULE_SETUP
-#line 228 "config-lexer.l"
+#line 238 "config-lexer.l"
 {
                            yylval.number=0;
                            return NUMBER;
                          }
        YY_BREAK
-case 90:
+case 92:
 YY_RULE_SETUP
-#line 233 "config-lexer.l"
+#line 243 "config-lexer.l"
 {
                            yylval.number=0;
                            return NUMBER;
                          }
        YY_BREAK
-case 91:
+case 93:
 YY_RULE_SETUP
-#line 238 "config-lexer.l"
+#line 248 "config-lexer.l"
 {
                            yylval.number=0;
                            return NUMBER;
                          }
        YY_BREAK
-case 92:
-/* rule 92 can match eol */
+case 94:
+/* rule 94 can match eol */
 YY_RULE_SETUP
-#line 244 "config-lexer.l"
+#line 254 "config-lexer.l"
 {
                            strlcpy(linebuf, yytext + 1, sizeof(linebuf));
                            ++linenum;
                            yyless(1);
                          }
        YY_BREAK
-case 93:
+case 95:
 YY_RULE_SETUP
-#line 250 "config-lexer.l"
+#line 260 "config-lexer.l"
 /* ignore whitespace */;
        YY_BREAK
-case 94:
+case 96:
 YY_RULE_SETUP
-#line 252 "config-lexer.l"
+#line 262 "config-lexer.l"
 return yytext[0];
        YY_BREAK
-case 95:
+case 97:
 YY_RULE_SETUP
-#line 254 "config-lexer.l"
+#line 264 "config-lexer.l"
 ECHO;
        YY_BREAK
-#line 1636 "config-lexer.c"
+#line 1654 "config-lexer.c"
 case YY_STATE_EOF(INITIAL):
        yyterminate();
 
@@ -1926,7 +1944,7 @@ static int yy_get_next_buffer (void)
                while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                        {
                        yy_current_state = (int) yy_def[yy_current_state];
-                       if ( yy_current_state >= 393 )
+                       if ( yy_current_state >= 398 )
                                yy_c = yy_meta[(unsigned int) yy_c];
                        }
                yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1954,11 +1972,11 @@ static int yy_get_next_buffer (void)
        while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                {
                yy_current_state = (int) yy_def[yy_current_state];
-               if ( yy_current_state >= 393 )
+               if ( yy_current_state >= 398 )
                        yy_c = yy_meta[(unsigned int) yy_c];
                }
        yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-       yy_is_jam = (yy_current_state == 392);
+       yy_is_jam = (yy_current_state == 397);
 
                return yy_is_jam ? 0 : yy_current_state;
 }
@@ -2591,7 +2609,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 254 "config-lexer.l"
+#line 264 "config-lexer.l"
 
 
 

diff --git a/src/libopm/Makefile.in b/src/libopm/Makefile.in
index c1ab6ab2dc009ffb6b2acfa63c1c5913a88a3a26..b84bea192ed3a5681eb0f8b91711c685c8d0806e 100644 (file)
--- a/src/libopm/Makefile.in
+++ b/src/libopm/Makefile.in
@@ -93,6 +93,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \
        $(top_srcdir)/m4/ax_append_flag.m4 \
        $(top_srcdir)/m4/ax_arg_enable_assert.m4 \
        $(top_srcdir)/m4/ax_arg_enable_warnings.m4 \
+       $(top_srcdir)/m4/ax_arg_openssl.m4 \
        $(top_srcdir)/m4/ax_check_compile_flag.m4 \
        $(top_srcdir)/m4/ax_library_net.m4 \
        $(top_srcdir)/m4/ax_require_defined.m4 \

diff --git a/src/libopm/src/Makefile.in b/src/libopm/src/Makefile.in
index ddd95db18e85bfa2a012d136a626108de1a1c95e..69158ceaa09ee7935d6527b655bba502e85bd2be 100644 (file)
--- a/src/libopm/src/Makefile.in
+++ b/src/libopm/src/Makefile.in
@@ -94,6 +94,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \
        $(top_srcdir)/m4/ax_append_flag.m4 \
        $(top_srcdir)/m4/ax_arg_enable_assert.m4 \
        $(top_srcdir)/m4/ax_arg_enable_warnings.m4 \
+       $(top_srcdir)/m4/ax_arg_openssl.m4 \
        $(top_srcdir)/m4/ax_check_compile_flag.m4 \
        $(top_srcdir)/m4/ax_library_net.m4 \
        $(top_srcdir)/m4/ax_require_defined.m4 \

diff --git a/src/setup.h.in b/src/setup.h.in
index 9be22073b699c34b8b30c3e738ab166cad773b9d..70521508e7adde73943f7b0d55822273c7458c19 100644 (file)
--- a/src/setup.h.in
+++ b/src/setup.h.in
@@ -12,6 +12,12 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the `crypto' library (-lcrypto). */
+#undef HAVE_LIBCRYPTO
+
+/* Define to 1 if you have the `ssl' library (-lssl). */
+#undef HAVE_LIBSSL
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H