Attachment 8679 Details for Bug 44125

[patch] Fix dhcp-leases-list

isc-dhcp-list-leases.patch (text/plain), 4.25 KB, created by Philipp Hahn on 2017-03-29 12:07 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Hahn

Created: 2017-03-29 12:07 CEST

Size: 4.25 KB

patch

obsolete

>From 6750cdbe5fbf135009ed247955675b69c4c44881 Mon Sep 17 00:00:00 2001
>Message-Id: <6750cdbe5fbf135009ed247955675b69c4c44881.1490781981.git.hahn@univention.de>
>From: Philipp Hahn <hahn@univention.de>
>Date: Wed, 29 Mar 2017 11:24:53 +0200
>Subject: [PATCH 1/3] Use correct path to lease database
>Organization: Univention GmbH, Bremen, Germany
>
>On Debian the DHCP daemon uses /var/lib/dhcp/dhcpd.leases as its
>database.
>---
> contrib/dhcp-lease-list.pl | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/contrib/dhcp-lease-list.pl b/contrib/dhcp-lease-list.pl
>index f7e8c0c..3fb9d20 100644
>--- a/contrib/dhcp-lease-list.pl
>+++ b/contrib/dhcp-lease-list.pl
>@@ -19,7 +19,7 @@ use strict;
> use warnings;
> use POSIX qw(strftime);
> 
>-my $LEASES = '/var/db/dhcpd.leases';
>+my $LEASES = '/var/lib/dhcp/dhcpd.leases';
> my @all_leases;
> my @leases;
> 
>@@ -172,7 +172,7 @@ sub cli_processing() {
> 		" --last      prints the last (even if end<now) entry for every MAC\n".
> 		" --all       prints all entries i.e. more than one per MAC\n".
> 		" --lease     uses the next argument as the name of the lease file\n".
>-		"             the default is /var/db/dhcpd.leases\n".
>+		"             the default is $LEASES\n".
> 		"\n");
> 	    exit(0);
> 	} elsif ($arg eq '--parsable') {
>-- 
>2.1.4
>
>
>From 547b8064c9fd4a7198e6712c75881ba9e3f9711e Mon Sep 17 00:00:00 2001
>Message-Id: <547b8064c9fd4a7198e6712c75881ba9e3f9711e.1490781981.git.hahn@univention.de>
>In-Reply-To: <6750cdbe5fbf135009ed247955675b69c4c44881.1490781981.git.hahn@univention.de>
>References: <6750cdbe5fbf135009ed247955675b69c4c44881.1490781981.git.hahn@univention.de>
>From: Philipp Hahn <hahn@univention.de>
>Date: Wed, 29 Mar 2017 11:26:03 +0200
>Subject: [PATCH 2/3] Use IEEE data as packaged by Debian
>Organization: Univention GmbH, Bremen, Germany
>
>Debian already has the "oui.txt" data in the package "ieee-data".
>---
> contrib/dhcp-lease-list.pl | 4 ++--
> debian/control             | 2 ++
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/contrib/dhcp-lease-list.pl b/contrib/dhcp-lease-list.pl
>index 3fb9d20..4683d02 100644
>--- a/contrib/dhcp-lease-list.pl
>+++ b/contrib/dhcp-lease-list.pl
>@@ -23,7 +23,7 @@ my $LEASES = '/var/lib/dhcp/dhcpd.leases';
> my @all_leases;
> my @leases;
> 
>-my @OUIS = ('/usr/share/misc/oui.txt', '/usr/local/etc/oui.txt');
>+my @OUIS = ('/usr/share/ieee-data/oui.txt', '/usr/share/misc/oui.txt', '/usr/local/etc/oui.txt');
> my $OUI_URL = 'http://standards.ieee.org/regauth/oui/oui.txt';
> my $oui;
> 
>@@ -59,7 +59,7 @@ sub check_oui_file() {
> 
>     if (not defined $oui) {
> 	print(STDERR "To get manufacturer names please download $OUI_URL ");
>-	print(STDERR "to /usr/local/etc/oui.txt\n");
>+	print(STDERR "to " . $OUIS[$#OUIS] . "\n");
>     }
> }
> 
>diff --git a/debian/control b/debian/control
>index d6bf4f4..a7a1370 100644
>--- a/debian/control
>+++ b/debian/control
>@@ -31,6 +31,8 @@ Depends:
>  lsb-base,
> Conflicts:
>  dhcp,
>+Recommends:
>+ ieee-data,
> Suggests:
>  isc-dhcp-server-ldap,
> Description: ISC DHCP server for automatic IP address assignment
>-- 
>2.1.4
>
>
>From 73e033d53dbbf2ab570730fd3b5cf5aa712580d8 Mon Sep 17 00:00:00 2001
>Message-Id: <73e033d53dbbf2ab570730fd3b5cf5aa712580d8.1490781981.git.hahn@univention.de>
>In-Reply-To: <6750cdbe5fbf135009ed247955675b69c4c44881.1490781981.git.hahn@univention.de>
>References: <6750cdbe5fbf135009ed247955675b69c4c44881.1490781981.git.hahn@univention.de>
>From: Philipp Hahn <hahn@univention.de>
>Date: Wed, 29 Mar 2017 11:49:47 +0200
>Subject: [PATCH 3/3] d/control: Fix Vcs-Git URL
>Organization: Univention GmbH, Bremen, Germany
>
>---
> debian/control | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/debian/control b/debian/control
>index a7a1370..66416ab 100644
>--- a/debian/control
>+++ b/debian/control
>@@ -3,8 +3,8 @@ Section: net
> Priority: important
> Maintainer: Debian ISC DHCP maintainers <pkg-dhcp-devel@lists.alioth.debian.org>
> Uploaders: Andrew Pollock <apollock@debian.org>, Michael Gilbert <mgilbert@debian.org>
>-Vcs-Git: git://anonscm.debian.org/pkg-dhcp/isc-dhcp.git
>-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-dhcp/isc-dhcp.git;a=summary
>+Vcs-Git: https://anonscm.debian.org/git/pkg-dhcp/isc-dhcp.git
>+Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-dhcp/isc-dhcp.git;a=summary
> Homepage: http://www.isc.org
> Build-Depends:
>  groff,
>-- 
>2.1.4
>

Actions: View | Diff

Attachments on bug 44125: 8679