Small yet significant tweaks/cleanups:

- getservent:
  o put _yp_check() proto under #ifdef YP where it belongs
  o local YP buffers should be YPMAXRECORD + 2 bytes long and should
    be NUL terminated after copying

- gethostbynis:
  o local YP buffer should be YPMAXRECORD + 2 bytes long

- getnetbynis:
  o local YP buffer should be YPMAXRECORD + 2 bytes long and should
    be NUL terminated after copying

- ether_addr:
  o local YP buffers should be YPMAXRECORD + 2 bytes long and should
    be NUL terminated after copying (in this case it's BUFSIZ + 2 bytes,
    but it happens that BUFSIZ == YPMAXRECORD.

- gethostbydns:
  o nuke stray 'return(NULL)' in __dns_getanswer() (harmless but looks silly)

These are 2.2 candidates. I will wait a few days to make sure these don't
break anything and then, if there are no objections, move them to the 2.2
branch.

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/libc/net/getservent.c b/lib/libc/net/getservent.c
index 78d6df1..cd4449f 100644
--- a/lib/libc/net/getservent.c
+++ b/lib/libc/net/getservent.c
@@ -46,9 +46,9 @@ static char sccsid[] = "@(#)getservent.c	8.1 (Berkeley) 6/4/93";
 #include <rpcsvc/yp_prot.h>
 #include <rpcsvc/ypclnt.h>
 static int serv_stepping_yp = 0;
+extern int _yp_check __P(( char ** ));
 #endif
 
-extern int _yp_check __P(( char ** ));
 
 #define	MAXALIASES	35
 
@@ -70,7 +70,7 @@ _getservbyport_yp(line)
 {
 	char *result;
 	int resultlen;
-	char buf[YPMAXRECORD];
+	char buf[YPMAXRECORD + 2];
 	int rv;
 
 	snprintf(buf, sizeof(buf), "%d/%s", ntohs(___getservbyport_yp),
@@ -116,7 +116,7 @@ _getservbyname_yp(line)
 {
 	char *result;
 	int resultlen;
-	char buf[YPMAXRECORD];
+	char buf[YPMAXRECORD + 2];
 
 	if(!yp_domain) {
 		if(yp_get_default_domain(&yp_domain))