summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-06-14 09:01:24 +1000
committerDarren Tucker <dtucker@zip.com.au>2008-06-14 09:01:24 +1000
commitd9526a5e96e4515afec28df42b13d08bd02f754a (patch)
tree2077d0054b8891a6faf68e46427b345ed904be54
parentf2c16d30b456c3b149999e91d16bf28f82197d3f (diff)
- dtucker@cvs.openbsd.org 2008/06/13 14:18:51
[auth2-pubkey.c auth-rhosts.c] Include unistd.h for close(), prevents warnings in -portable
-rw-r--r--ChangeLog5
-rw-r--r--auth-rhosts.c3
-rw-r--r--auth2-pubkey.c3
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 362febe67..8b18aea38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
9 applying additional restrictions to non-pubkey authentications in 9 applying additional restrictions to non-pubkey authentications in
10 the case where pubkey fails but another method subsequently succeeds. 10 the case where pubkey fails but another method subsequently succeeds.
11 bz #1472, found by Colin Watson, ok markus@ djm@ 11 bz #1472, found by Colin Watson, ok markus@ djm@
12 - dtucker@cvs.openbsd.org 2008/06/13 14:18:51
13 [auth2-pubkey.c auth-rhosts.c]
14 Include unistd.h for close(), prevents warnings in -portable
12 15
1320080612 1620080612
14 - (dtucker) OpenBSD CVS Sync 17 - (dtucker) OpenBSD CVS Sync
@@ -4347,4 +4350,4 @@
4347 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4350 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4348 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4351 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4349 4352
4350$Id: ChangeLog,v 1.5005 2008/06/13 22:59:49 dtucker Exp $ 4353$Id: ChangeLog,v 1.5006 2008/06/13 23:01:24 dtucker Exp $
diff --git a/auth-rhosts.c b/auth-rhosts.c
index bbddfb6df..5c1296701 100644
--- a/auth-rhosts.c
+++ b/auth-rhosts.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth-rhosts.c,v 1.42 2008/06/13 04:40:22 djm Exp $ */ 1/* $OpenBSD: auth-rhosts.c,v 1.43 2008/06/13 14:18:51 dtucker Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -27,6 +27,7 @@
27#include <string.h> 27#include <string.h>
28#include <stdarg.h> 28#include <stdarg.h>
29#include <fcntl.h> 29#include <fcntl.h>
30#include <unistd.h>
30 31
31#include "packet.h" 32#include "packet.h"
32#include "buffer.h" 33#include "buffer.h"
diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index 7f7ddd8cf..306515000 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2-pubkey.c,v 1.16 2008/06/13 04:40:22 djm Exp $ */ 1/* $OpenBSD: auth2-pubkey.c,v 1.17 2008/06/13 14:18:51 dtucker Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -32,6 +32,7 @@
32#include <pwd.h> 32#include <pwd.h>
33#include <stdio.h> 33#include <stdio.h>
34#include <stdarg.h> 34#include <stdarg.h>
35#include <unistd.h>
35 36
36#include "xmalloc.h" 37#include "xmalloc.h"
37#include "ssh.h" 38#include "ssh.h"