summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-15 11:08:02 +1100
committerDamien Miller <djm@mindrot.org>2006-03-15 11:08:02 +1100
commit015cd79ac5bbdac513e1a2c14ba4c5226c0a7ae0 (patch)
treeef994bf8510b9b0af8a77a17d1b33b6847b14d89
parente93eaaa0d1e8e6447eeb6f698f7da50ede0cb926 (diff)
- stevesk@cvs.openbsd.org 2006/02/07 01:08:04
[auth-rhosts.c includes.h] move #include <netgroup.h> out of includes.h; ok markus@
-rw-r--r--ChangeLog5
-rw-r--r--auth-rhosts.c6
-rw-r--r--includes.h5
3 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 1a7e9b020..6eaa78879 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
7 - jmc@cvs.openbsd.org 2006/02/06 21:44:47 7 - jmc@cvs.openbsd.org 2006/02/06 21:44:47
8 [ssh.1] 8 [ssh.1]
9 make this a little less ambiguous... 9 make this a little less ambiguous...
10 - stevesk@cvs.openbsd.org 2006/02/07 01:08:04
11 [auth-rhosts.c includes.h]
12 move #include <netgroup.h> out of includes.h; ok markus@
10 13
1120060313 1420060313
12 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) 15 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -3908,4 +3911,4 @@
3908 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3911 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3909 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3912 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3910 3913
3911$Id: ChangeLog,v 1.4141 2006/03/15 00:05:59 djm Exp $ 3914$Id: ChangeLog,v 1.4142 2006/03/15 00:08:02 djm Exp $
diff --git a/auth-rhosts.c b/auth-rhosts.c
index aaba8557e..9748a9457 100644
--- a/auth-rhosts.c
+++ b/auth-rhosts.c
@@ -14,7 +14,11 @@
14 */ 14 */
15 15
16#include "includes.h" 16#include "includes.h"
17RCSID("$OpenBSD: auth-rhosts.c,v 1.33 2005/07/17 07:17:54 djm Exp $"); 17RCSID("$OpenBSD: auth-rhosts.c,v 1.34 2006/02/07 01:08:04 stevesk Exp $");
18
19#ifdef HAVE_NETGROUP_H
20# include <netgroup.h>
21#endif
18 22
19#include "packet.h" 23#include "packet.h"
20#include "uidswap.h" 24#include "uidswap.h"
diff --git a/includes.h b/includes.h
index 520817400..c23f94ce4 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: includes.h,v 1.22 2006/01/01 08:59:27 stevesk Exp $ */ 1/* $OpenBSD: includes.h,v 1.23 2006/02/07 01:08:04 stevesk Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -51,9 +51,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
51 defined(GLOB_HAS_GL_MATCHC) 51 defined(GLOB_HAS_GL_MATCHC)
52# include <glob.h> 52# include <glob.h>
53#endif 53#endif
54#ifdef HAVE_NETGROUP_H
55# include <netgroup.h>
56#endif
57#ifdef HAVE_ENDIAN_H 54#ifdef HAVE_ENDIAN_H
58# include <endian.h> 55# include <endian.h>
59#endif 56#endif