Bug#510092: keepalived: Move modifications from diff.gz to debian/patches

[Vincent Bernat]

Package: keepalived
Version: 1.1.15-1
Severity: wishlist
Tags: patch

Hi!

There is a modification of upstream code in diff.gz while there exists
a debian/patches directory. This brings confusion. Could you move the
modifications made in diff.gz into debian/patches?

Thanks.

 keepalived/vrrp/vrrp.c                               |    1 
 keepalived/vrrp/vrrp_scheduler.c                     |    3 
  

-- System Information:
Debian Release: 5.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.26-1-amd64 (SMP w/1 CPU core)
Locale: lang=fr...@euro, lc_ctype=fr...@euro (charmap=ISO-8859-15)
Shell: /bin/sh linked to /bin/dash

When switching to fault state, execute notify_fault clauses.

--- keepalived-1.1.15.orig/keepalived/vrrp/vrrp_scheduler.c
+++ keepalived-1.1.15/keepalived/vrrp/vrrp_scheduler.c
@@ -646,6 +646,9 @@
                vrrp_log_int_down(vrrp);
                syslog(LOG_INFO, "VRRP_Instance(%s) Now in FAULT state",
                       vrrp->iname);
+               if(vrrp->state != VRRP_STATE_FAULT) {
+                       notify_instance_exec(vrrp, VRRP_STATE_FAULT);
+               }
                vrrp->state = VRRP_STATE_FAULT;
                vrrp->ms_down_timer = 3 * vrrp->adver_int + 
VRRP_TIMER_SKEW(vrrp);
                notify_instance_exec(vrrp, VRRP_STATE_FAULT);
--- keepalived-1.1.15.orig/keepalived/vrrp/vrrp.c
+++ keepalived-1.1.15/keepalived/vrrp/vrrp.c
@@ -787,6 +787,7 @@
                vrrp->ms_down_timer =
                    3 * vrrp->adver_int + VRRP_TIMER_SKEW(vrrp);
                vrrp->state = VRRP_STATE_FAULT;
+               notify_instance_exec(vrrp, VRRP_STATE_FAULT);
                return 1;
        }