summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2007-01-05 16:30:41 +1100
committerDamien Miller <djm@mindrot.org>2007-01-05 16:30:41 +1100
commitb6c85fcf37299e5c997a92f9aa39726aa6f34318 (patch)
tree1909ccd721c5734b7c3b30ff5ee3ca9a626b1f26
parent80163907edd6a3c7c8de7a40ab9803528cd3acb7 (diff)
- stevesk@cvs.openbsd.org 2007/01/03 04:09:15
[sftp.c] ARGSUSED for lint
-rw-r--r--ChangeLog5
-rw-r--r--sftp.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 30d73c556..42ddf779a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,9 @@
35 - stevesk@cvs.openbsd.org 2007/01/03 03:01:40 35 - stevesk@cvs.openbsd.org 2007/01/03 03:01:40
36 [auth2-chall.c channels.c dns.c sftp.c ssh-keygen.c ssh.c] 36 [auth2-chall.c channels.c dns.c sftp.c ssh-keygen.c ssh.c]
37 spaces 37 spaces
38 - stevesk@cvs.openbsd.org 2007/01/03 04:09:15
39 [sftp.c]
40 ARGSUSED for lint
38 41
3920061205 4220061205
40 - (djm) [auth.c] Fix NULL pointer dereference in fakepw(). Crash would 43 - (djm) [auth.c] Fix NULL pointer dereference in fakepw(). Crash would
@@ -2655,4 +2658,4 @@
2655 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2658 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2656 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2659 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2657 2660
2658$Id: ChangeLog,v 1.4600 2007/01/05 05:30:16 djm Exp $ 2661$Id: ChangeLog,v 1.4601 2007/01/05 05:30:41 djm Exp $
diff --git a/sftp.c b/sftp.c
index c54333d82..f0d5dd557 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp.c,v 1.95 2007/01/03 03:01:40 stevesk Exp $ */ 1/* $OpenBSD: sftp.c,v 1.96 2007/01/03 04:09:15 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -166,6 +166,7 @@ static const struct CMD cmds[] = {
166 166
167int interactive_loop(int fd_in, int fd_out, char *file1, char *file2); 167int interactive_loop(int fd_in, int fd_out, char *file1, char *file2);
168 168
169/* ARGSUSED */
169static void 170static void
170killchild(int signo) 171killchild(int signo)
171{ 172{
@@ -177,6 +178,7 @@ killchild(int signo)
177 _exit(1); 178 _exit(1);
178} 179}
179 180
181/* ARGSUSED */
180static void 182static void
181cmd_interrupt(int signo) 183cmd_interrupt(int signo)
182{ 184{