Your message dated Wed, 24 Mar 2010 20:28:15 +0000 (WET)
with message-id <[email protected]>
and subject line Package dhcp has been removed from Debian
has caused the Debian Bug report #294722,
regarding dhcp: Missing define in debian/patches/token-ring.patch?
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.)


-- 
294722: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=294722
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: dhcp
Version: 2.0pl5-19.1
Severity: normal


Hi,

the token-ring patch does this in common/dispatch.c:

+#ifndef HAVE_ARPHRD_IEEE802_TR
+# define ARPHRD_IEEE802_TR HTYPE_IEEE802_TR
+#endif
+                     case ARPHRD_IEEE802_TR:
+                       tmp -> hw_address.hlen = 6;
+                       tmp -> hw_address.htype = ARPHRD_IEEE802;
+                       memcpy (tmp -> hw_address.haddr, sa.sa_data, 6);
+                       break;
+

However, it seems to not #define HTYPE_IEEE802_TR anywhere, so this code
is bound to fail on systems which do not #define HAVE_ARPHRD_IEEE802_TR
in their include/cf/foo.h header file. The other HTYPE_* get #defined in
include/dhcp.h, so this belong there as well I guess. However, I am not
sure what HTYPE_IEEE802_TR actually should be defined as. <net/if_arp.h>
#defines HAVE_ARPHRD_IEEE802_TR as 800, but it also #defines ARPHRD_FDDI
as 774, while include/dhcp.h has HTYPE_FDDI as 8.

Also, I think it be better to move the #endif down the block, as is done
for most of the other types:

#ifdef HAVE_ARPHRD_NETROM
                      case ARPHRD_NETROM:
                        tmp -> hw_address.hlen = 6;
                        tmp -> hw_address.htype = ARPHRD_NETROM;
                        memcpy (tmp -> hw_address.haddr, sa.sa_data, 6);
                        break;
#endif

and just add an addtional check like

#ifndef ARPHRD_IEEE802_TR
# define ARPHRD_IEEE802_TR HTYPE_IEEE802_TR
#endif

The last issue is that it should be checked whether ARPHRD_ETHER is
defined and probably be defined to HTYPE_ETHER if not.


cheers,

Michael

-- 
Michael Banck
Debian Developer
[email protected]
http://www.advogato.org/person/mbanck/diary.html


--- End Message ---
--- Begin Message ---
Version: 2.0pl5dfsg1-20.2+rm

You filed the bug http://bugs.debian.org/294722 in Debian BTS
against the package dhcp. I'm closing it at *unstable*, but it will
remain open for older distributions.

For more information about this package's removal, read
http://bugs.debian.org/446386. That bug might give the reasons why
this package was removed and suggestions of possible replacements.

Don't hesitate to reply to this mail if you have any question.

Thank you for your contribution to Debian.

--
Marco Rodrigues


--- End Message ---

Reply via email to