New upstream version 1.1.9.upstream/1.1.9

1 files changed, 28 insertions, 11 deletions

diff --git a/src/config-parser.y b/src/config-parser.y
index f66513b..6db1406 100644
--- a/src/config-parser.y
+++ b/src/config-parser.y
@@ -33,6 +33,7 @@ static void *tmp;  /* Variable to temporarily hold nodes before insertion to lis
 %token ADDRESS_FAMILY
 %token AWAY
 %token BAN_UNKNOWN
+%token BIND
 %token BLACKLIST
 %token BYTES KBYTES MBYTES
 %token CHANNEL
@@ -69,6 +70,7 @@ static void *tmp;  /* Variable to temporarily hold nodes before insertion to lis
 %token PIDFILE
 %token PORT
 %token PROTOCOL
+%token RSA_PRIVATE_KEY_FILE
 %token READTIMEOUT
 %token REALNAME
 %token RECONNECTINTERVAL
@@ -83,11 +85,11 @@ static void *tmp;  /* Variable to temporarily hold nodes before insertion to lis
 %token TARGET_STRING
 %token TIMEOUT
 %token TLS
+%token TLS_CERTIFICATE_FILE
 %token TLS_HOSTNAME_VERIFICATION
 %token TYPE
 %token USERNAME
 %token USER
-%token VHOST
 
 %union
 {
@@ -216,13 +218,15 @@ irc_item: irc_away              |
           irc_password          |
           irc_port              |
           irc_tls               |
+          irc_rsa_private_key_file |
+          irc_tls_certificate_file |
           irc_tls_hostname_verification |
           irc_readtimeout       |
           irc_reconnectinterval |
           irc_realname          |
           irc_server            |
           irc_username          |
-          irc_vhost             |
+          irc_bind              |
           irc_perform           |
           irc_notice            |
           channel_entry         |
@@ -290,6 +294,19 @@ irc_tls: TLS '=' NUMBER ';'
   IRCItem.tls = $3;
 };
 
+irc_rsa_private_key_file: RSA_PRIVATE_KEY_FILE '=' STRING ';'
+{
+  xfree(IRCItem.rsa_private_key_file);
+  IRCItem.rsa_private_key_file = xstrdup($3);
+};
+
+
+irc_tls_certificate_file: TLS_CERTIFICATE_FILE '=' STRING ';'
+{
+  xfree(IRCItem.tls_certificate_file);
+  IRCItem.tls_certificate_file = xstrdup($3);
+};
+
 irc_tls_hostname_verification: TLS_HOSTNAME_VERIFICATION '=' NUMBER ';'
 {
   IRCItem.tls_hostname_verification = $3;
@@ -323,10 +340,10 @@ irc_username: USERNAME '=' STRING ';'
   IRCItem.username = xstrdup($3);
 };
 
-irc_vhost: VHOST '=' STRING ';'
+irc_bind: BIND '=' STRING ';'
 {
-  xfree(IRCItem.vhost);
-  IRCItem.vhost = xstrdup($3);
+  xfree(IRCItem.bind);
+  IRCItem.bind = xstrdup($3);
 };
 
 irc_connregex: CONNREGEX '=' STRING ';'
@@ -431,7 +448,7 @@ scanner_entry:
   {
     olditem = ScannerItemList.tail->data;
 
-    item->vhost = xstrdup(olditem->vhost);
+    item->bind = xstrdup(olditem->bind);
     item->fd = olditem->fd;
     item->target_ip = xstrdup(olditem->target_ip);
     item->target_port = olditem->target_port;
@@ -441,7 +458,7 @@ scanner_entry:
   }
   else
   {
-    item->vhost = xstrdup("0.0.0.0");
+    item->bind = xstrdup("0.0.0.0");
     item->fd = 512;
     item->target_ip = xstrdup("127.0.0.1");
     item->target_port = 6667;
@@ -458,7 +475,7 @@ scanner_items: scanner_items scanner_item |
                scanner_item;
 
 scanner_item: scanner_name          |
-              scanner_vhost         |
+              scanner_bind          |
               scanner_fd            |
               scanner_target_ip     |
               scanner_target_port   |
@@ -476,12 +493,12 @@ scanner_name: NAME '=' STRING ';'
   item->name = xstrdup($3);
 };
 
-scanner_vhost: VHOST '=' STRING ';'
+scanner_bind: BIND '=' STRING ';'
 {
   struct ScannerConf *item = tmp;
 
-  xfree(item->vhost);
-  item->vhost = xstrdup($3);
+  xfree(item->bind);
+  item->bind = xstrdup($3);
 };
 
 scanner_target_ip: TARGET_IP '=' STRING ';'