Include file order must be "monitor.h" before "extern.h" otherwise enum

auth_ret is referenced before it is declared, which is not allowed by C99.

Ok krw@, millert@, gilles@

6 files changed, 19 insertions, 13 deletions

diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y
index b8f4f7afe07..3fe95bbc392 100644
--- a/libexec/ftpd/ftpcmd.y
+++ b/libexec/ftpd/ftpcmd.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ftpcmd.y,v 1.49 2006/04/21 17:42:50 deraadt Exp $	*/
+/*	$OpenBSD: ftpcmd.y,v 1.50 2008/06/30 12:03:51 ragge Exp $	*/
 /*	$NetBSD: ftpcmd.y,v 1.7 1996/04/08 19:03:11 jtc Exp $	*/
 
 /*
@@ -44,7 +44,7 @@
 static const char sccsid[] = "@(#)ftpcmd.y	8.3 (Berkeley) 4/6/94";
 #else
 static const char rcsid[] =
-    "$OpenBSD: ftpcmd.y,v 1.49 2006/04/21 17:42:50 deraadt Exp $";
+    "$OpenBSD: ftpcmd.y,v 1.50 2008/06/30 12:03:51 ragge Exp $";
 #endif
 #endif /* not lint */
 
@@ -69,8 +69,8 @@ static const char rcsid[] =
 #include <unistd.h>
 #include <netdb.h>
 
-#include "extern.h"
 #include "monitor.h"
+#include "extern.h"
 
 extern	union sockunion data_dest;
 extern	int logged_in;
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 3a7c224010f..ad1f3bcb7da 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ftpd.c,v 1.182 2008/04/13 00:22:16 djm Exp $	*/
+/*	$OpenBSD: ftpd.c,v 1.183 2008/06/30 12:03:51 ragge Exp $	*/
 /*	$NetBSD: ftpd.c,v 1.15 1995/06/03 22:46:47 mycroft Exp $	*/
 
 /*
@@ -70,7 +70,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)ftpd.c	8.4 (Berkeley) 4/16/94";
 #else
 static const char rcsid[] =
-    "$OpenBSD: ftpd.c,v 1.182 2008/04/13 00:22:16 djm Exp $";
+    "$OpenBSD: ftpd.c,v 1.183 2008/06/30 12:03:51 ragge Exp $";
 #endif
 #endif /* not lint */
 
@@ -122,8 +122,8 @@ static const char rcsid[] =
 #endif	/* TCPWRAPPERS */
 
 #include "pathnames.h"
-#include "extern.h"
 #include "monitor.h"
+#include "extern.h"
 
 extern	off_t restart_point;
 extern	char cbuf[];
diff --git a/libexec/ftpd/logutmp.c b/libexec/ftpd/logutmp.c
index c9628ef6ccf..fd3cfd370e1 100644
--- a/libexec/ftpd/logutmp.c
+++ b/libexec/ftpd/logutmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: logutmp.c,v 1.10 2005/05/27 04:27:27 millert Exp $	*/
+/*	$OpenBSD: logutmp.c,v 1.11 2008/06/30 12:03:51 ragge Exp $	*/
 /*
  * Portions Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -44,6 +44,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <ttyent.h>
+
+#include "monitor.h"
 #include "extern.h"
 
 static int fd = -1;
diff --git a/libexec/ftpd/logwtmp.c b/libexec/ftpd/logwtmp.c
index 4ee95a4606a..3ec0fac2cc0 100644
--- a/libexec/ftpd/logwtmp.c
+++ b/libexec/ftpd/logwtmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: logwtmp.c,v 1.9 2004/11/28 20:24:51 deraadt Exp $	*/
+/*	$OpenBSD: logwtmp.c,v 1.10 2008/06/30 12:03:51 ragge Exp $	*/
 /*	$NetBSD: logwtmp.c,v 1.4 1995/04/11 02:44:58 cgd Exp $	*/
 
 /*
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)logwtmp.c	8.1 (Berkeley) 6/4/93";
 #else
 static const char rcsid[] =
-    "$OpenBSD: logwtmp.c,v 1.9 2004/11/28 20:24:51 deraadt Exp $";
+    "$OpenBSD: logwtmp.c,v 1.10 2008/06/30 12:03:51 ragge Exp $";
 #endif
 #endif /* not lint */
 
@@ -51,6 +51,8 @@ static const char rcsid[] =
 #include <string.h>
 
 #include <netinet/in.h>
+
+#include "monitor.h"
 #include "extern.h"
 
 static int fd = -1;
diff --git a/libexec/ftpd/monitor.c b/libexec/ftpd/monitor.c
index bb80036f5c7..0176978d884 100644
--- a/libexec/ftpd/monitor.c
+++ b/libexec/ftpd/monitor.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: monitor.c,v 1.17 2007/04/05 21:16:59 moritz Exp $	*/
+/*	$OpenBSD: monitor.c,v 1.18 2008/06/30 12:03:51 ragge Exp $	*/
 
 /*
  * Copyright (c) 2004 Moritz Jodeit <moritz@openbsd.org>
@@ -34,8 +34,8 @@
 #include <syslog.h>
 #include <unistd.h>
 
-#include "extern.h"
 #include "monitor.h"
+#include "extern.h"
 
 enum monitor_command {
 	CMD_USER,
diff --git a/libexec/ftpd/popen.c b/libexec/ftpd/popen.c
index c47918d7f16..3bd0dfbae9c 100644
--- a/libexec/ftpd/popen.c
+++ b/libexec/ftpd/popen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: popen.c,v 1.21 2006/04/02 21:38:56 djm Exp $	*/
+/*	$OpenBSD: popen.c,v 1.22 2008/06/30 12:03:51 ragge Exp $	*/
 /*	$NetBSD: popen.c,v 1.5 1995/04/11 02:45:00 cgd Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 static const char sccsid[] = "@(#)popen.c	8.3 (Berkeley) 4/6/94";
 #else
 static const char rcsid[] =
-    "$OpenBSD: popen.c,v 1.21 2006/04/02 21:38:56 djm Exp $";
+    "$OpenBSD: popen.c,v 1.22 2008/06/30 12:03:51 ragge Exp $";
 #endif
 #endif /* not lint */
 
@@ -56,6 +56,8 @@ static const char rcsid[] =
 #include <unistd.h>
 
 #include <netinet/in.h>
+
+#include "monitor.h"
 #include "extern.h"
 
 /*