diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:38:40 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:38:40 +0000 |
commit | 1b816ea846aca3ee89e7995373ace609e9518424 (patch) | |
tree | b41cdc8495cae7fa9c2e0f98a5f2e71656b61f9a /sftp-common.c | |
parent | fa585019a79ebcb4e0202b1c33f87ff1c5c9ce1c (diff) | |
parent | 086ea76990b1e6287c24b6db74adffd4605eb3b0 (diff) |
import openssh-4.6p1-gsskex-20070312.patch
Diffstat (limited to 'sftp-common.c')
-rw-r--r-- | sftp-common.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/sftp-common.c b/sftp-common.c index 4cea3c305..7ebadcc53 100644 --- a/sftp-common.c +++ b/sftp-common.c | |||
@@ -1,3 +1,4 @@ | |||
1 | /* $OpenBSD: sftp-common.c,v 1.20 2006/08/03 03:34:42 deraadt Exp $ */ | ||
1 | /* | 2 | /* |
2 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
3 | * Copyright (c) 2001 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2001 Damien Miller. All rights reserved. |
@@ -24,12 +25,21 @@ | |||
24 | */ | 25 | */ |
25 | 26 | ||
26 | #include "includes.h" | 27 | #include "includes.h" |
27 | RCSID("$OpenBSD: sftp-common.c,v 1.10 2003/11/10 16:23:41 jakob Exp $"); | ||
28 | 28 | ||
29 | #include <sys/types.h> | ||
30 | #include <sys/stat.h> | ||
31 | #include <sys/param.h> | ||
32 | |||
33 | #include <grp.h> | ||
34 | #include <pwd.h> | ||
35 | #include <stdio.h> | ||
36 | #include <string.h> | ||
37 | #include <time.h> | ||
38 | #include <stdarg.h> | ||
39 | |||
40 | #include "xmalloc.h" | ||
29 | #include "buffer.h" | 41 | #include "buffer.h" |
30 | #include "bufaux.h" | ||
31 | #include "log.h" | 42 | #include "log.h" |
32 | #include "xmalloc.h" | ||
33 | 43 | ||
34 | #include "sftp.h" | 44 | #include "sftp.h" |
35 | #include "sftp-common.h" | 45 | #include "sftp-common.h" |