From 46e55aaabc33549b91a85052aa048dffaf061761 Mon Sep 17 00:00:00 2001
From: Ben Lindstrom <mouring@eviladmin.org>
Date: Tue, 13 Mar 2001 23:38:20 +0000
Subject: [PATCH]  - Fix strerror() in bsd-misc.c

---
 ChangeLog                 | 3 ++-
 openbsd-compat/bsd-misc.c | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 99ed4d03d..872d94c47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
   - djm@cvs.openbsd.org 2001/03/13 22:42:54
     [sftp-client.c sftp-client.h sftp-glob.c sftp-glob.h sftp-int.c]
     sftp client filename globbing for get, put, ch{mod,grp,own}. ok markus@
+ - Fix strerror() in bsd-misc.c
 
 20010313
  - OpenBSD CVS Sync
@@ -4540,4 +4541,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.953 2001/03/13 23:27:09 djm Exp $
+$Id: ChangeLog,v 1.954 2001/03/13 23:38:20 mouring Exp $
diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index c0d2d65ee..6f92e064f 100644
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -26,7 +26,7 @@
 #include "xmalloc.h"
 #include "ssh.h"
 
-RCSID("$Id: bsd-misc.c,v 1.2 2001/02/09 01:55:36 djm Exp $");
+RCSID("$Id: bsd-misc.c,v 1.3 2001/03/13 23:38:20 mouring Exp $");
 
 char *get_progname(char *argv0)
 {
@@ -76,10 +76,10 @@ const char *strerror(int e)
 	extern int sys_nerr;
 	extern char *sys_errlist[];
 	
-	if ((e >= 0) || (e < sys_nerr))
-		return("unlisted error");
-	else
+	if ((e >= 0) && (e < sys_nerr))
 		return(sys_errlist[e]);
+	else
+		return("unlisted error");
 }
 #endif