View | Details | Raw Unified | Return to bug 44125
Collapse All | Expand All

(-)a/contrib/dhcp-lease-list.pl (-4 / +2 lines)
 Lines 19-25   use strict; Link Here 
19
use warnings;
19
use warnings;
20
use POSIX qw(strftime);
20
use POSIX qw(strftime);
21
21
22
my $LEASES = '/var/db/dhcpd.leases';
22
my $LEASES = '/var/lib/dhcp/dhcpd.leases';
23
my @all_leases;
23
my @all_leases;
24
my @leases;
24
my @leases;
25
25
 Lines 172-178   sub cli_processing() { Link Here 
172
		" --last      prints the last (even if end<now) entry for every MAC\n".
172
		" --last      prints the last (even if end<now) entry for every MAC\n".
173
		" --all       prints all entries i.e. more than one per MAC\n".
173
		" --all       prints all entries i.e. more than one per MAC\n".
174
		" --lease     uses the next argument as the name of the lease file\n".
174
		" --lease     uses the next argument as the name of the lease file\n".
175
		"             the default is /var/db/dhcpd.leases\n".
175
		"             the default is $LEASES\n".
176
		"\n");
176
		"\n");
177
	    exit(0);
177
	    exit(0);
178
	} elsif ($arg eq '--parsable') {
178
	} elsif ($arg eq '--parsable') {
179
- 
180
--
181
contrib/dhcp-lease-list.pl | 4 ++--
179
contrib/dhcp-lease-list.pl | 4 ++--
182
debian/control             | 2 ++
180
debian/control             | 2 ++
183
2 files changed, 4 insertions(+), 2 deletions(-)
181
2 files changed, 4 insertions(+), 2 deletions(-)
(-)a/contrib/dhcp-lease-list.pl (-2 / +2 lines)
 Lines 23-29   my $LEASES = '/var/lib/dhcp/dhcpd.leases'; Link Here 
23
my @all_leases;
23
my @all_leases;
24
my @leases;
24
my @leases;
25
25
26
my @OUIS = ('/usr/share/misc/oui.txt', '/usr/local/etc/oui.txt');
26
my @OUIS = ('/usr/share/ieee-data/oui.txt', '/usr/share/misc/oui.txt', '/usr/local/etc/oui.txt');
27
my $OUI_URL = 'http://standards.ieee.org/regauth/oui/oui.txt';
27
my $OUI_URL = 'http://standards.ieee.org/regauth/oui/oui.txt';
28
my $oui;
28
my $oui;
29
29
 Lines 59-65   sub check_oui_file() { Link Here 
59
59
60
    if (not defined $oui) {
60
    if (not defined $oui) {
61
	print(STDERR "To get manufacturer names please download $OUI_URL ");
61
	print(STDERR "To get manufacturer names please download $OUI_URL ");
62
	print(STDERR "to /usr/local/etc/oui.txt\n");
62
	print(STDERR "to " . $OUIS[$#OUIS] . "\n");
63
    }
63
    }
64
}
64
}
65
65
(-)a/debian/control (-2 / +2 lines)
 Lines 31-36   Depends: Link Here 
31
 lsb-base,
31
 lsb-base,
32
Conflicts:
32
Conflicts:
33
 dhcp,
33
 dhcp,
34
Recommends:
35
 ieee-data,
34
Suggests:
36
Suggests:
35
 isc-dhcp-server-ldap,
37
 isc-dhcp-server-ldap,
36
Description: ISC DHCP server for automatic IP address assignment
38
Description: ISC DHCP server for automatic IP address assignment
37
- 
38
--
39
debian/control | 4 ++--
39
debian/control | 4 ++--
40
1 file changed, 2 insertions(+), 2 deletions(-)
40
1 file changed, 2 insertions(+), 2 deletions(-)
(-)a/debian/control (-3 / +2 lines)
 Lines 3-10   Section: net Link Here 
3
Priority: important
3
Priority: important
4
Maintainer: Debian ISC DHCP maintainers <pkg-dhcp-devel@lists.alioth.debian.org>
4
Maintainer: Debian ISC DHCP maintainers <pkg-dhcp-devel@lists.alioth.debian.org>
5
Uploaders: Andrew Pollock <apollock@debian.org>, Michael Gilbert <mgilbert@debian.org>
5
Uploaders: Andrew Pollock <apollock@debian.org>, Michael Gilbert <mgilbert@debian.org>
6
Vcs-Git: git://anonscm.debian.org/pkg-dhcp/isc-dhcp.git
6
Vcs-Git: https://anonscm.debian.org/git/pkg-dhcp/isc-dhcp.git
7
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-dhcp/isc-dhcp.git;a=summary
7
Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-dhcp/isc-dhcp.git;a=summary
8
Homepage: http://www.isc.org
8
Homepage: http://www.isc.org
9
Build-Depends:
9
Build-Depends:
10
 groff,
10
 groff,
11
- 

Return to bug 44125