summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--groupaccess.c6
-rw-r--r--groupaccess.h4
-rw-r--r--includes.h2
-rw-r--r--session.c3
-rw-r--r--sftp-common.c4
-rw-r--r--sshpty.c3
-rw-r--r--uidswap.c2
8 files changed, 22 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 830c39487..e2c585fc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,10 @@
16 [gss-serv-krb5.c gss-serv.c] 16 [gss-serv-krb5.c gss-serv.c]
17 no "servconf.h" needed here 17 no "servconf.h" needed here
18 (gss-serv-krb5.c change not applied, portable needs the server options) 18 (gss-serv-krb5.c change not applied, portable needs the server options)
19 - stevesk@cvs.openbsd.org 2006/07/02 22:45:59
20 [groupaccess.c groupaccess.h includes.h session.c sftp-common.c sshpty.c]
21 move #include <grp.h> out of includes.h
22 (portable needed uidswap.c too)
19 23
2020060706 2420060706
21 - (dtucker) [configure.ac] Try AIX blibpath test in different order when 25 - (dtucker) [configure.ac] Try AIX blibpath test in different order when
@@ -4749,4 +4753,4 @@
4749 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4753 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4750 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4754 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4751 4755
4752$Id: ChangeLog,v 1.4363 2006/07/10 10:17:55 djm Exp $ 4756$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 @@
1/* $OpenBSD: groupaccess.c,v 1.8 2006/03/25 13:17:01 djm Exp $ */ 1/* $OpenBSD: groupaccess.c,v 1.9 2006/07/02 22:45:59 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Kevin Steves. All rights reserved. 3 * Copyright (c) 2001 Kevin Steves. All rights reserved.
4 * 4 *
@@ -25,6 +25,10 @@
25 25
26#include "includes.h" 26#include "includes.h"
27 27
28#include <sys/types.h>
29
30#include <grp.h>
31
28#include "groupaccess.h" 32#include "groupaccess.h"
29#include "xmalloc.h" 33#include "xmalloc.h"
30#include "match.h" 34#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 @@
1/* $OpenBSD: groupaccess.h,v 1.5 2006/03/25 22:22:43 djm Exp $ */ 1/* $OpenBSD: groupaccess.h,v 1.6 2006/07/02 22:45:59 stevesk Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2001 Kevin Steves. All rights reserved. 4 * Copyright (c) 2001 Kevin Steves. All rights reserved.
@@ -27,7 +27,7 @@
27#ifndef GROUPACCESS_H 27#ifndef GROUPACCESS_H
28#define GROUPACCESS_H 28#define GROUPACCESS_H
29 29
30#include <grp.h> 30#include <sys/types.h>
31 31
32int ga_init(const char *, gid_t); 32int ga_init(const char *, gid_t);
33int ga_match(char * const *, int); 33int 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 @@
1/* $OpenBSD: includes.h,v 1.40 2006/04/20 21:53:44 djm Exp $ */ 1/* $OpenBSD: includes.h,v 1.41 2006/07/02 22:45:59 stevesk Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
diff --git a/session.c b/session.c
index 87e7ee6e3..3bc3651e5 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: session.c,v 1.203 2006/04/20 21:53:44 djm Exp $ */ 1/* $OpenBSD: session.c,v 1.204 2006/07/02 22:45:59 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved 4 * All rights reserved
@@ -42,6 +42,7 @@
42#include <sys/wait.h> 42#include <sys/wait.h>
43#include <sys/un.h> 43#include <sys/un.h>
44 44
45#include <grp.h>
45#ifdef HAVE_PATHS_H 46#ifdef HAVE_PATHS_H
46#include <paths.h> 47#include <paths.h>
47#endif 48#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 @@
1/* $OpenBSD: sftp-common.c,v 1.13 2006/03/25 13:17:02 djm Exp $ */ 1/* $OpenBSD: sftp-common.c,v 1.14 2006/07/02 22:45:59 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2001 Markus Friedl. All rights reserved.
4 * Copyright (c) 2001 Damien Miller. All rights reserved. 4 * Copyright (c) 2001 Damien Miller. All rights reserved.
@@ -29,6 +29,8 @@
29#include <sys/types.h> 29#include <sys/types.h>
30#include <sys/stat.h> 30#include <sys/stat.h>
31 31
32#include <grp.h>
33
32#include "buffer.h" 34#include "buffer.h"
33#include "bufaux.h" 35#include "bufaux.h"
34#include "log.h" 36#include "log.h"
diff --git a/sshpty.c b/sshpty.c
index 0e49e9a16..92f86e7a1 100644
--- a/sshpty.c
+++ b/sshpty.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshpty.c,v 1.19 2006/03/25 13:17:03 djm Exp $ */ 1/* $OpenBSD: sshpty.c,v 1.20 2006/07/02 22:45:59 stevesk 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
@@ -19,6 +19,7 @@
19#include <sys/stat.h> 19#include <sys/stat.h>
20#include <signal.h> 20#include <signal.h>
21 21
22#include <grp.h>
22#ifdef HAVE_PATHS_H 23#ifdef HAVE_PATHS_H
23# include <paths.h> 24# include <paths.h>
24#endif 25#endif
diff --git a/uidswap.c b/uidswap.c
index e5b0595ac..32441828d 100644
--- a/uidswap.c
+++ b/uidswap.c
@@ -14,6 +14,8 @@
14 14
15#include "includes.h" 15#include "includes.h"
16 16
17#include <grp.h>
18
17#include "log.h" 19#include "log.h"
18#include "uidswap.h" 20#include "uidswap.h"
19#include "xmalloc.h" 21#include "xmalloc.h"