summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sftp.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ee165a213..e1c550829 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120050815
2 - (tim) wrap el_end() in #ifdef USE_LIBEDIT
3
120050812 420050812
2 - (djm) OpenBSD CVS Sync 5 - (djm) OpenBSD CVS Sync
3 - markus@cvs.openbsd.org 2005/07/28 17:36:22 6 - markus@cvs.openbsd.org 2005/07/28 17:36:22
@@ -2932,4 +2935,4 @@
2932 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2935 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2933 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2936 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2934 2937
2935$Id: ChangeLog,v 1.3871 2005/08/12 12:16:22 djm Exp $ 2938$Id: ChangeLog,v 1.3872 2005/08/15 21:52:50 tim Exp $
diff --git a/sftp.c b/sftp.c
index 0f1aa4b54..9f6c88fb5 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1355,8 +1355,10 @@ interactive_loop(int fd_in, int fd_out, char *file1, char *file2)
1355 } 1355 }
1356 xfree(pwd); 1356 xfree(pwd);
1357 1357
1358#ifdef USE_LIBEDIT
1358 if (el != NULL) 1359 if (el != NULL)
1359 el_end(el); 1360 el_end(el);
1361#endif /* USE_LIBEDIT */
1360 1362
1361 /* err == 1 signifies normal "quit" exit */ 1363 /* err == 1 signifies normal "quit" exit */
1362 return (err >= 0 ? 0 : -1); 1364 return (err >= 0 ? 0 : -1);