summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-04-02 21:06:18 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-04-02 21:06:18 +0000
commit2f3d52a2d67b547c5f06676c52396fd8133df32b (patch)
tree2d31a2907651c8eeac17ea4ede0b688056c5c118
parenteecdf235310bd3088acc547607452b657dd09f5a (diff)
- markus@cvs.openbsd.org 2002/04/02 17:37:48
[sftp.c] always call log_init()
-rw-r--r--ChangeLog5
-rw-r--r--sftp.c5
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9b5759a8c..ce933846c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,9 @@
33 [ssh-agent.c] 33 [ssh-agent.c]
34 check $SHELL for -k and -d, too; 34 check $SHELL for -k and -d, too;
35 http://bugzilla.mindrot.org/show_bug.cgi?id=199 35 http://bugzilla.mindrot.org/show_bug.cgi?id=199
36 - markus@cvs.openbsd.org 2002/04/02 17:37:48
37 [sftp.c]
38 always call log_init()
36 39
3720020401 4020020401
38 - (stevesk) [monitor.c] PAM should work again; will *not* work with 41 - (stevesk) [monitor.c] PAM should work again; will *not* work with
@@ -8140,4 +8143,4 @@
8140 - Wrote replacements for strlcpy and mkdtemp 8143 - Wrote replacements for strlcpy and mkdtemp
8141 - Released 1.0pre1 8144 - Released 1.0pre1
8142 8145
8143$Id: ChangeLog,v 1.2017 2002/04/02 21:03:51 mouring Exp $ 8146$Id: ChangeLog,v 1.2018 2002/04/02 21:06:18 mouring Exp $
diff --git a/sftp.c b/sftp.c
index e4086549c..9a6488fa1 100644
--- a/sftp.c
+++ b/sftp.c
@@ -24,7 +24,7 @@
24 24
25#include "includes.h" 25#include "includes.h"
26 26
27RCSID("$OpenBSD: sftp.c,v 1.28 2002/03/30 18:51:15 markus Exp $"); 27RCSID("$OpenBSD: sftp.c,v 1.29 2002/04/02 17:37:48 markus Exp $");
28 28
29/* XXX: short-form remote directory listings (like 'ls -C') */ 29/* XXX: short-form remote directory listings (like 'ls -C') */
30 30
@@ -181,6 +181,8 @@ main(int argc, char **argv)
181 } 181 }
182 } 182 }
183 183
184 log_init(argv[0], ll, SYSLOG_FACILITY_USER, 1);
185
184 if (sftp_direct == NULL) { 186 if (sftp_direct == NULL) {
185 if (optind == argc || argc > (optind + 2)) 187 if (optind == argc || argc > (optind + 2))
186 usage(); 188 usage();
@@ -210,7 +212,6 @@ main(int argc, char **argv)
210 usage(); 212 usage();
211 } 213 }
212 214
213 log_init(argv[0], ll, SYSLOG_FACILITY_USER, 1);
214 addargs(&args, "-oProtocol %d", sshver); 215 addargs(&args, "-oProtocol %d", sshver);
215 216
216 /* no subsystem if the server-spec contains a '/' */ 217 /* no subsystem if the server-spec contains a '/' */