summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-07-24 13:55:56 +1000
committerDamien Miller <djm@mindrot.org>2006-07-24 13:55:56 +1000
commitdef915b0ff0228254da4b2f2442bab16aba414d4 (patch)
tree3827c44af93b070878fb8cd381654119150e4502
parent2d00e63cb889a3b23b6d443ecb0921e34fb0a934 (diff)
- stevesk@cvs.openbsd.org 2006/07/14 01:15:28
[monitor_wrap.h] don't need incompletely-typed 'struct passwd' now with #include <pwd.h>; ok markus@
-rw-r--r--ChangeLog6
-rw-r--r--monitor_wrap.h3
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b4dbb2b28..12fa3c6e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,10 @@
12 - stevesk@cvs.openbsd.org 2006/07/12 22:42:32 12 - stevesk@cvs.openbsd.org 2006/07/12 22:42:32
13 [includes.h ssh.c ssh-rand-helper.c] 13 [includes.h ssh.c ssh-rand-helper.c]
14 move #include <stddef.h> out of includes.h 14 move #include <stddef.h> out of includes.h
15 - stevesk@cvs.openbsd.org 2006/07/14 01:15:28
16 [monitor_wrap.h]
17 don't need incompletely-typed 'struct passwd' now with
18 #include <pwd.h>; ok markus@
15 19
1620060713 2020060713
17 - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h 21 - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h
@@ -4930,4 +4934,4 @@
4930 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4934 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4931 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4935 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4932 4936
4933$Id: ChangeLog,v 1.4411 2006/07/24 03:53:19 djm Exp $ 4937$Id: ChangeLog,v 1.4412 2006/07/24 03:55:56 djm Exp $
diff --git a/monitor_wrap.h b/monitor_wrap.h
index 4366b8ed0..fd5cccd08 100644
--- a/monitor_wrap.h
+++ b/monitor_wrap.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor_wrap.h,v 1.18 2006/07/06 17:36:37 stevesk Exp $ */ 1/* $OpenBSD: monitor_wrap.h,v 1.19 2006/07/14 01:15:28 stevesk Exp $ */
2 2
3/* 3/*
4 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 4 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
@@ -42,7 +42,6 @@ enum mm_keytype {MM_NOKEY, MM_HOSTKEY, MM_USERKEY, MM_RSAHOSTKEY, MM_RSAUSERKEY}
42 42
43struct monitor; 43struct monitor;
44struct mm_master; 44struct mm_master;
45struct passwd;
46struct Authctxt; 45struct Authctxt;
47 46
48int mm_is_monitor(void); 47int mm_is_monitor(void);