diff options
Diffstat (limited to 'net/openbgpd/files/patch-bgpd_carp.c')
| -rw-r--r-- | net/openbgpd/files/patch-bgpd_carp.c | 33 |
1 files changed, 26 insertions, 7 deletions
diff --git a/net/openbgpd/files/patch-bgpd_carp.c b/net/openbgpd/files/patch-bgpd_carp.c index 0edf5e07216..53dcacbec44 100644 --- a/net/openbgpd/files/patch-bgpd_carp.c +++ b/net/openbgpd/files/patch-bgpd_carp.c @@ -2,11 +2,30 @@ Index: bgpd/carp.c =================================================================== RCS file: /home/cvs/private/hrs/openbgpd/bgpd/carp.c,v retrieving revision 1.1.1.1 -retrieving revision 1.2 -diff -u -p -r1.1.1.1 -r1.2 +retrieving revision 1.3 +diff -u -p -r1.1.1.1 -r1.3 --- bgpd/carp.c 30 Jun 2009 05:46:15 -0000 1.1.1.1 -+++ bgpd/carp.c 30 Jun 2009 06:40:07 -0000 1.2 -@@ -102,6 +102,9 @@ carp_demote_shutdown(void) ++++ bgpd/carp.c 9 Jul 2009 17:22:14 -0000 1.3 +@@ -1,4 +1,4 @@ +-/* $OpenBSD: carp.c,v 1.5 2007/04/23 14:52:28 claudio Exp $ */ ++/* $OpenBSD: carp.c,v 1.6 2008/09/10 15:00:01 tobias Exp $ */ + + /* + * Copyright (c) 2006 Henning Brauer <henning@openbsd.org> +@@ -72,8 +72,11 @@ carp_demote_init(char *group, int force) + } + + /* only demote if this group already is demoted */ +- if ((level = carp_demote_get(group)) == -1) ++ if ((level = carp_demote_get(group)) == -1) { ++ free(c->group); ++ free(c); + return (-1); ++ } + if (level > 0 || force) + c->do_demote = 1; + +@@ -102,6 +105,9 @@ carp_demote_shutdown(void) int carp_demote_get(char *group) { @@ -16,7 +35,7 @@ diff -u -p -r1.1.1.1 -r1.2 int s; struct ifgroupreq ifgr; -@@ -124,6 +127,7 @@ carp_demote_get(char *group) +@@ -124,6 +130,7 @@ carp_demote_get(char *group) close(s); return ((int)ifgr.ifgr_attrib.ifg_carp_demoted); @@ -24,7 +43,7 @@ diff -u -p -r1.1.1.1 -r1.2 } int -@@ -156,6 +160,9 @@ carp_demote_set(char *group, int demote) +@@ -156,6 +163,9 @@ carp_demote_set(char *group, int demote) int carp_demote_ioctl(char *group, int demote) { @@ -34,7 +53,7 @@ diff -u -p -r1.1.1.1 -r1.2 int s, res; struct ifgroupreq ifgr; -@@ -178,4 +185,5 @@ carp_demote_ioctl(char *group, int demot +@@ -178,4 +188,5 @@ carp_demote_ioctl(char *group, int demot close(s); return (res); |