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

no need for KAME_SCOPEID any longer

This commit is contained in:
itojun 2002-06-09 19:59:55 +00:00
parent 2a8a7da29d
commit 6ed8672880
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr.sbin/syslogd/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.15 2001/07/01 16:23:42 itojun Exp $
# $NetBSD: Makefile,v 1.16 2002/06/09 19:59:55 itojun Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= syslogd
@ -9,9 +9,6 @@ LDADD+=-lutil
SYMLINKS= /var/run/log /dev/log
CPPFLAGS+=-DINET6
# KAME scopeid hack
#CPPFLAGS+=-DKAME_SCOPEID
CPPFLAGS+=-DLIBWRAP
LDADD+= -lwrap
DPADD+= ${LIBWRAP}

8
usr.sbin/syslogd/syslogd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: syslogd.c,v 1.53 2002/05/25 14:46:01 wiz Exp $ */
/* $NetBSD: syslogd.c,v 1.54 2002/06/09 19:59:55 itojun Exp $ */
/*
* Copyright (c) 1983, 1988, 1993, 1994
@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94";
#else
__RCSID("$NetBSD: syslogd.c,v 1.53 2002/05/25 14:46:01 wiz Exp $");
__RCSID("$NetBSD: syslogd.c,v 1.54 2002/06/09 19:59:55 itojun Exp $");
#endif
#endif /* not lint */
@ -1013,11 +1013,7 @@ cvthname(struct sockaddr_storage *f)
{
int error;
char *p;
#ifdef KAME_SCOPEID
const int niflag = NI_DGRAM | NI_WITHSCOPEID;
#else
const int niflag = NI_DGRAM;
#endif
static char host[NI_MAXHOST], ip[NI_MAXHOST];
error = getnameinfo((struct sockaddr*)f, ((struct sockaddr*)f)->sa_len,