[pkg-dhcp-commits] [isc-dhcp] 01/02: release 4.3.1-3

[Michael Gilbert]

This is an automated email from the git hooks/post-receive script.

mgilbert pushed a commit to branch master
in repository isc-dhcp.

commit 4134be6d5ff89b87b54d28acda766b6f553f31b0
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sun Oct 5 22:09:58 2014 +0000

    release 4.3.1-3
---
 debian/changelog                |  6 ++++++
 debian/dhclient-script.kfreebsd | 12 +++++-------
 debian/dhclient-script.linux    | 12 +++++-------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cbfacdc..79a6116 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+isc-dhcp (4.3.1-3) unstable; urgency=medium
+
+  * Ignore arguments passed to sourced scripts (closes: #763208).
+
+ -- Michael Gilbert <mgilbert at debian.org>  Sun, 28 Sep 2014 21:00:36 +0000
+
 isc-dhcp (4.3.1-2) unstable; urgency=medium
 
   * Use /bin/sh instead of /bin/bash for dhclient scripts (closes: #762923).
diff --git a/debian/dhclient-script.kfreebsd b/debian/dhclient-script.kfreebsd
index 2f67c85..76f9cbf 100644
--- a/debian/dhclient-script.kfreebsd
+++ b/debian/dhclient-script.kfreebsd
@@ -64,10 +64,9 @@ run_hook() {
     local script
     local exit_status
     script="$1"
-    shift	# discard the first argument, then the rest are the script's
 
     if [ -f $script ]; then
-        $script "$@"
+        . $script
     fi
 
     if [ -n "$exit_status" ] && [ "$exit_status" -ne 0 ]; then
@@ -82,11 +81,10 @@ run_hookdir() {
     local dir
     local exit_status
     dir="$1"
-    shift	# See run_hook
 
     if [ -d "$dir" ]; then
         for script in $(run-parts --list $dir); do
-            run_hook $script "$@" || true
+            run_hook $script || true
             exit_status=$?
         done
     fi
@@ -99,12 +97,12 @@ exit_with_hooks() {
     exit_status=$1
 
     # Source the documented exit-hook script, if it exists
-    if ! run_hook /etc/dhcp/dhclient-exit-hooks "$@"; then
+    if ! run_hook /etc/dhcp/dhclient-exit-hooks; then
         exit_status=$?
     fi
 
     # Now run scripts in the Debian-specific directory.
-    if ! run_hookdir /etc/dhcp/dhclient-exit-hooks.d "$@"; then
+    if ! run_hookdir /etc/dhcp/dhclient-exit-hooks.d; then
         exit_status=$?
     fi
 
@@ -293,7 +291,7 @@ case "$reason" in
 
             make_resolv_conf
           else
-            exit_with_hooks 2 "$@"
+            exit_with_hooks 2
           fi
         else
           ifconfig $interface inet -alias $new_ip_address $medium
diff --git a/debian/dhclient-script.linux b/debian/dhclient-script.linux
index 2b6505e..299d02e 100644
--- a/debian/dhclient-script.linux
+++ b/debian/dhclient-script.linux
@@ -111,10 +111,9 @@ run_hook() {
     local script
     local exit_status
     script="$1"
-    shift	# discard the first argument, then the rest are the script's
 
     if [ -f $script ]; then
-        $script "$@"
+        . $script
     fi
 
     if [ -n "$exit_status" ] && [ "$exit_status" -ne 0 ]; then
@@ -129,11 +128,10 @@ run_hookdir() {
     local dir
     local exit_status
     dir="$1"
-    shift	# See run_hook
 
     if [ -d "$dir" ]; then
         for script in $(run-parts --list $dir); do
-            run_hook $script "$@" || true
+            run_hook $script || true
             exit_status=$?
         done
     fi
@@ -146,12 +144,12 @@ exit_with_hooks() {
     exit_status=$1
 
     # Source the documented exit-hook script, if it exists
-    if ! run_hook /etc/dhcp/dhclient-exit-hooks "$@"; then
+    if ! run_hook /etc/dhcp/dhclient-exit-hooks; then
         exit_status=$?
     fi
 
     # Now run scripts in the Debian-specific directory.
-    if ! run_hookdir /etc/dhcp/dhclient-exit-hooks.d "$@"; then
+    if ! run_hookdir /etc/dhcp/dhclient-exit-hooks.d; then
         exit_status=$?
     fi
 
@@ -338,7 +336,7 @@ case "$reason" in
         else
             # flush all IPs from interface
             ip -4 addr flush dev ${interface}
-            exit_with_hooks 2 "$@"
+            exit_with_hooks 2
         fi
 
         ;;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-dhcp/isc-dhcp.git