- stevesk@cvs.openbsd.org 2006/07/02 22:45:59

     [groupaccess.c groupaccess.h includes.h session.c sftp-common.c sshpty.c]
     move #include <grp.h> out of includes.h
     (portable needed uidswap.c too)

diff --git a/ChangeLog b/ChangeLog
index dac5767fbbf9ef5daf49a0fb19f022c7f02ce339..132d6fa8942f22c521d3efae45e9c2275e44fd66 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,10 @@
      [gss-serv-krb5.c gss-serv.c]
      no "servconf.h" needed here
      (gss-serv-krb5.c change not applied, portable needs the server options)
+   - stevesk@cvs.openbsd.org 2006/07/02 22:45:59
+     [groupaccess.c groupaccess.h includes.h session.c sftp-common.c sshpty.c]
+     move #include <grp.h> out of includes.h
+     (portable needed uidswap.c too)
 
 20060706
  - (dtucker) [configure.ac] Try AIX blibpath test in different order when

diff --git a/groupaccess.c b/groupaccess.c
index 2a85cb3756af3d5c614eefafd0e0c30987a59fa1..2b7117b70d5a5eac6ed85ece6e6e3a85d9042b64 100644 (file)
--- a/groupaccess.c
+++ b/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/groupaccess.h b/groupaccess.h
index 2bde125c2b890315a720fae51c81f9deb5c7a49a..b0baccfbf7ac293464ca3eb95e8df38d6bbba230 100644 (file)
--- a/groupaccess.h
+++ b/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/includes.h b/includes.h
index c038f410e6af6a95f16e59413b6cfe240ba7684f..3953d91a98f71576bde011a11fde01e0765939aa 100644 (file)
--- a/includes.h
+++ b/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>

diff --git a/session.c b/session.c
index 87e7ee6e310208a62629ae85c61f402ad625092c..3bc3651e5a8018390b964eecf234ef4d1758eb8f 100644 (file)
--- a/session.c
+++ b/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
@@ -42,6 +42,7 @@
 #include <sys/wait.h>
 #include <sys/un.h>
 
+#include <grp.h>
 #ifdef HAVE_PATHS_H
 #include <paths.h>
 #endif

diff --git a/sftp-common.c b/sftp-common.c
index 2e680e9f3e5d69b90f6e3d6ccb063344e29dcf77..8c794a05f858eff1a622dfe03310f520ba5bf609 100644 (file)
--- a/sftp-common.c
+++ b/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/sshpty.c b/sshpty.c
index 0e49e9a1696337b0e1a3f2b96fbc702cfba7d23f..92f86e7a10be51dee64c8008456de904a7f6f4c9 100644 (file)
--- a/sshpty.c
+++ b/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
@@ -19,6 +19,7 @@
 #include <sys/stat.h>
 #include <signal.h>
 
+#include <grp.h>
 #ifdef HAVE_PATHS_H
 # include <paths.h>
 #endif

diff --git a/uidswap.c b/uidswap.c
index e5b0595ac0651d12fe4e2084dccf505a24e87798..32441828d85870f2adb3314cc9ce10be27e2cfbc 100644 (file)
--- a/uidswap.c
+++ b/uidswap.c
@@ -14,6 +14,8 @@
 
 #include "includes.h"
 
+#include <grp.h>
+
 #include "log.h"
 #include "uidswap.h"
 #include "xmalloc.h"