Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change type of `net' variable passed via va_list in 

_{files,dns,yp}_getenetbyaddr() functions from unsigned long to uint32_t.
In rev 1.29, getnetbyaddr(3) was changed to take uint32_t `net' argument
and also passisng uint32_t `net' to nsdispatch(3) varargs, but
these callback functions were not changed accordingly.

Patch was provided by christos, and this fixes amd(8) coredumps on alpha
when /etc/nsswitch.conf has more than one sources for netgroups.
This commit is contained in:
tsutsui 2006-09-18 17:15:39 +00:00
parent 31eaae697a
commit 6a8419e3ee
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/libc/net/getnetnamadr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: getnetnamadr.c,v 1.33 2006/03/17 15:53:29 ginsbach Exp $ */
/* $NetBSD: getnetnamadr.c,v 1.34 2006/09/18 17:15:39 tsutsui Exp $ */
/* Copyright (c) 1993 Carlos Leandro and Rui Salgueiro
* Dep. Matematica Universidade de Coimbra, Portugal, Europe
@ -43,7 +43,7 @@ static char sccsid[] = "@(#)getnetbyaddr.c 8.1 (Berkeley) 6/4/93";
static char sccsid_[] = "from getnetnamadr.c 1.4 (Coimbra) 93/06/03";
static char rcsid[] = "Id: getnetnamadr.c,v 8.8 1997/06/01 20:34:37 vixie Exp ";
#else
__RCSID("$NetBSD: getnetnamadr.c,v 1.33 2006/03/17 15:53:29 ginsbach Exp $");
__RCSID("$NetBSD: getnetnamadr.c,v 1.34 2006/09/18 17:15:39 tsutsui Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -251,12 +251,12 @@ int
_files_getnetbyaddr(void *rv, void *cb_data, va_list ap)
{
struct netent *p;
unsigned long net;
uint32_t net;
int type;
_DIAGASSERT(rv != NULL);
net = va_arg(ap, unsigned long);
net = va_arg(ap, uint32_t);
type = va_arg(ap, int);
setnetent(_net_stayopen);
@ -281,15 +281,15 @@ _dns_getnetbyaddr(void *rv, void *cb_data, va_list ap)
int nn, anslen;
querybuf *buf;
char qbuf[MAXDNAME];
unsigned long net2;
uint32_t net2;
struct netent *np;
unsigned long net;
uint32_t net;
int type;
res_state res;
_DIAGASSERT(rv != NULL);
net = va_arg(ap, unsigned long);
net = va_arg(ap, uint32_t);
type = va_arg(ap, int);
if (type != AF_INET)
@ -339,7 +339,7 @@ _dns_getnetbyaddr(void *rv, void *cb_data, va_list ap)
free(buf);
if (np) {
/* maybe net should be unsigned? */
unsigned long u_net = net;
uint32_t u_net = net;
/* Strip trailing zeros */
while ((u_net & 0xff) == 0 && u_net != 0)
@ -482,12 +482,12 @@ _yp_getnetbyaddr(void *rv, void *cb_data, va_list ap)
struct netent *np;
char qbuf[MAXDNAME];
unsigned int netbr[4];
unsigned long net, net2;
uint32_t net, net2;
int type, r;
_DIAGASSERT(rv != NULL);
net = va_arg(ap, unsigned long);
net = va_arg(ap, uint32_t);
type = va_arg(ap, int);
if (type != AF_INET)