From ed28210c45304471bededbcf07644046fc1119d6 Mon Sep 17 00:00:00 2001
From: Jilles Tjoelker <jilles@stack.nl>
Date: Sat, 21 Jun 2008 00:58:08 +0200
Subject: [PATCH] Clean up s_auth a little. No functional changes.

---
 include/s_auth.h | 48 ------------------------------------------------
 src/s_auth.c     | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 48 deletions(-)

diff --git a/include/s_auth.h b/include/s_auth.h
index b4df34f..3c4ad40 100644
--- a/include/s_auth.h
+++ b/include/s_auth.h
@@ -27,57 +27,9 @@
 #ifndef INCLUDED_s_auth_h
 #define INCLUDED_s_auth_h
 
-#include "config.h"
-#include "res.h"
-/* 
- * How many auth allocations to allocate in a block. I'm guessing that
- * a good number here is 64, because these are temporary and don't live
- * as long as clients do.
- *     -- adrian
- */
-#define	AUTH_BLOCK_SIZE		64
-
 struct Client;
 
-struct AuthRequest
-{
-	rb_dlink_node node;
-	struct Client *client;	/* pointer to client struct for request */
-	struct DNSQuery dns_query; /* DNS Query */
-	unsigned int flags;	/* current state of request */
-	rb_fde_t *F;		/* file descriptor for auth queries */
-	time_t timeout;		/* time when query expires */
-};
-
-/*
- * flag values for AuthRequest
- * NAMESPACE: AM_xxx - Authentication Module
- */
-#define AM_AUTH_CONNECTING   (1 << 0)
-#define AM_AUTH_PENDING      (1 << 1)
-#define AM_DNS_PENDING       (1 << 2)
-
-#define SetDNSPending(x)     ((x)->flags |= AM_DNS_PENDING)
-#define ClearDNSPending(x)   ((x)->flags &= ~AM_DNS_PENDING)
-#define IsDNSPending(x)      ((x)->flags &  AM_DNS_PENDING)
-
-#define SetAuthConnect(x)    ((x)->flags |= AM_AUTH_CONNECTING)
-#define ClearAuthConnect(x)  ((x)->flags &= ~AM_AUTH_CONNECTING)
-#define IsAuthConnect(x)     ((x)->flags &  AM_AUTH_CONNECTING)
-
-#define SetAuthPending(x)    ((x)->flags |= AM_AUTH_PENDING)
-#define ClearAuthPending(x)  ((x)->flags &= AM_AUTH_PENDING)
-#define IsAuthPending(x)     ((x)->flags &  AM_AUTH_PENDING)
-
-#define ClearAuth(x)         ((x)->flags &= ~(AM_AUTH_PENDING | AM_AUTH_CONNECTING))
-#define IsDoingAuth(x)       ((x)->flags &  (AM_AUTH_PENDING | AM_AUTH_CONNECTING))
-/* #define SetGotId(x)       ((x)->flags |= FLAGS_GOTID) */
-
-
-
 extern void start_auth(struct Client *);
-extern void send_auth_query(struct AuthRequest *req);
-extern void remove_auth_request(struct AuthRequest *req);
 extern void init_auth(void);
 extern void delete_auth_queries(struct Client *);
 
diff --git a/src/s_auth.c b/src/s_auth.c
index 2ea496d..9ae504c 100644
--- a/src/s_auth.c
+++ b/src/s_auth.c
@@ -50,6 +50,39 @@
 #include "hook.h"
 #include "blacklist.h"
 
+struct AuthRequest
+{
+	rb_dlink_node node;
+	struct Client *client;	/* pointer to client struct for request */
+	struct DNSQuery dns_query; /* DNS Query */
+	unsigned int flags;	/* current state of request */
+	rb_fde_t *F;		/* file descriptor for auth queries */
+	time_t timeout;		/* time when query expires */
+};
+
+/*
+ * flag values for AuthRequest
+ * NAMESPACE: AM_xxx - Authentication Module
+ */
+#define AM_AUTH_CONNECTING   (1 << 0)
+#define AM_AUTH_PENDING      (1 << 1)
+#define AM_DNS_PENDING       (1 << 2)
+
+#define SetDNSPending(x)     ((x)->flags |= AM_DNS_PENDING)
+#define ClearDNSPending(x)   ((x)->flags &= ~AM_DNS_PENDING)
+#define IsDNSPending(x)      ((x)->flags &  AM_DNS_PENDING)
+
+#define SetAuthConnect(x)    ((x)->flags |= AM_AUTH_CONNECTING)
+#define ClearAuthConnect(x)  ((x)->flags &= ~AM_AUTH_CONNECTING)
+#define IsAuthConnect(x)     ((x)->flags &  AM_AUTH_CONNECTING)
+
+#define SetAuthPending(x)    ((x)->flags |= AM_AUTH_PENDING)
+#define ClearAuthPending(x)  ((x)->flags &= AM_AUTH_PENDING)
+#define IsAuthPending(x)     ((x)->flags &  AM_AUTH_PENDING)
+
+#define ClearAuth(x)         ((x)->flags &= ~(AM_AUTH_PENDING | AM_AUTH_CONNECTING))
+#define IsDoingAuth(x)       ((x)->flags &  (AM_AUTH_PENDING | AM_AUTH_CONNECTING))
+
 /*
  * a bit different approach
  * this replaces the original sendheader macros