diff options
author | Damien Miller <djm@mindrot.org> | 2006-08-05 12:39:39 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-08-05 12:39:39 +1000 |
commit | d783435315d8e604998925d5e47b663a500ed252 (patch) | |
tree | 510a72c4fa0a6cbb51c24bad2bc6d6e7f329db94 /sftp-server.c | |
parent | 4dec5d75daab22c31f6f67d9e83594076ae3eda7 (diff) |
- deraadt@cvs.openbsd.org 2006/08/03 03:34:42
[OVERVIEW atomicio.c atomicio.h auth-bsdauth.c auth-chall.c auth-krb5.c]
[auth-options.c auth-options.h auth-passwd.c auth-rh-rsa.c auth-rhosts.c]
[auth-rsa.c auth-skey.c auth.c auth.h auth1.c auth2-chall.c auth2-gss.c]
[auth2-hostbased.c auth2-kbdint.c auth2-none.c auth2-passwd.c ]
[auth2-pubkey.c auth2.c authfd.c authfd.h authfile.c bufaux.c bufbn.c]
[buffer.c buffer.h canohost.c channels.c channels.h cipher-3des1.c]
[cipher-bf1.c cipher-ctr.c cipher.c cleanup.c clientloop.c compat.c]
[compress.c deattack.c dh.c dispatch.c dns.c dns.h fatal.c groupaccess.c]
[groupaccess.h gss-genr.c gss-serv-krb5.c gss-serv.c hostfile.c kex.c]
[kex.h kexdh.c kexdhc.c kexdhs.c kexgex.c kexgexc.c kexgexs.c key.c]
[key.h log.c log.h mac.c match.c md-sha256.c misc.c misc.h moduli.c]
[monitor.c monitor_fdpass.c monitor_mm.c monitor_mm.h monitor_wrap.c]
[monitor_wrap.h msg.c nchan.c packet.c progressmeter.c readconf.c]
[readconf.h readpass.c rsa.c scard.c scard.h scp.c servconf.c servconf.h]
[serverloop.c session.c session.h sftp-client.c sftp-common.c]
[sftp-common.h sftp-glob.c sftp-server.c sftp.c ssh-add.c ssh-agent.c]
[ssh-dss.c ssh-gss.h ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rsa.c]
[ssh.c ssh.h sshconnect.c sshconnect.h sshconnect1.c sshconnect2.c]
[sshd.c sshlogin.c sshlogin.h sshpty.c sshpty.h sshtty.c ttymodes.c]
[uidswap.c uidswap.h uuencode.c uuencode.h xmalloc.c xmalloc.h]
[loginrec.c loginrec.h openbsd-compat/port-aix.c openbsd-compat/port-tun.h]
almost entirely get rid of the culture of ".h files that include .h files"
ok djm, sort of ok stevesk
makes the pain stop in one easy step
NB. portable commit contains everything *except* removing includes.h, as
that will take a fair bit more work as we move headers that are required
for portability workarounds to defines.h. (also, this step wasn't "easy")
Diffstat (limited to 'sftp-server.c')
-rw-r--r-- | sftp-server.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sftp-server.c b/sftp-server.c index c0839782d..c57958b0f 100644 --- a/sftp-server.c +++ b/sftp-server.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp-server.c,v 1.69 2006/08/01 23:22:47 stevesk Exp $ */ | 1 | /* $OpenBSD: sftp-server.c,v 1.70 2006/08/03 03:34:42 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -14,6 +14,7 @@ | |||
14 | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | 14 | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
15 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | */ | 16 | */ |
17 | |||
17 | #include "includes.h" | 18 | #include "includes.h" |
18 | 19 | ||
19 | #include <sys/types.h> | 20 | #include <sys/types.h> |
@@ -30,13 +31,14 @@ | |||
30 | #include <stdlib.h> | 31 | #include <stdlib.h> |
31 | #include <stdio.h> | 32 | #include <stdio.h> |
32 | #include <string.h> | 33 | #include <string.h> |
34 | #include <pwd.h> | ||
33 | #include <time.h> | 35 | #include <time.h> |
34 | #include <unistd.h> | 36 | #include <unistd.h> |
37 | #include <stdarg.h> | ||
35 | 38 | ||
39 | #include "xmalloc.h" | ||
36 | #include "buffer.h" | 40 | #include "buffer.h" |
37 | #include "bufaux.h" | ||
38 | #include "log.h" | 41 | #include "log.h" |
39 | #include "xmalloc.h" | ||
40 | #include "misc.h" | 42 | #include "misc.h" |
41 | #include "uidswap.h" | 43 | #include "uidswap.h" |
42 | 44 | ||
@@ -135,7 +137,7 @@ string_from_portable(int pflags) | |||
135 | #define PAPPEND(str) { \ | 137 | #define PAPPEND(str) { \ |
136 | if (*ret != '\0') \ | 138 | if (*ret != '\0') \ |
137 | strlcat(ret, ",", sizeof(ret)); \ | 139 | strlcat(ret, ",", sizeof(ret)); \ |
138 | strlcat(ret, str, sizeof(ret)); \ | 140 | strlcat(ret, str, sizeof(ret)); \ |
139 | } | 141 | } |
140 | 142 | ||
141 | if (pflags & SSH2_FXF_READ) | 143 | if (pflags & SSH2_FXF_READ) |
@@ -1225,7 +1227,7 @@ main(int argc, char **argv) | |||
1225 | case 'c': | 1227 | case 'c': |
1226 | /* | 1228 | /* |
1227 | * Ignore all arguments if we are invoked as a | 1229 | * Ignore all arguments if we are invoked as a |
1228 | * shell using "sftp-server -c command" | 1230 | * shell using "sftp-server -c command" |
1229 | */ | 1231 | */ |
1230 | skipargs = 1; | 1232 | skipargs = 1; |
1231 | break; | 1233 | break; |