summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/libc/gen/sysctl.34
-rw-r--r--sys/netinet/ip_carp.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
index d178f770b9e..e003e034cc8 100644
--- a/lib/libc/gen/sysctl.3
+++ b/lib/libc/gen/sysctl.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sysctl.3,v 1.135 2004/03/02 22:16:27 tedu Exp $
+.\" $OpenBSD: sysctl.3,v 1.136 2004/03/24 06:13:56 mcbride Exp $
.\"
.\" Copyright (c) 1993
.\" The Regents of the University of California. All rights reserved.
@@ -1080,7 +1080,7 @@ Disabled by default.
If set to any value other than 0,
.Xr carp 4
will log errors.
-Enabled by default.
+Disabled by default.
.It Li carp.preempt
If set to 0,
.Xr carp 4
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index 0640a09b2e7..b82ad8d883d 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_carp.c,v 1.40 2004/03/22 04:54:18 mcbride Exp $ */
+/* $OpenBSD: ip_carp.c,v 1.41 2004/03/24 06:13:56 mcbride Exp $ */
/*
* Copyright (c) 2002 Michael Shalayeff. All rights reserved.
@@ -131,7 +131,7 @@ struct carp_softc {
};
-int carp_opts[CARPCTL_MAXID] = { 0, 1, 0, 1, 0 }; /* XXX for now */
+int carp_opts[CARPCTL_MAXID] = { 0, 1, 0, 0, 0 }; /* XXX for now */
struct carpstats carpstats;
struct carp_if {