Small yet significant tweaks/cleanups:

- getpwent:
  o adjunctbuf should be NUL terminated after copying
  o _pw_breakout_yp() needs to know the length of the buffer returned
    from YP so it can properly NUL terminate its local buffer.

- getgrent:
  o YP buffers should be YPMAXRECORD + 2 bytes long and NUL terminated.
    (Previously they were hardcoded to 1024 bytes.)

- getnetgrent:
  o YP data should be copied with snprintf(), not sprintf()

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, 2 insertions, 2 deletions

diff --git a/lib/libc/gen/getnetgrent.c b/lib/libc/gen/getnetgrent.c
index f0d7967f1417..46cc76462c92 100644
--- a/lib/libc/gen/getnetgrent.c
+++ b/lib/libc/gen/getnetgrent.c
@@ -503,7 +503,7 @@ read_for_group(group)
 	register int len, olen;
 	int cont;
 	struct linelist *lp;
-	char line[LINSIZ + 1];
+	char line[LINSIZ + 2];
 #ifdef YP
 	char *result;
 	int resultlen;
@@ -523,7 +523,7 @@ read_for_group(group)
 					continue;
 				}
 			}
-			sprintf(line, "%s %s", group, result);
+			snprintf(line, LINSIZ, "%s %s", group, result);
 			free(result);
 		}
 #else