diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | groupaccess.c | 6 | ||||
-rw-r--r-- | groupaccess.h | 4 | ||||
-rw-r--r-- | includes.h | 2 | ||||
-rw-r--r-- | session.c | 3 | ||||
-rw-r--r-- | sftp-common.c | 4 | ||||
-rw-r--r-- | sshpty.c | 3 | ||||
-rw-r--r-- | uidswap.c | 2 |
8 files changed, 22 insertions, 8 deletions
@@ -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 @@ -4749,4 +4753,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.4363 2006/07/10 10:17:55 djm Exp $ +$Id: ChangeLog,v 1.4364 2006/07/10 10:20:33 djm Exp $ diff --git a/groupaccess.c b/groupaccess.c index 2a85cb375..2b7117b70 100644 --- 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 2bde125c2..b0baccfbf 100644 --- 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 c038f410e..3953d91a9 100644 --- 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> @@ -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 2e680e9f3..8c794a05f 100644 --- 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" @@ -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 @@ -14,6 +14,8 @@ #include "includes.h" +#include <grp.h> + #include "log.h" #include "uidswap.h" #include "xmalloc.h" |