mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-11-23 18:23:25 +08:00
- (djm) [loginrec.c ssh-rand-helper.c sshd.c openbsd-compat/glob.c]
[openbsd-compat/mktemp.c openbsd-compat/openbsd-compat.h] [openbsd-compat/port-tun.c openbsd-compat/readpassphrase.c] [openbsd-compat/xcrypt.c] Fix includes.h fallout, mainly fcntl.h
This commit is contained in:
parent
6444fe996b
commit
a1738e4c65
@ -83,6 +83,10 @@
|
||||
- djm@cvs.openbsd.org 2006/07/10 11:25:53
|
||||
[sftp-server.c]
|
||||
don't log variables that aren't yet set
|
||||
- (djm) [loginrec.c ssh-rand-helper.c sshd.c openbsd-compat/glob.c]
|
||||
[openbsd-compat/mktemp.c openbsd-compat/openbsd-compat.h]
|
||||
[openbsd-compat/port-tun.c openbsd-compat/readpassphrase.c]
|
||||
[openbsd-compat/xcrypt.c] Fix includes.h fallout, mainly fcntl.h
|
||||
|
||||
20060706
|
||||
- (dtucker) [configure.ac] Try AIX blibpath test in different order when
|
||||
@ -4816,4 +4820,4 @@
|
||||
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
|
||||
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
|
||||
|
||||
$Id: ChangeLog,v 1.4380 2006/07/10 11:31:27 djm Exp $
|
||||
$Id: ChangeLog,v 1.4381 2006/07/10 11:33:04 djm Exp $
|
||||
|
@ -153,6 +153,7 @@
|
||||
|
||||
#include <netinet/in.h>
|
||||
|
||||
#include <fcntl.h>
|
||||
#include <pwd.h>
|
||||
|
||||
#include "ssh.h"
|
||||
|
@ -38,6 +38,7 @@
|
||||
#include <sys/stat.h>
|
||||
#include <dirent.h>
|
||||
#include <ctype.h>
|
||||
#include <pwd.h>
|
||||
|
||||
static long
|
||||
get_arg_max(void)
|
||||
|
@ -37,6 +37,7 @@
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#if !defined(HAVE_MKDTEMP) || defined(HAVE_STRICT_MKSTEMP)
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $Id: openbsd-compat.h,v 1.37 2006/06/30 00:51:32 dtucker Exp $ */
|
||||
/* $Id: openbsd-compat.h,v 1.38 2006/07/10 11:33:05 djm Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1999-2003 Damien Miller. All rights reserved.
|
||||
@ -31,6 +31,9 @@
|
||||
|
||||
#include "includes.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <pwd.h>
|
||||
|
||||
/* OpenBSD function replacements */
|
||||
#include "base64.h"
|
||||
#include "sigact.h"
|
||||
@ -131,8 +134,6 @@ int BSDgetopt(int argc, char * const *argv, const char *opts);
|
||||
#include "bsd-misc.h"
|
||||
#include "bsd-waitpid.h"
|
||||
|
||||
/*#include <sys/types.h> XXX Still needed? * For uid_t, gid_t * */
|
||||
|
||||
#ifndef HAVE_GETPEEREID
|
||||
int getpeereid(int , uid_t *, gid_t *);
|
||||
#endif
|
||||
@ -177,7 +178,6 @@ void *xmmap(size_t size);
|
||||
char *xcrypt(const char *password, const char *salt);
|
||||
char *shadow_pw(struct passwd *pw);
|
||||
|
||||
|
||||
/* rfc2553 socket API replacements */
|
||||
#include "fake-rfc2553.h"
|
||||
|
||||
|
@ -16,9 +16,12 @@
|
||||
|
||||
#include "includes.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <netinet/ip.h>
|
||||
|
||||
#include <fcntl.h>
|
||||
|
||||
#include "log.h"
|
||||
#include "misc.h"
|
||||
#include "bufaux.h"
|
||||
|
@ -29,6 +29,7 @@
|
||||
#include <termios.h>
|
||||
#include <signal.h>
|
||||
#include <ctype.h>
|
||||
#include <fcntl.h>
|
||||
#include <readpassphrase.h>
|
||||
|
||||
#ifdef TCSASOFT
|
||||
|
@ -24,6 +24,9 @@
|
||||
|
||||
#include "includes.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <pwd.h>
|
||||
|
||||
# ifdef HAVE_CRYPT_H
|
||||
# include <crypt.h>
|
||||
# endif
|
||||
|
@ -36,6 +36,7 @@
|
||||
# include <sys/un.h>
|
||||
#endif
|
||||
|
||||
#include <fcntl.h>
|
||||
#include <pwd.h>
|
||||
#include <signal.h>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user