diff options
| author | des <des@FreeBSD.org> | 2006-09-30 13:38:06 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2006-09-30 13:38:06 +0000 |
| commit | 4ff234ef46a16b6174dfb970b7bbc9fe2baf3e1a (patch) | |
| tree | e8ca9ffe5bcb164be41a74f30a765b86bb38c885 /crypto/openssh/loginrec.c | |
| parent | 1a954502d4f34f44a7b1d861ea2dadc117ca6a64 (diff) | |
| download | FreeBSD-src-4ff234ef46a16b6174dfb970b7bbc9fe2baf3e1a.zip FreeBSD-src-4ff234ef46a16b6174dfb970b7bbc9fe2baf3e1a.tar.gz | |
Merge conflicts.
MFC after: 1 week
Diffstat (limited to 'crypto/openssh/loginrec.c')
| -rw-r--r-- | crypto/openssh/loginrec.c | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/crypto/openssh/loginrec.c b/crypto/openssh/loginrec.c index ddd22ed..1d5907a 100644 --- a/crypto/openssh/loginrec.c +++ b/crypto/openssh/loginrec.c @@ -146,9 +146,28 @@ */ #include "includes.h" +__RCSID("$FreeBSD$"); + +#include <sys/types.h> +#include <sys/stat.h> +#include <sys/socket.h> + +#include <netinet/in.h> + +#include <errno.h> +#include <fcntl.h> +#ifdef HAVE_PATHS_H +# include <paths.h> +#endif +#include <pwd.h> +#include <stdarg.h> +#include <string.h> +#include <unistd.h> -#include "ssh.h" #include "xmalloc.h" +#include "key.h" +#include "hostfile.h" +#include "ssh.h" #include "loginrec.h" #include "log.h" #include "atomicio.h" @@ -165,9 +184,6 @@ # include <libutil.h> #endif -RCSID("$Id: loginrec.c,v 1.71 2005/11/22 08:55:13 dtucker Exp $"); -RCSID("$FreeBSD$"); - /** ** prototypes for helper functions in this file **/ |
