- (djm) Avoid bad and unportable sprintf usage in compat code

ggrrr - do a "cvs update" before doing "cvs tag"

ChangeLog

@@ -2,6 +2,7 @@
  - (djm) Pull in auth-krb5.c from OpenBSD CVS. NB. it is not currently used.
  - (djm) Sync $sysconfdir/moduli
  - (djm) Add AC_SYS_LARGEFILE configure test
+ - (djm) Avoid bad and unportable sprintf usage in compat code
 
 20010923
  - (bal) updated ssh.c to mirror minor getopts 'extern int' formating done
@@ -6568,4 +6569,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1562 2001/09/25 06:39:35 djm Exp $
+$Id: ChangeLog,v 1.1559.2.2 2001/09/25 12:22:54 djm Exp $

TODO

@@ -91,4 +91,4 @@ Packaging:
 - HP-UX: Provide DEPOT package scripts.
   ([email protected])
 
-$Id: TODO,v 1.43 2001/09/25 03:01:49 djm Exp $
+$Id: TODO,v 1.42.2.1 2001/09/25 06:46:11 djm Exp $

configure.in

@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.314 2001/09/25 06:39:35 djm Exp $
+# $Id: configure.in,v 1.313.2.1 2001/09/25 06:46:12 djm Exp $
 
 AC_INIT(ssh.c)
 

openbsd-compat/inet_ntop.c

@@ -104,7 +104,8 @@ inet_ntop4(src, dst, size)
 	static const char fmt[] = "%u.%u.%u.%u";
 	char tmp[sizeof "255.255.255.255"];
 
-	if (sprintf(tmp, fmt, src[0], src[1], src[2], src[3]) > size) {
+	if (snprintf(tmp, sizeof(tmp), fmt, src[0], src[1], src[2],
+	    src[3]) > size) {
 		errno = ENOSPC;
 		return (NULL);
 	}
@@ -190,7 +191,8 @@ inet_ntop6(src, dst, size)
 			tp += strlen(tp);
 			break;
 		}
-		tp += sprintf(tp, "%x", words[i]);
+		snprintf(tp, sizeof(tmp - (tp - tmp)), "%x", words[i]);
+		tp += strlen(tp);
 	}
 	/* Was it a trailing run of 0x00's? */
 	if (best.base != -1 && (best.base + best.len) == (IN6ADDRSZ / INT16SZ))