diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/conf_parser.c | 10 | ||||
| -rw-r--r-- | src/conf_parser.y | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/conf_parser.c b/src/conf_parser.c index 0aeb555..c1402e2 100644 --- a/src/conf_parser.c +++ b/src/conf_parser.c @@ -4520,7 +4520,7 @@ yyreduce: case 242: /* Line 1813 of yacc.c */ #line 1368 "conf_parser.y" - { block_state.flags.value |= 0; } + { block_state.flags.value = 0; } break; case 246: @@ -4679,7 +4679,7 @@ yyreduce: #line 1498 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.flags.value = 0; + block_state.flags.value &= CONF_FLAGS_ENCRYPTED; } break; @@ -5185,8 +5185,8 @@ yyreduce: if (conf_parser_ctx.pass != 2) break; - if (!(block_state.name.buf[0] || - block_state.host.buf[0])) + if (!block_state.name.buf[0] || + !block_state.host.buf[0]) break; if (!(block_state.rpass.buf[0] || @@ -5328,7 +5328,7 @@ yyreduce: /* Line 1813 of yacc.c */ #line 1958 "conf_parser.y" { -/* XXX */ + block_state.flags.value &= CONF_FLAGS_ENCRYPTED; } break; diff --git a/src/conf_parser.y b/src/conf_parser.y index edb2760..3dfdf76 100644 --- a/src/conf_parser.y +++ b/src/conf_parser.y @@ -1365,7 +1365,7 @@ listen_flags_item: T_SSL listen_items: listen_items listen_item | listen_item; listen_item: listen_port | listen_flags | listen_address | listen_host | error ';'; -listen_port: PORT '=' port_items { block_state.flags.value |= 0; } ';'; +listen_port: PORT '=' port_items { block_state.flags.value = 0; } ';'; port_items: port_items ',' port_item | port_item; @@ -1497,7 +1497,7 @@ auth_encrypted: ENCRYPTED '=' TBOOL ';' auth_flags: IRCD_FLAGS { if (conf_parser_ctx.pass == 2) - block_state.flags.value = 0; + block_state.flags.value &= CONF_FLAGS_ENCRYPTED; } '=' auth_flags_items ';'; auth_flags_items: auth_flags_items ',' auth_flags_item | auth_flags_item; @@ -1834,8 +1834,8 @@ connect_entry: CONNECT if (conf_parser_ctx.pass != 2) break; - if (!(block_state.name.buf[0] || - block_state.host.buf[0])) + if (!block_state.name.buf[0] || + !block_state.host.buf[0]) break; if (!(block_state.rpass.buf[0] || @@ -1956,7 +1956,7 @@ connect_aftype: AFTYPE '=' T_IPV4 ';' connect_flags: IRCD_FLAGS { -/* XXX */ + block_state.flags.value &= CONF_FLAGS_ENCRYPTED; } '=' connect_flags_items ';'; connect_flags_items: connect_flags_items ',' connect_flags_item | connect_flags_item; |