diff options
Diffstat (limited to 'net/openbgpd/files/patch-bgpd_carp.c')
| -rw-r--r-- | net/openbgpd/files/patch-bgpd_carp.c | 35 |
1 files changed, 8 insertions, 27 deletions
diff --git a/net/openbgpd/files/patch-bgpd_carp.c b/net/openbgpd/files/patch-bgpd_carp.c index f8fdaf66b53f..7ed50075cd5c 100644 --- a/net/openbgpd/files/patch-bgpd_carp.c +++ b/net/openbgpd/files/patch-bgpd_carp.c @@ -1,31 +1,12 @@ Index: bgpd/carp.c =================================================================== RCS file: /home/cvs/private/hrs/openbgpd/bgpd/carp.c,v -retrieving revision 1.1.1.1 +retrieving revision 1.1.1.6 retrieving revision 1.4 -diff -u -p -r1.1.1.1 -r1.4 ---- bgpd/carp.c 30 Jun 2009 05:46:15 -0000 1.1.1.1 +diff -u -p -r1.1.1.6 -r1.4 +--- bgpd/carp.c 14 Feb 2010 20:19:57 -0000 1.1.1.6 +++ bgpd/carp.c 22 Oct 2009 15:10:02 -0000 1.4 -@@ -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; - -@@ -90,9 +93,8 @@ carp_demote_shutdown(void) +@@ -93,9 +93,8 @@ carp_demote_shutdown(void) while ((c = TAILQ_FIRST(&carpgroups)) != NULL) { TAILQ_REMOVE(&carpgroups, c, entry); @@ -37,7 +18,7 @@ diff -u -p -r1.1.1.1 -r1.4 free(c->group); free(c); -@@ -102,6 +104,9 @@ carp_demote_shutdown(void) +@@ -105,6 +104,9 @@ carp_demote_shutdown(void) int carp_demote_get(char *group) { @@ -47,7 +28,7 @@ diff -u -p -r1.1.1.1 -r1.4 int s; struct ifgroupreq ifgr; -@@ -124,6 +129,7 @@ carp_demote_get(char *group) +@@ -127,6 +129,7 @@ carp_demote_get(char *group) close(s); return ((int)ifgr.ifgr_attrib.ifg_carp_demoted); @@ -55,7 +36,7 @@ diff -u -p -r1.1.1.1 -r1.4 } int -@@ -156,6 +162,9 @@ carp_demote_set(char *group, int demote) +@@ -159,6 +162,9 @@ carp_demote_set(char *group, int demote) int carp_demote_ioctl(char *group, int demote) { @@ -65,7 +46,7 @@ diff -u -p -r1.1.1.1 -r1.4 int s, res; struct ifgroupreq ifgr; -@@ -178,4 +187,5 @@ carp_demote_ioctl(char *group, int demot +@@ -181,4 +187,5 @@ carp_demote_ioctl(char *group, int demot close(s); return (res); |