summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sftp.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9d129a183..62ffb4690 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -128,6 +128,9 @@
128 realloc is particularly prone to integer overflows because it is 128 realloc is particularly prone to integer overflows because it is
129 almost always allocating "n * size" bytes, so this is a far safer 129 almost always allocating "n * size" bytes, so this is a far safer
130 API; ok deraadt@ 130 API; ok deraadt@
131 - djm@cvs.openbsd.org 2006/03/25 01:30:23
132 [sftp.c]
133 "abormally" is a perfectly cromulent word, but "abnormally" is better
131 134
13220060325 13520060325
133 - OpenBSD CVS Sync 136 - OpenBSD CVS Sync
@@ -4385,4 +4388,4 @@
4385 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4388 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4386 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4389 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4387 4390
4388$Id: ChangeLog,v 1.4274 2006/03/26 03:22:47 djm Exp $ 4391$Id: ChangeLog,v 1.4275 2006/03/26 03:23:17 djm Exp $
diff --git a/sftp.c b/sftp.c
index 194d22710..868794a76 100644
--- a/sftp.c
+++ b/sftp.c
@@ -244,7 +244,7 @@ local_do_shell(const char *args)
244 if (errno != EINTR) 244 if (errno != EINTR)
245 fatal("Couldn't wait for child: %s", strerror(errno)); 245 fatal("Couldn't wait for child: %s", strerror(errno));
246 if (!WIFEXITED(status)) 246 if (!WIFEXITED(status))
247 error("Shell exited abormally"); 247 error("Shell exited abnormally");
248 else if (WEXITSTATUS(status)) 248 else if (WEXITSTATUS(status))
249 error("Shell exited with status %d", WEXITSTATUS(status)); 249 error("Shell exited with status %d", WEXITSTATUS(status));
250} 250}