Your message dated Fri, 30 May 2008 19:17:04 +0000
with message-id <[EMAIL PROTECTED]>
and subject line Bug#473015: fixed in dnsmasq 2.42-1
has caused the Debian Bug report #473015,
regarding dnsmasq: relay agent options are not echoed back
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [EMAIL PROTECTED]
immediately.)
--
473015: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473015
Debian Bug Tracking System
Contact [EMAIL PROTECTED] with problems
--- Begin Message ---
Package: dnsmasq
Version: 2.41-2
Severity: normal
Tags: patch
When dnsmasq replies to DHCP requests containing a Relay Agent Information
option, it should include the Relay Agent Information in the reply.
Unfortunately, this is not the case because dnsmasq does the following:
- copy the Relay Agent info to the end of the packet
and save a pointer to it (agent_id)
- clear out the packet (in clear_packet()) until "end"
=> you lose the Relay Agent info!
- move the Relay Agent information forward in do_options()
I have managed to get things sort of working by only doing clear_packet
until "agent_id" instead of "end" when "agent_id" is non NULL (see attached
patch).
This patch is just a start, there are two remaining calls to "clear_packet"
which I did not feel comfortable with touching:
- line 439 : the subsequent call to do_options() forcibly passes NULL as
the agent_id, so it seems the Relay Agent info is discarded => why?
- line 892 : it doesn't look as though do_options() is called after the
call to clear_packet(), so it seems the Relay Agent info is not used
here => why?
Thanks for dnsmasq!
Cheers,
Jeremy
-- System Information:
Debian Release: lenny/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'stable')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.24-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages dnsmasq depends on:
ii adduser 3.105 add and remove users and groups
ii dnsmasq-base 2.41-2 A small caching DNS proxy and DHCP
ii netbase 4.30 Basic TCP/IP networking system
dnsmasq recommends no packages.
-- no debconf information
diff -urN dnsmasq-2.41/src/rfc2131.c dnsmasq-2.41.mod/src/rfc2131.c
--- dnsmasq-2.41/src/rfc2131.c 2008-02-12 21:36:39.000000000 +0100
+++ dnsmasq-2.41.mod/src/rfc2131.c 2008-03-27 19:41:14.000000000 +0100
@@ -750,7 +750,7 @@
}
time = calc_time(context, config, option_find(mess, sz,
OPTION_LEASE_TIME, 4));
- clear_packet(mess, end);
+ clear_packet(mess, agent_id ? agent_id : end);
option_put(mess, end, OPTION_MESSAGE_TYPE, 1, DHCPOFFER);
option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ,
ntohl(context->local.s_addr));
option_put(mess, end, OPTION_LEASE_TIME, 4, time);
@@ -970,7 +970,7 @@
log_packet("ACK", &mess->yiaddr, emac, emac_len, iface_name,
hostname);
- clear_packet(mess, end);
+ clear_packet(mess, agent_id ? agent_id : end);
option_put(mess, end, OPTION_MESSAGE_TYPE, 1, DHCPACK);
option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ,
ntohl(context->local.s_addr));
option_put(mess, end, OPTION_LEASE_TIME, 4, time);
@@ -1015,7 +1015,7 @@
netid = &context->netid;
}
- clear_packet(mess, end);
+ clear_packet(mess, agent_id ? agent_id : end);
option_put(mess, end, OPTION_MESSAGE_TYPE, 1, DHCPACK);
option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ,
ntohl(context->local.s_addr));
--- End Message ---
--- Begin Message ---
Source: dnsmasq
Source-Version: 2.42-1
We believe that the bug you reported is fixed in the latest version of
dnsmasq, which is due to be installed in the Debian FTP archive:
dnsmasq-base_2.42-1_i386.deb
to pool/main/d/dnsmasq/dnsmasq-base_2.42-1_i386.deb
dnsmasq_2.42-1.diff.gz
to pool/main/d/dnsmasq/dnsmasq_2.42-1.diff.gz
dnsmasq_2.42-1.dsc
to pool/main/d/dnsmasq/dnsmasq_2.42-1.dsc
dnsmasq_2.42-1_all.deb
to pool/main/d/dnsmasq/dnsmasq_2.42-1_all.deb
dnsmasq_2.42.orig.tar.gz
to pool/main/d/dnsmasq/dnsmasq_2.42.orig.tar.gz
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Simon Kelley <[EMAIL PROTECTED]> (supplier of updated dnsmasq package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Wed, 27 Feb 2008 21:15:28 +0000
Source: dnsmasq
Binary: dnsmasq dnsmasq-base
Architecture: source all i386
Version: 2.42-1
Distribution: unstable
Urgency: low
Maintainer: Simon Kelley <[EMAIL PROTECTED]>
Changed-By: Simon Kelley <[EMAIL PROTECTED]>
Description:
dnsmasq - A small caching DNS proxy and DHCP/TFTP server
dnsmasq-base - A small caching DNS proxy and DHCP/TFTP server
Closes: 468762 468763 473015 473117
Changes:
dnsmasq (2.42-1) unstable; urgency=low
.
* New upstream.
* Fix manpage typos. (closes: #468762)
* Use LSB log_*_msg rather than echo in init script. (closes: #473117)
* Fix agent-id echo problem. (closes: #473015)
* Fixup changing /usr/share/doc/dnsmasq to symlink. (closes: #468763)
Files:
a85538d6e8291812efb67bff170074b3 596 net optional dnsmasq_2.42-1.dsc
706bb9cc74be10065964527afaf55968 363042 net optional dnsmasq_2.42.orig.tar.gz
cfa61231e4df7b0ae741e94c4e5b2268 13429 net optional dnsmasq_2.42-1.diff.gz
fcf38e8a249b7e083465dfcd749f2a25 236674 net optional
dnsmasq-base_2.42-1_i386.deb
239e7e98e4aa480dfa2b58dc6eaad70a 12100 net optional dnsmasq_2.42-1_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
iD8DBQFIPwjmKPyGmiibgrcRAhisAJ41cutoVVMKrngKo2/71J/ofjqNXgCgnqZg
pGr5G+UZ6zmNIM5KOh5cVhU=
=UkOY
-----END PGP SIGNATURE-----
--- End Message ---
