Hello community, here is the log from the commit of package dhcpcd for openSUSE:Factory checked in at Fri Jan 29 16:43:47 CET 2010. -------- --- dhcpcd/dhcpcd.changes 2010-01-12 17:08:54.000000000 +0100 +++ dhcpcd/dhcpcd.changes 2010-01-20 16:21:38.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Jan 19 17:18:26 CET 2010 - varkoly@suse.de + +- bnc#565030 - L3: dhcpcd not using router component of dhcp server + option 33 (Static Route) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- bnc#565030.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcpcd.spec ++++++ --- /var/tmp/diff_new_pack.937t0I/_old 2010-01-29 16:41:57.000000000 +0100 +++ /var/tmp/diff_new_pack.937t0I/_new 2010-01-29 16:41:57.000000000 +0100 @@ -19,7 +19,7 @@ Name: dhcpcd Version: 3.2.3 -Release: 52 +Release: 53 Summary: A DHCP Client Daemon Url: http://developer.berlios.de/projects/dhcpcd/ #Source: http://prdownload.berlios.de/dhcpcd/dhcpcd-3.2.3.tar.bz2 @@ -42,6 +42,7 @@ Patch13: bnc#552916.diff Patch14: bnc#518219.diff Patch15: bnc#556613.diff +Patch16: bnc#565030.diff License: GPLv2+ Group: Productivity/Networking/Boot/Clients Provides: dhcp_client @@ -79,6 +80,7 @@ %patch13 %patch14 -p1 %patch15 -p1 +%patch16 -p0 cp %{S:1} . cp %{S:3} . ++++++ bnc#565030.diff ++++++ --- interface.c 2010-01-20 13:20:15.000000000 +0100 +++ interface.c 2010-01-20 13:26:53.000000000 +0100 @@ -956,12 +956,14 @@ nlm = xzalloc (sizeof (*nlm)); nlm->hdr.nlmsg_len = NLMSG_LENGTH (sizeof (struct rtmsg)); + nlm->hdr.nlmsg_type = RTM_NEWROUTE; if (change) nlm->hdr.nlmsg_flags = NLM_F_REPLACE; else if (! del) nlm->hdr.nlmsg_flags = NLM_F_CREATE | NLM_F_EXCL; + else + nlm->hdr.nlmsg_type = RTM_DELROUTE; nlm->hdr.nlmsg_flags |= NLM_F_REQUEST; - nlm->hdr.nlmsg_type = del ? RTM_DELROUTE : RTM_NEWROUTE; nlm->rt.rtm_family = AF_INET; nlm->rt.rtm_table = RT_TABLE_MAIN; @@ -969,19 +971,20 @@ nlm->rt.rtm_scope = RT_SCOPE_NOWHERE; else { nlm->hdr.nlmsg_flags |= NLM_F_CREATE | NLM_F_EXCL; - nlm->rt.rtm_protocol = RTPROT_BOOT; - if (netmask.s_addr == INADDR_BROADCAST || - gateway.s_addr == INADDR_ANY) - nlm->rt.rtm_scope = RT_SCOPE_LINK; - else - nlm->rt.rtm_scope = RT_SCOPE_UNIVERSE; - nlm->rt.rtm_type = RTN_UNICAST; + nlm->rt.rtm_protocol = RTPROT_BOOT; + if (gateway.s_addr == INADDR_ANY || + (gateway.s_addr == destination.s_addr && + netmask.s_addr == INADDR_BROADCAST)) + nlm->rt.rtm_scope = RT_SCOPE_LINK; + else + nlm->rt.rtm_scope = RT_SCOPE_UNIVERSE; + nlm->rt.rtm_type = RTN_UNICAST; } nlm->rt.rtm_dst_len = inet_ntocidr (netmask); add_attr_l (&nlm->hdr, sizeof (*nlm), RTA_DST, &destination.s_addr, sizeof (destination.s_addr)); - if (netmask.s_addr != INADDR_BROADCAST && + if (netmask.s_addr != INADDR_BROADCAST || destination.s_addr != gateway.s_addr) add_attr_l (&nlm->hdr, sizeof (*nlm), RTA_GATEWAY, &gateway.s_addr, sizeof (gateway.s_addr)); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de