Use strerror() instead of sys_errlist[], as the later isn't available on

solaris9.  OK'd by tron@

4 files changed, 88 insertions, 1 deletions

diff --git a/security/tcp_wrappers/distinfo b/security/tcp_wrappers/distinfo
index 0a1d2835666..ff123ae3f30 100644
--- a/security/tcp_wrappers/distinfo
+++ b/security/tcp_wrappers/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.5 2004/02/10 09:17:22 grant Exp $
+$NetBSD: distinfo,v 1.6 2004/03/21 19:49:05 bouyer Exp $
 
 SHA1 (tcp_wrappers_7.6-ipv6.1.tar.gz) = d0b70d4f0c0ac0375d8283a18ec2b6d602f82fde
 Size (tcp_wrappers_7.6-ipv6.1.tar.gz) = 144708 bytes
 SHA1 (patch-aa) = 4158e67803e39d9cf0469bc1961ea2a1e6d672e2
 SHA1 (patch-ab) = 51b094f55afcea6ef1063af1b27be0b22b07eaa6
+SHA1 (patch-ac) = a9cd493a470782e8f6bdd38fde6c746fb1e371c0
+SHA1 (patch-ad) = 2f2fa789599e2fca652e240f05bec8460287e79e
+SHA1 (patch-ae) = feddad07e9661c220a5be279fcf2cec87eb1b6b2
diff --git a/security/tcp_wrappers/patches/patch-ac b/security/tcp_wrappers/patches/patch-ac
new file mode 100644
index 00000000000..74df4c538a2
--- /dev/null
+++ b/security/tcp_wrappers/patches/patch-ac
@@ -0,0 +1,28 @@
+$NetBSD: patch-ac,v 1.1 2004/03/21 19:49:05 bouyer Exp $
+
+--- tli-sequent.c.orig	Thu Feb  5 11:40:42 2004
++++ tli-sequent.c	Thu Feb  5 11:43:16 2004
+@@ -31,8 +31,6 @@
+ #include <string.h>
+ 
+ extern int errno;
+-extern char *sys_errlist[];
+-extern int sys_nerr;
+ extern int t_errno;
+ extern char *t_errlist[];
+ extern int t_nerr;
+@@ -157,12 +155,8 @@
+ 	    return (t_errlist[t_errno]);
+ 	}
+     } else {
+-	if (errno < 0 || errno >= sys_nerr) {
+-	    sprintf(buf, "Unknown UNIX error %d", errno);
+-	    return (buf);
+-	} else {
+-	    return (sys_errlist[errno]);
+-	}
++	strcpy(buf, strerror(errno));
++	return (buf);
+     }
+ }
+ 
diff --git a/security/tcp_wrappers/patches/patch-ad b/security/tcp_wrappers/patches/patch-ad
new file mode 100644
index 00000000000..6c45c18ac0a
--- /dev/null
+++ b/security/tcp_wrappers/patches/patch-ad
@@ -0,0 +1,28 @@
+$NetBSD: patch-ad,v 1.1 2004/03/21 19:49:05 bouyer Exp $
+
+--- percent_m.c.orig	Thu Feb  5 11:40:42 2004
++++ percent_m.c	Thu Feb  5 11:44:20 2004
+@@ -13,10 +13,6 @@
+ #include <string.h>
+ 
+ extern int errno;
+-#ifndef SYS_ERRLIST_DEFINED
+-extern char *sys_errlist[];
+-extern int sys_nerr;
+-#endif
+ 
+ #include "mystdarg.h"
+ 
+@@ -29,11 +25,7 @@
+ 
+     while (*bp = *cp)
+ 	if (*cp == '%' && cp[1] == 'm') {
+-	    if (errno < sys_nerr && errno > 0) {
+-		strcpy(bp, sys_errlist[errno]);
+-	    } else {
+-		sprintf(bp, "Unknown error %d", errno);
+-	    }
++	    strcpy(bp, strerror(errno));
+ 	    bp += strlen(bp);
+ 	    cp += 2;
+ 	} else {
diff --git a/security/tcp_wrappers/patches/patch-ae b/security/tcp_wrappers/patches/patch-ae
new file mode 100644
index 00000000000..3b0e3a2a3aa
--- /dev/null
+++ b/security/tcp_wrappers/patches/patch-ae
@@ -0,0 +1,28 @@
+$NetBSD: patch-ae,v 1.1 2004/03/21 19:49:05 bouyer Exp $
+
+--- tli.c.orig	Thu Feb  5 11:40:42 2004
++++ tli.c	Thu Feb  5 11:42:25 2004
+@@ -40,8 +40,6 @@
+ 
+ extern char *nc_sperror();
+ extern int errno;
+-extern char *sys_errlist[];
+-extern int sys_nerr;
+ extern int t_errno;
+ extern char *t_errlist[];
+ extern int t_nerr;
+@@ -317,12 +315,8 @@
+ 	    return (t_errlist[t_errno]);
+ 	}
+     } else {
+-	if (errno < 0 || errno >= sys_nerr) {
+-	    sprintf(buf, "Unknown UNIX error %d", errno);
+-	    return (buf);
+-	} else {
+-	    return (sys_errlist[errno]);
+-	}
++	strcpy(buf, strerror(errno));
++	return (buf);
+     }
+ }
+