CVS commit: src/usr.sbin/ldpd
Module Name:src
Committed By: kefren
Date: Fri Jul 12 08:55:52 UTC 2013
Modified Files:
src/usr.sbin/ldpd: fsm.c mpls_routes.c
Log Message:
correct loopback address test
correct addr add/del handling
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/ldpd/fsm.c
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/ldpd/mpls_routes.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/ldpd/fsm.c
diff -u src/usr.sbin/ldpd/fsm.c:1.12 src/usr.sbin/ldpd/fsm.c:1.13
--- src/usr.sbin/ldpd/fsm.c:1.12 Thu Jul 11 05:55:13 2013
+++ src/usr.sbin/ldpd/fsm.c Fri Jul 12 08:55:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fsm.c,v 1.12 2013/07/11 05:55:13 kefren Exp $ */
+/* $NetBSD: fsm.c,v 1.13 2013/07/12 08:55:52 kefren Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -186,10 +186,11 @@ build_address_list_tlv(void)
ia = &t->a_address;
for (adrcount = 0, ifb = ifa; ifb; ifb = ifb->ifa_next) {
if ((ifb->ifa_addr->sa_family != AF_INET) ||
- (!(ifb->ifa_flags & IFF_UP)) ||
- (ifb->ifa_flags & IFF_LOOPBACK))
+ (!(ifb->ifa_flags & IFF_UP)))
continue;
sa = (struct sockaddr_in *) ifb->ifa_addr;
+ if (ntohl(sa->sin_addr.s_addr) >> 24 == IN_LOOPBACKNET)
+ continue;
memcpy(&ia[adrcount], &sa->sin_addr, sizeof(struct in_addr));
adrcount++;
}
Index: src/usr.sbin/ldpd/mpls_routes.c
diff -u src/usr.sbin/ldpd/mpls_routes.c:1.13 src/usr.sbin/ldpd/mpls_routes.c:1.14
--- src/usr.sbin/ldpd/mpls_routes.c:1.13 Thu Jul 11 18:02:03 2013
+++ src/usr.sbin/ldpd/mpls_routes.c Fri Jul 12 08:55:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mpls_routes.c,v 1.13 2013/07/11 18:02:03 kefren Exp $ */
+/* $NetBSD: mpls_routes.c,v 1.14 2013/07/12 08:55:52 kefren Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -69,18 +69,19 @@ static int read_route_socket(char *, int
void mask_addr(union sockunion *);
int compare_sockunion(const union sockunion *, const union sockunion *);
char * mpls_ntoa(union mpls_shim);
-static int check_if_addr_updown(struct rt_msg * rg);
+static int check_if_addr_updown(struct rt_msg *, uint);
extern struct sockaddr mplssockaddr;
/* Many lines inspired or shamelessly stolen from sbin/route/route.c */
#define NEXTADDR(u) \
- do { l = RT_ROUNDUP(u->sa.sa_len); memcpy(cp, u, l); cp += l; } while(0);
+ do { l = RT_ROUNDUP(u->sa.sa_len); memcpy(cp, u, l); cp += l;} while(0);
#define NEXTADDR2(u) \
do { l = RT_ROUNDUP(u.sa_len); memcpy(cp, &u, l); cp += l; } while(0);
#define GETNEXT(sunion) \
- (union sockunion *) ((char *) (sunion) + RT_ROUNDUP((sunion)->sa.sa_len))
+ (union sockunion *) ((char *) (sunion) + \
+ RT_ROUNDUP((sunion)->sa.sa_len))
static int
read_route_socket(char *s, int max)
@@ -581,13 +582,16 @@ check_route(struct rt_msg * rg, uint rle
gate[0] = 0;
pref[0] = 0;
- if (rlen <= sizeof(struct rt_msghdr) ||
- rg->m_rtm.rtm_version != RTM_VERSION)
+ if (rlen < 3 || rg->m_rtm.rtm_version != RTM_VERSION)
return LDP_E_ROUTE_ERROR;
if (rg->m_rtm.rtm_type == RTM_NEWADDR ||
rg->m_rtm.rtm_type == RTM_DELADDR)
- return check_if_addr_updown(rg);
+ return check_if_addr_updown(rg, rlen);
+
+ if (rlen < sizeof(struct rt_msghdr))
+ return LDP_E_ROUTE_ERROR;
+
if (rg->m_rtm.rtm_pid == getpid() ||
((rg->m_rtm.rtm_flags & RTF_DONE) == 0))
return LDP_E_OK;
@@ -719,6 +723,9 @@ check_route(struct rt_msg * rg, uint rle
case RTM_LOSING:
strlcpy(oper, "losing", 20);
break;
+ case RTM_REDIRECT:
+ strlcpy(oper, "redirect", 20);
+ break;
case RTM_NEWADDR:
strlcpy(oper, "new address", 20);
break;
@@ -726,7 +733,7 @@ check_route(struct rt_msg * rg, uint rle
strlcpy(oper, "del address", 20);
break;
default:
- snprintf(oper, 50, "unknown 0x%X operation",
+ snprintf(oper, sizeof(oper), "unknown 0x%X operation",
rg->m_rtm.rtm_type);
}
@@ -742,25 +749,29 @@ check_route(struct rt_msg * rg, uint rle
* Checks NEWADDR and DELADDR messages and sends announcements accordingly
*/
static int
-check_if_addr_updown(struct rt_msg * rg)
+check_if_addr_updown(struct rt_msg * rg, uint rlen)
{
union sockunion *ifa, *netmask;
struct ldp_peer *p;
struct address_list_tlv al_tlv;
+ struct ifa_msghdr *msghdr = (struct ifa_msghdr *)&rg->m_rtm;
- if ((rg->m_rtm.rtm_addrs & RTA_NETMASK) == 0 ||
- (rg->m_rtm.rtm_addrs & RTA_IFA) == 0)
+ if (rlen < sizeof(struct ifa_msghdr) ||
+ (msghdr->ifam_addrs & RTA_NETMASK) == 0 ||
+ (msghdr->ifam_addrs & RTA_IFA) == 0)
return LDP_E_ROUTE_ERROR;
- ifa = netmask = (union sockunion *) rg->m_space;
+ /* we should have RTA_NETMASK, RTA_IFP, RTA_IFA and RTA_BRD */
+ ifa = netmask = (union sockunion *)(msghdr + 1);
if (netmask->sa.sa_family != AF_INET)
return LDP_E_OK;
- if (rg->m_rtm.rtm_addrs & RTA_IFP)
- ifa = GETNEXT(netmask);
+ if (msghdr->ifam_addrs & RTA_IFP)
+ ifa = GETNEXT(ifa);
ifa = GETNEXT(ifa);
- if
CVS commit: [netbsd-6] src/sys/netinet6
Module Name:src
Committed By: jdc
Date: Fri Jul 12 11:18:15 UTC 2013
Modified Files:
src/sys/netinet6 [netbsd-6]: nd6_rtr.c
Log Message:
Pull up revision 1.84 via patch to fix gcc 4.1 compilation error
(uninitialised variable):
Some fun in trying to work out what was broken with gcc-4.1 to
trigger the following warning when gcc-4.5 was silent:
nd6_rtr.c: In function 'nd6_ra_input':
nd6_rtr.c:788: warning: 'ext' may be used uninitialized in this function
Eventually determined that it was not unreasonable for gcc-4.1 to
bleat in this case as there is a nasty 'goto insert' which could
indeed have resulted in an uninitialised variable use. Yay gcc 4.1.
To generate a diff of this commit:
cvs rdiff -u -r1.82.4.1 -r1.82.4.2 src/sys/netinet6/nd6_rtr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/nd6_rtr.c
diff -u src/sys/netinet6/nd6_rtr.c:1.82.4.1 src/sys/netinet6/nd6_rtr.c:1.82.4.2
--- src/sys/netinet6/nd6_rtr.c:1.82.4.1 Mon Jul 8 07:40:07 2013
+++ src/sys/netinet6/nd6_rtr.c Fri Jul 12 11:18:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6_rtr.c,v 1.82.4.1 2013/07/08 07:40:07 jdc Exp $ */
+/* $NetBSD: nd6_rtr.c,v 1.82.4.2 2013/07/12 11:18:15 jdc Exp $ */
/* $KAME: nd6_rtr.c,v 1.95 2001/02/07 08:09:47 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.82.4.1 2013/07/08 07:40:07 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.82.4.2 2013/07/12 11:18:15 jdc Exp $");
#include
#include
@@ -744,6 +744,7 @@ static struct nd_defrouter *
defrtrlist_update(struct nd_defrouter *new)
{
struct nd_defrouter *dr, *n;
+ struct in6_ifextra *ext = new->ifp->if_afdata[AF_INET6];
int s = splsoftnet();
if ((dr = defrouter_lookup(&new->rtaddr, new->ifp)) != NULL) {
@@ -785,7 +786,6 @@ defrtrlist_update(struct nd_defrouter *n
return (dr);
}
- struct in6_ifextra *ext = new->ifp->if_afdata[AF_INET6];
if (ip6_maxifdefrouters >= 0 &&
ext->ndefrouters >= ip6_maxifdefrouters) {
splx(s);
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: jdc Date: Fri Jul 12 11:19:35 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Update entry for ticket 905. To generate a diff of this commit: cvs rdiff -u -r1.1.2.14 -r1.1.2.15 src/doc/CHANGES-6.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.14 src/doc/CHANGES-6.2:1.1.2.15 --- src/doc/CHANGES-6.2:1.1.2.14 Mon Jul 8 07:41:28 2013 +++ src/doc/CHANGES-6.2 Fri Jul 12 11:19:34 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.14 2013/07/08 07:41:28 jdc Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.15 2013/07/12 11:19:34 jdc Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -274,8 +274,9 @@ sys/netinet6/ip6_input.c 1.139 via pat sys/netinet6/ip6_var.h1.59 via patch sys/netinet6/nd6.c1.143 via patch sys/netinet6/nd6.h1.57 via patch -sys/netinet6/nd6_rtr.c1.83 via patch +sys/netinet6/nd6_rtr.c1.83,1.84 via patch - 4 new sysctls to avoid ipv6 DoS attacks from OpenBSD + 4 new sysctls to avoid ipv6 DoS attacks from OpenBSD. +Fix potentially uninitialised variable. [christos, ticket #905]
CVS commit: [netbsd-6-0] src/sys/netinet6
Module Name:src
Committed By: jdc
Date: Fri Jul 12 11:18:32 UTC 2013
Modified Files:
src/sys/netinet6 [netbsd-6-0]: nd6_rtr.c
Log Message:
Pull up revision 1.84 via patch to fix gcc 4.1 compilation error
(uninitialised variable):
Some fun in trying to work out what was broken with gcc-4.1 to
trigger the following warning when gcc-4.5 was silent:
nd6_rtr.c: In function 'nd6_ra_input':
nd6_rtr.c:788: warning: 'ext' may be used uninitialized in this function
Eventually determined that it was not unreasonable for gcc-4.1 to
bleat in this case as there is a nasty 'goto insert' which could
indeed have resulted in an uninitialised variable use. Yay gcc 4.1.
To generate a diff of this commit:
cvs rdiff -u -r1.82.8.1 -r1.82.8.2 src/sys/netinet6/nd6_rtr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/nd6_rtr.c
diff -u src/sys/netinet6/nd6_rtr.c:1.82.8.1 src/sys/netinet6/nd6_rtr.c:1.82.8.2
--- src/sys/netinet6/nd6_rtr.c:1.82.8.1 Mon Jul 8 07:40:34 2013
+++ src/sys/netinet6/nd6_rtr.c Fri Jul 12 11:18:32 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6_rtr.c,v 1.82.8.1 2013/07/08 07:40:34 jdc Exp $ */
+/* $NetBSD: nd6_rtr.c,v 1.82.8.2 2013/07/12 11:18:32 jdc Exp $ */
/* $KAME: nd6_rtr.c,v 1.95 2001/02/07 08:09:47 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.82.8.1 2013/07/08 07:40:34 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.82.8.2 2013/07/12 11:18:32 jdc Exp $");
#include
#include
@@ -744,6 +744,7 @@ static struct nd_defrouter *
defrtrlist_update(struct nd_defrouter *new)
{
struct nd_defrouter *dr, *n;
+ struct in6_ifextra *ext = new->ifp->if_afdata[AF_INET6];
int s = splsoftnet();
if ((dr = defrouter_lookup(&new->rtaddr, new->ifp)) != NULL) {
@@ -785,7 +786,6 @@ defrtrlist_update(struct nd_defrouter *n
return (dr);
}
- struct in6_ifextra *ext = new->ifp->if_afdata[AF_INET6];
if (ip6_maxifdefrouters >= 0 &&
ext->ndefrouters >= ip6_maxifdefrouters) {
splx(s);
CVS commit: [netbsd-6-1] src/sys/netinet6
Module Name:src
Committed By: jdc
Date: Fri Jul 12 11:18:57 UTC 2013
Modified Files:
src/sys/netinet6 [netbsd-6-1]: nd6_rtr.c
Log Message:
Pull up revision 1.84 via patch to fix gcc 4.1 compilation error
(uninitialised variable):
Some fun in trying to work out what was broken with gcc-4.1 to
trigger the following warning when gcc-4.5 was silent:
nd6_rtr.c: In function 'nd6_ra_input':
nd6_rtr.c:788: warning: 'ext' may be used uninitialized in this function
Eventually determined that it was not unreasonable for gcc-4.1 to
bleat in this case as there is a nasty 'goto insert' which could
indeed have resulted in an uninitialised variable use. Yay gcc 4.1.
To generate a diff of this commit:
cvs rdiff -u -r1.82.10.1 -r1.82.10.2 src/sys/netinet6/nd6_rtr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/nd6_rtr.c
diff -u src/sys/netinet6/nd6_rtr.c:1.82.10.1 src/sys/netinet6/nd6_rtr.c:1.82.10.2
--- src/sys/netinet6/nd6_rtr.c:1.82.10.1 Mon Jul 8 07:40:56 2013
+++ src/sys/netinet6/nd6_rtr.c Fri Jul 12 11:18:57 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6_rtr.c,v 1.82.10.1 2013/07/08 07:40:56 jdc Exp $ */
+/* $NetBSD: nd6_rtr.c,v 1.82.10.2 2013/07/12 11:18:57 jdc Exp $ */
/* $KAME: nd6_rtr.c,v 1.95 2001/02/07 08:09:47 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.82.10.1 2013/07/08 07:40:56 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.82.10.2 2013/07/12 11:18:57 jdc Exp $");
#include
#include
@@ -744,6 +744,7 @@ static struct nd_defrouter *
defrtrlist_update(struct nd_defrouter *new)
{
struct nd_defrouter *dr, *n;
+ struct in6_ifextra *ext = new->ifp->if_afdata[AF_INET6];
int s = splsoftnet();
if ((dr = defrouter_lookup(&new->rtaddr, new->ifp)) != NULL) {
@@ -785,7 +786,6 @@ defrtrlist_update(struct nd_defrouter *n
return (dr);
}
- struct in6_ifextra *ext = new->ifp->if_afdata[AF_INET6];
if (ip6_maxifdefrouters >= 0 &&
ext->ndefrouters >= ip6_maxifdefrouters) {
splx(s);
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: jdc Date: Fri Jul 12 11:19:45 UTC 2013 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.3 Log Message: Update entry for ticket 905. To generate a diff of this commit: cvs rdiff -u -r1.1.2.9 -r1.1.2.10 src/doc/CHANGES-6.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0.3 diff -u src/doc/CHANGES-6.0.3:1.1.2.9 src/doc/CHANGES-6.0.3:1.1.2.10 --- src/doc/CHANGES-6.0.3:1.1.2.9 Mon Jul 8 07:41:40 2013 +++ src/doc/CHANGES-6.0.3 Fri Jul 12 11:19:45 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.3,v 1.1.2.9 2013/07/08 07:41:40 jdc Exp $ +# $NetBSD: CHANGES-6.0.3,v 1.1.2.10 2013/07/12 11:19:45 jdc Exp $ A complete list of changes from the NetBSD 6.0.2 release to the NetBSD 6.0.3 release: @@ -118,8 +118,9 @@ sys/netinet6/ip6_input.c 1.139 via pat sys/netinet6/ip6_var.h1.59 via patch sys/netinet6/nd6.c1.143 via patch sys/netinet6/nd6.h1.57 via patch -sys/netinet6/nd6_rtr.c1.83 via patch +sys/netinet6/nd6_rtr.c1.83,1.84 via patch - 4 new sysctls to avoid ipv6 DoS attacks from OpenBSD + 4 new sysctls to avoid ipv6 DoS attacks from OpenBSD. +Fix potentially uninitialised variable. [christos, ticket #905]
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: jdc Date: Fri Jul 12 11:19:58 UTC 2013 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.1 Log Message: Update entry for ticket 905. To generate a diff of this commit: cvs rdiff -u -r1.1.2.9 -r1.1.2.10 src/doc/CHANGES-6.1.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.1.1 diff -u src/doc/CHANGES-6.1.1:1.1.2.9 src/doc/CHANGES-6.1.1:1.1.2.10 --- src/doc/CHANGES-6.1.1:1.1.2.9 Mon Jul 8 07:41:54 2013 +++ src/doc/CHANGES-6.1.1 Fri Jul 12 11:19:58 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.1,v 1.1.2.9 2013/07/08 07:41:54 jdc Exp $ +# $NetBSD: CHANGES-6.1.1,v 1.1.2.10 2013/07/12 11:19:58 jdc Exp $ A complete list of changes from the NetBSD 6.1 release to the NetBSD 6.1.1 release: @@ -118,8 +118,9 @@ sys/netinet6/ip6_input.c 1.139 via pat sys/netinet6/ip6_var.h1.59 via patch sys/netinet6/nd6.c1.143 via patch sys/netinet6/nd6.h1.57 via patch -sys/netinet6/nd6_rtr.c1.83 via patch +sys/netinet6/nd6_rtr.c1.83,1.84 via patch - 4 new sysctls to avoid ipv6 DoS attacks from OpenBSD + 4 new sysctls to avoid ipv6 DoS attacks from OpenBSD. +Fix potentially uninitialised variable. [christos, ticket #905]
CVS commit: src/crypto/dist/ipsec-tools/src/racoon
Module Name:src Committed By: tteras Date: Fri Jul 12 13:11:50 UTC 2013 Modified Files: src/crypto/dist/ipsec-tools/src/racoon: main.c Log Message: >From Sven Vermeulen : Moves ploginit() up, allowing logging events from init_avc() to show up as well. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/crypto/dist/ipsec-tools/src/racoon/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/dist/ipsec-tools/src/racoon/main.c diff -u src/crypto/dist/ipsec-tools/src/racoon/main.c:1.12 src/crypto/dist/ipsec-tools/src/racoon/main.c:1.13 --- src/crypto/dist/ipsec-tools/src/racoon/main.c:1.12 Mon Jan 26 18:13:06 2009 +++ src/crypto/dist/ipsec-tools/src/racoon/main.c Fri Jul 12 13:11:50 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.12 2009/01/26 18:13:06 tteras Exp $ */ +/* $NetBSD: main.c,v 1.13 2013/07/12 13:11:50 tteras Exp $ */ /* Id: main.c,v 1.25 2006/06/20 20:31:34 manubsd Exp */ @@ -290,6 +290,8 @@ main(ac, av) /* NOTREACHED*/ } + ploginit(); + #ifdef DEBUG_RECORD_MALLOCATION DRM_init(); #endif @@ -302,8 +304,6 @@ main(ac, av) oakley_dhinit(); compute_vendorids(); - ploginit(); - plog(LLV_INFO, LOCATION, NULL, "%s\n", version); plog(LLV_INFO, LOCATION, NULL, "@(#)" "This product linked %s (http://www.openssl.org/)"
CVS commit: [ipsec-tools-0_8-branch] src/crypto/dist/ipsec-tools/src/racoon
Module Name:src Committed By: tteras Date: Fri Jul 12 13:12:24 UTC 2013 Modified Files: src/crypto/dist/ipsec-tools/src/racoon [ipsec-tools-0_8-branch]: main.c Log Message: >From Sven Vermeulen : Moves ploginit() up, allowing logging events from init_avc() to show up as well. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.12.6.1 src/crypto/dist/ipsec-tools/src/racoon/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/dist/ipsec-tools/src/racoon/main.c diff -u src/crypto/dist/ipsec-tools/src/racoon/main.c:1.12 src/crypto/dist/ipsec-tools/src/racoon/main.c:1.12.6.1 --- src/crypto/dist/ipsec-tools/src/racoon/main.c:1.12 Mon Jan 26 18:13:06 2009 +++ src/crypto/dist/ipsec-tools/src/racoon/main.c Fri Jul 12 13:12:24 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.12 2009/01/26 18:13:06 tteras Exp $ */ +/* $NetBSD: main.c,v 1.12.6.1 2013/07/12 13:12:24 tteras Exp $ */ /* Id: main.c,v 1.25 2006/06/20 20:31:34 manubsd Exp */ @@ -290,6 +290,8 @@ main(ac, av) /* NOTREACHED*/ } + ploginit(); + #ifdef DEBUG_RECORD_MALLOCATION DRM_init(); #endif @@ -302,8 +304,6 @@ main(ac, av) oakley_dhinit(); compute_vendorids(); - ploginit(); - plog(LLV_INFO, LOCATION, NULL, "%s\n", version); plog(LLV_INFO, LOCATION, NULL, "@(#)" "This product linked %s (http://www.openssl.org/)"
CVS commit: src/sys/arch/acorn26/conf
Module Name:src Committed By: kiyohara Date: Fri Jul 12 14:28:39 UTC 2013 Modified Files: src/sys/arch/acorn26/conf: GENERIC Log Message: Add esp(Castle SCSI board). Tested only BBC A3000 with 4MByte. To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.76 src/sys/arch/acorn26/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/acorn26/conf/GENERIC diff -u src/sys/arch/acorn26/conf/GENERIC:1.75 src/sys/arch/acorn26/conf/GENERIC:1.76 --- src/sys/arch/acorn26/conf/GENERIC:1.75 Sun Jun 30 21:38:55 2013 +++ src/sys/arch/acorn26/conf/GENERIC Fri Jul 12 14:28:39 2013 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.75 2013/06/30 21:38:55 rmind Exp $ +# $NetBSD: GENERIC,v 1.76 2013/07/12 14:28:39 kiyohara Exp $ # # GENERIC machine description file # @@ -191,6 +191,9 @@ scsibus* at hcsc? oak* at podulebus0 slot ? # Oak Solutions 16-bit SCSI interface scsibus* at oak? +esp* at podulebus0 slot ? # Castle SCSI interface +scsibus* at esp? + upc0 at iobus0 base 0x01 # I/O chip on IOEB machines com0 at upc0 # Serial port lpt0 at upc0 # Parallel port
CVS commit: src/sys/fs/udf
Module Name:src
Committed By: reinoud
Date: Fri Jul 12 16:14:10 UTC 2013
Modified Files:
src/sys/fs/udf: udf_rename.c
Log Message:
In case there is trouble determining the number of entries in a directory,
return its not empty to be on the safe side.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/fs/udf/udf_rename.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/udf/udf_rename.c
diff -u src/sys/fs/udf/udf_rename.c:1.4 src/sys/fs/udf/udf_rename.c:1.5
--- src/sys/fs/udf/udf_rename.c:1.4 Thu Jul 11 19:41:19 2013
+++ src/sys/fs/udf/udf_rename.c Fri Jul 12 16:14:10 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_rename.c,v 1.4 2013/07/11 19:41:19 reinoud Exp $ */
+/* $NetBSD: udf_rename.c,v 1.5 2013/07/12 16:14:10 reinoud Exp $ */
/*
* Copyright (c) 2013 Reinoud Zandijk
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: udf_rename.c,v 1.4 2013/07/11 19:41:19 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_rename.c,v 1.5 2013/07/12 16:14:10 reinoud Exp $");
#include
#include
@@ -140,7 +140,8 @@ udf_gro_directory_empty_p(struct mount *
error = udf_dirhash_fill(udf_node);
if (error) {
dirhash_put(udf_node->dir_hash);
- return error;
+ /* VERY unlikely, answer its not empty */
+ return 0;
}
/* check to see if the directory is empty */
CVS import: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Fri Jul 12 16:50:27 UTC 2013 Update of /cvsroot/src/external/bsd/openresolv/dist In directory ivanova.netbsd.org:/tmp/cvs-serv17222 Log Message: Import openresolv-3.5.6 Highlights include: name_servers[_append] and search_domains[_append] now work for subscribers other than libc. Status: Vendor Tag: roy Release Tags: openresolv-3-5-6 U src/external/bsd/openresolv/dist/README U src/external/bsd/openresolv/dist/resolvconf.in U src/external/bsd/openresolv/dist/resolvconf.8.in U src/external/bsd/openresolv/dist/resolvconf.conf.5.in U src/external/bsd/openresolv/dist/libc.in U src/external/bsd/openresolv/dist/dnsmasq.in U src/external/bsd/openresolv/dist/named.in U src/external/bsd/openresolv/dist/pdnsd.in U src/external/bsd/openresolv/dist/unbound.in No conflicts created by this import
CVS commit: src/doc
Module Name:src Committed By: roy Date: Fri Jul 12 16:52:56 UTC 2013 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Import openresolv-3.5.6 To generate a diff of this commit: cvs rdiff -u -r1.1041 -r1.1042 src/doc/3RDPARTY cvs rdiff -u -r1.1830 -r1.1831 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1041 src/doc/3RDPARTY:1.1042 --- src/doc/3RDPARTY:1.1041 Tue Jul 9 08:57:16 2013 +++ src/doc/3RDPARTY Fri Jul 12 16:52:56 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1041 2013/07/09 08:57:16 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1042 2013/07/12 16:52:56 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -883,8 +883,8 @@ Notes: Next import will need $ Id removal.. Package: openresolv -Version: 3.5.5 -Current Vers: 3.5.5 +Version: 3.5.6 +Current Vers: 3.5.6 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/openresolv/ Home Page: http://roy.marples.name/projects/openresolv/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1830 src/doc/CHANGES:1.1831 --- src/doc/CHANGES:1.1830 Sun Jul 7 10:50:58 2013 +++ src/doc/CHANGES Fri Jul 12 16:52:56 2013 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1830 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1831 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -253,3 +253,5 @@ Changes from NetBSD 6.0 to NetBSD 7.0: acceleration using SX [macallan 20130619] dhcpcd(8): Import dhcpcd-6.0.0 [roy 20130621] zoneinfo: Import tzdata2013d. [apb 20130707] + openresolv(8): Import openresolv-3.5.6 [roy 20130712] +
CVS commit: src/external/bsd/openresolv/sbin/resolvconf
Module Name:src
Committed By: roy
Date: Fri Jul 12 17:30:25 UTC 2013
Modified Files:
src/external/bsd/openresolv/sbin/resolvconf: Makefile
Log Message:
build correctly for SBINDIR
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openresolv/sbin/resolvconf/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/openresolv/sbin/resolvconf/Makefile
diff -u src/external/bsd/openresolv/sbin/resolvconf/Makefile:1.4 src/external/bsd/openresolv/sbin/resolvconf/Makefile:1.5
--- src/external/bsd/openresolv/sbin/resolvconf/Makefile:1.4 Tue Apr 3 10:50:46 2012
+++ src/external/bsd/openresolv/sbin/resolvconf/Makefile Fri Jul 12 17:30:25 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/04/03 10:50:46 roy Exp $
+# $NetBSD: Makefile,v 1.5 2013/07/12 17:30:25 roy Exp $
#
.include
@@ -25,7 +25,7 @@ CMD2= \1 restart
RESTARTCMD= if /etc/rc.d/${CMD1}; then /etc/rc.d/${CMD2}; fi
.for f in ${SCRIPTS} ${FILES} ${MAN}
${f}: Makefile ${f}.in
- ${TOOL_SED} -e 's:@PREFIX@::g' \
+ ${TOOL_SED} -e 's:@PREFIX@::g' -e 's:@SBINDIR@:/sbin:g' \
-e 's:@SYSCONFDIR@:/etc:g' \
-e 's:@LIBEXECDIR@:/libexec/resolvconf:g' \
-e 's:@VARDIR@:/var/run/resolvconf:g' \
CVS commit: src/external/bsd/openresolv/sbin/resolvconf
Module Name:src
Committed By: roy
Date: Fri Jul 12 17:32:47 UTC 2013
Modified Files:
src/external/bsd/openresolv/sbin/resolvconf: Makefile
Log Message:
build correctly for RCDIR
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openresolv/sbin/resolvconf/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/openresolv/sbin/resolvconf/Makefile
diff -u src/external/bsd/openresolv/sbin/resolvconf/Makefile:1.5 src/external/bsd/openresolv/sbin/resolvconf/Makefile:1.6
--- src/external/bsd/openresolv/sbin/resolvconf/Makefile:1.5 Fri Jul 12 17:30:25 2013
+++ src/external/bsd/openresolv/sbin/resolvconf/Makefile Fri Jul 12 17:32:47 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2013/07/12 17:30:25 roy Exp $
+# $NetBSD: Makefile,v 1.6 2013/07/12 17:32:47 roy Exp $
#
.include
@@ -25,7 +25,9 @@ CMD2= \1 restart
RESTARTCMD= if /etc/rc.d/${CMD1}; then /etc/rc.d/${CMD2}; fi
.for f in ${SCRIPTS} ${FILES} ${MAN}
${f}: Makefile ${f}.in
- ${TOOL_SED} -e 's:@PREFIX@::g' -e 's:@SBINDIR@:/sbin:g' \
+ ${TOOL_SED} -e 's:@PREFIX@::g' \
+ -e 's:@SBINDIR@:/sbin:g' \
+ -e 's:@RCDIR@:/etc/rc.d:g' \
-e 's:@SYSCONFDIR@:/etc:g' \
-e 's:@LIBEXECDIR@:/libexec/resolvconf:g' \
-e 's:@VARDIR@:/var/run/resolvconf:g' \
CVS commit: src/lib/libedit
Module Name:src
Committed By: christos
Date: Fri Jul 12 17:48:29 UTC 2013
Modified Files:
src/lib/libedit: chared.c editline.3 histedit.h
Log Message:
Add a function to move the cursor.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/lib/libedit/chared.c
cvs rdiff -u -r1.79 -r1.80 src/lib/libedit/editline.3
cvs rdiff -u -r1.50 -r1.51 src/lib/libedit/histedit.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/chared.c
diff -u src/lib/libedit/chared.c:1.37 src/lib/libedit/chared.c:1.38
--- src/lib/libedit/chared.c:1.37 Wed Jul 18 13:12:39 2012
+++ src/lib/libedit/chared.c Fri Jul 12 13:48:29 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: chared.c,v 1.37 2012/07/18 17:12:39 christos Exp $ */
+/* $NetBSD: chared.c,v 1.38 2013/07/12 17:48:29 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)chared.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: chared.c,v 1.37 2012/07/18 17:12:39 christos Exp $");
+__RCSID("$NetBSD: chared.c,v 1.38 2013/07/12 17:48:29 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -644,6 +644,25 @@ el_deletestr(EditLine *el, int n)
el->el_line.cursor = el->el_line.buffer;
}
+/* el_cursor():
+ * Move the cursor to the left or the right of the current position
+ */
+public int
+el_cursor(EditLine *el, int n)
+{
+ if (n == 0)
+ goto out;
+
+ el->el_line.cursor += n;
+
+ if (el->el_line.cursor < el->el_line.buffer)
+ el->el_line.cursor = el->el_line.buffer;
+ if (el->el_line.cursor > el->el_line.lastchar)
+ el->el_line.cursor = el->el_line.lastchar;
+out:
+ return el->el_line.cursor - el->el_line.buffer;
+}
+
/* c_gets():
* Get a string
*/
Index: src/lib/libedit/editline.3
diff -u src/lib/libedit/editline.3:1.79 src/lib/libedit/editline.3:1.80
--- src/lib/libedit/editline.3:1.79 Tue Jan 22 15:23:21 2013
+++ src/lib/libedit/editline.3 Fri Jul 12 13:48:29 2013
@@ -1,4 +1,4 @@
-.\" $NetBSD: editline.3,v 1.79 2013/01/22 20:23:21 christos Exp $
+.\" $NetBSD: editline.3,v 1.80 2013/07/12 17:48:29 christos Exp $
.\"
.\" Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -26,7 +26,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd January 22, 2013
+.Dd July 12, 2013
.Dt EDITLINE 3
.Os
.Sh NAME
@@ -49,6 +49,7 @@
.Nm el_wget ,
.Nm el_source ,
.Nm el_resize ,
+.Nm el_cursor ,
.Nm el_line ,
.Nm el_wline ,
.Nm el_insertstr ,
@@ -112,8 +113,12 @@
.Fn el_source "EditLine *e" "const char *file"
.Ft void
.Fn el_resize "EditLine *e"
+.Fn int
+.Fn el_cursor "EditLine *e" "int count"
.Ft const LineInfo *
.Fn el_line "EditLine *e"
+.Ft const LineInfoW *
+.Fn el_wline "EditLine *e"
.Ft int
.Fn el_insertstr "EditLine *e" "const char *str"
.Ft int
@@ -610,6 +615,11 @@ then this is done automatically.
Otherwise, it's the responsibility of the application to call
.Fn el_resize
on the appropriate occasions.
+.It Fn el_cursor
+Move the cursor to the right (if positive) or to the left (if negative)
+.Fa count
+characters.
+Returns the resulting offset of the cursor from the beginning of the line.
.It Fn el_line
Return the editing information for the current line in a
.Fa LineInfo
Index: src/lib/libedit/histedit.h
diff -u src/lib/libedit/histedit.h:1.50 src/lib/libedit/histedit.h:1.51
--- src/lib/libedit/histedit.h:1.50 Tue Jan 22 15:23:21 2013
+++ src/lib/libedit/histedit.h Fri Jul 12 13:48:29 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: histedit.h,v 1.50 2013/01/22 20:23:21 christos Exp $ */
+/* $NetBSD: histedit.h,v 1.51 2013/07/12 17:48:29 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -279,6 +279,7 @@ int el_wparse(EditLine *, int, const w
int el_wset(EditLine *, int, ...);
int el_wget(EditLine *, int, ...);
+int el_cursor(EditLine *, int);
const LineInfoW *el_wline(EditLine *);
int el_winsertstr(EditLine *, const wchar_t *);
#define el_wdeletestr el_deletestr
CVS commit: src/lib/libedit
Module Name:src
Committed By: christos
Date: Fri Jul 12 22:39:50 UTC 2013
Modified Files:
src/lib/libedit: chared.c
Log Message:
cast to avoid warning.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/lib/libedit/chared.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/chared.c
diff -u src/lib/libedit/chared.c:1.38 src/lib/libedit/chared.c:1.39
--- src/lib/libedit/chared.c:1.38 Fri Jul 12 13:48:29 2013
+++ src/lib/libedit/chared.c Fri Jul 12 18:39:50 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: chared.c,v 1.38 2013/07/12 17:48:29 christos Exp $ */
+/* $NetBSD: chared.c,v 1.39 2013/07/12 22:39:50 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)chared.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: chared.c,v 1.38 2013/07/12 17:48:29 christos Exp $");
+__RCSID("$NetBSD: chared.c,v 1.39 2013/07/12 22:39:50 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -660,7 +660,7 @@ el_cursor(EditLine *el, int n)
if (el->el_line.cursor > el->el_line.lastchar)
el->el_line.cursor = el->el_line.lastchar;
out:
- return el->el_line.cursor - el->el_line.buffer;
+ return (int)(el->el_line.cursor - el->el_line.buffer);
}
/* c_gets():
