From d3d067ecfaf14fd0698551a8fc2c905aae180380 Mon Sep 17 00:00:00 2001
From: Kevin Steves <stevesk@cvs.openbsd.org>
Date: Sun, 2 Jul 2006 22:46:00 +0000
Subject: move #include <grp.h> out of includes.h

---
 usr.bin/ssh/groupaccess.c | 6 +++++-
 usr.bin/ssh/groupaccess.h | 4 ++--
 usr.bin/ssh/includes.h    | 3 +--
 usr.bin/ssh/session.c     | 3 ++-
 usr.bin/ssh/sftp-common.c | 4 +++-
 usr.bin/ssh/sshpty.c      | 3 ++-
 6 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'usr.bin')

diff --git a/usr.bin/ssh/groupaccess.c b/usr.bin/ssh/groupaccess.c
index ecb8ff3dc4e..3628ebdc2ab 100644
--- a/usr.bin/ssh/groupaccess.c
+++ b/usr.bin/ssh/groupaccess.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: groupaccess.c,v 1.8 2006/03/25 13:17:01 djm Exp $ */
+/* $OpenBSD: groupaccess.c,v 1.9 2006/07/02 22:45:59 stevesk Exp $ */
 /*
  * Copyright (c) 2001 Kevin Steves.  All rights reserved.
  *
@@ -25,6 +25,10 @@
 
 #include "includes.h"
 
+#include <sys/types.h>
+
+#include <grp.h>
+
 #include "groupaccess.h"
 #include "xmalloc.h"
 #include "match.h"
diff --git a/usr.bin/ssh/groupaccess.h b/usr.bin/ssh/groupaccess.h
index 2bde125c2b8..b0baccfbf7a 100644
--- a/usr.bin/ssh/groupaccess.h
+++ b/usr.bin/ssh/groupaccess.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: groupaccess.h,v 1.5 2006/03/25 22:22:43 djm Exp $ */
+/* $OpenBSD: groupaccess.h,v 1.6 2006/07/02 22:45:59 stevesk Exp $ */
 
 /*
  * Copyright (c) 2001 Kevin Steves.  All rights reserved.
@@ -27,7 +27,7 @@
 #ifndef GROUPACCESS_H
 #define GROUPACCESS_H
 
-#include <grp.h>
+#include <sys/types.h>
 
 int	 ga_init(const char *, gid_t);
 int	 ga_match(char * const *, int);
diff --git a/usr.bin/ssh/includes.h b/usr.bin/ssh/includes.h
index 7b0fcb5d0a7..23ba6fb997a 100644
--- a/usr.bin/ssh/includes.h
+++ b/usr.bin/ssh/includes.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: includes.h,v 1.40 2006/04/20 21:53:44 djm Exp $ */
+/* $OpenBSD: includes.h,v 1.41 2006/07/02 22:45:59 stevesk Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -33,7 +33,6 @@
 #include <string.h>
 #include <stdarg.h>
 #include <pwd.h>
-#include <grp.h>
 #include <unistd.h>
 #include <time.h>
 
diff --git a/usr.bin/ssh/session.c b/usr.bin/ssh/session.c
index faf70dd4b0c..5871699259f 100644
--- a/usr.bin/ssh/session.c
+++ b/usr.bin/ssh/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.203 2006/04/20 21:53:44 djm Exp $ */
+/* $OpenBSD: session.c,v 1.204 2006/07/02 22:45:59 stevesk Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -40,6 +40,7 @@
 #include <sys/un.h>
 #include <sys/stat.h>
 
+#include <grp.h>
 #include <paths.h>
 #include <signal.h>
 
diff --git a/usr.bin/ssh/sftp-common.c b/usr.bin/ssh/sftp-common.c
index 2e680e9f3e5..8c794a05f85 100644
--- a/usr.bin/ssh/sftp-common.c
+++ b/usr.bin/ssh/sftp-common.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-common.c,v 1.13 2006/03/25 13:17:02 djm Exp $ */
+/* $OpenBSD: sftp-common.c,v 1.14 2006/07/02 22:45:59 stevesk Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2001 Damien Miller.  All rights reserved.
@@ -29,6 +29,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#include <grp.h>
+
 #include "buffer.h"
 #include "bufaux.h"
 #include "log.h"
diff --git a/usr.bin/ssh/sshpty.c b/usr.bin/ssh/sshpty.c
index 72c303ed574..37c7acbf7ad 100644
--- a/usr.bin/ssh/sshpty.c
+++ b/usr.bin/ssh/sshpty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshpty.c,v 1.19 2006/03/25 13:17:03 djm Exp $ */
+/* $OpenBSD: sshpty.c,v 1.20 2006/07/02 22:45:59 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -18,6 +18,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#include <grp.h>
 #include <paths.h>
 #include <termios.h>
 #include <util.h>
-- 
cgit v1.2.3