Skip to content

Commit e3cbda3

Browse files
committed
fixing logic in the IPv6 forwarding setting check
From akarl10 on GitHub: (value != 1 || value != 2) is always true should be (value != 1 && value != 2)
1 parent efddc40 commit e3cbda3

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

CHANGES

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2013/10/02 releasing 1.9.5
2+
minor fix in IPv6 forwarding setting check <akarl10>
3+
14
2013/10/01 releasing 1.9.4
25

36
2013/09/24 Added a Makefile target to generate hashes and a gpg signature

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
#
44
# If adding rcX, be sure to separate with a '-'
55
#
6-
1.9.4
6+
1.9.5

radvd.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -830,13 +830,13 @@ check_ip6_forwarding(void)
830830
*
831831
* Which is sometimes used on routers performing RS on their WAN (ppp, etc.) links
832832
*/
833-
if ((value != 1 || value != 2) && !warned) {
833+
if (!warned && value != 1 && value != 2) {
834834
warned = 1;
835835
flog(LOG_DEBUG, "IPv6 forwarding setting is: %u, should be 1 or 2", value);
836836
return(-1);
837837
}
838838
#else
839-
if (value != 1 && !warned) {
839+
if (!warned && value != 1) {
840840
warned = 1;
841841
flog(LOG_DEBUG, "IPv6 forwarding setting is: %u, should be 1", value);
842842
return(-1);

0 commit comments

Comments
 (0)