commit 4c34777d2e8ec7fe0fac9bf056f7d43c77335605
from: Martijn van Duren <martijn@openbsd.org>
date: Thu Aug 22 07:54:07 2019 UTC

Fix some ordering and names

commit - 9048b69433ba4e00a68dde62a9adfc8d14eb02ff
commit + 4c34777d2e8ec7fe0fac9bf056f7d43c77335605
blob - ab3fbc5542a3ca7699b94012de0324469b86eda1
blob + b62c247303e5ceef945633360f7c1d12fc247189
--- opensmtpd.h
+++ opensmtpd.h
@@ -62,7 +62,7 @@ enum osmtpd_phase {
 #define OSMTPD_NEED_SRC 1 << 0
 #define OSMTPD_NEED_DST 1 << 1
 #define OSMTPD_NEED_RDNS 1 << 2
-#define OSMTPD_NEED_FRDNS 1 << 3
+#define OSMTPD_NEED_FCRDNS 1 << 3
 #define OSMTPD_NEED_IDENTITY 1 << 4
 #define OSMTPD_NEED_CIPHERS 1 << 5
 #define OSMTPD_NEED_MSGID 1 << 6
@@ -72,11 +72,11 @@ enum osmtpd_phase {
 
 struct osmtpd_ctx {
 	enum osmtpd_type	 type;
+	enum osmtpd_phase	 phase;
 	int			 version_major;
 	int			 version_minor;
 	struct timespec		 tm;
 	int			 incoming;
-	enum osmtpd_phase	 phase;
 	uint64_t		 reqid;
 	uint64_t		 token;
 	struct sockaddr_storage	 src;