From 882ff5a53c3b4e440520a073cf07dc60b2671876 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Thu, 4 Feb 2021 10:45:09 -0500
Subject: [PATCH] remove typedef from struct recptypes

---
 citadel/ctdl_module.h                          |  6 ++----
 citadel/internet_addressing.c                  | 12 ++++++------
 citadel/internet_addressing.h                  |  4 ++--
 citadel/journaling.c                           |  8 ++++----
 citadel/journaling.h                           |  4 ++--
 citadel/modules/blog/serv_blog.c               |  2 +-
 citadel/modules/calendar/serv_calendar.c       | 12 ++++++------
 citadel/modules/clamav/serv_virus.c            |  2 +-
 citadel/modules/ctdlproto/serv_messages.c      |  8 ++++----
 citadel/modules/imap/imap_acl.c                |  2 +-
 citadel/modules/inboxrules/serv_inboxrules.c   |  2 +-
 citadel/modules/inetcfg/serv_inetcfg.c         |  2 +-
 citadel/modules/listdeliver/serv_listdeliver.c |  8 ++++++++
 citadel/modules/notes/serv_notes.c             |  2 +-
 citadel/modules/smtp/serv_smtp.c               |  4 ++--
 citadel/modules/smtp/serv_smtpclient.c         |  2 +-
 citadel/modules/smtp/smtp_util.c               |  2 +-
 citadel/modules/spam/serv_spam.c               |  2 +-
 citadel/modules/vcard/serv_vcard.c             |  6 +++---
 citadel/modules/wiki/serv_wiki.c               |  2 +-
 citadel/msgbase.c                              |  4 ++--
 citadel/msgbase.h                              |  2 +-
 citadel/serv_extensions.c                      |  8 ++++----
 citadel/serv_extensions.h                      |  2 +-
 citadel/server.h                               |  4 ++--
 citadel/user_ops.c                             |  2 +-
 26 files changed, 60 insertions(+), 54 deletions(-)

diff --git a/citadel/ctdl_module.h b/citadel/ctdl_module.h
index 8fac3261c..9c6a90f22 100644
--- a/citadel/ctdl_module.h
+++ b/citadel/ctdl_module.h
@@ -105,10 +105,8 @@ void CtdlUnregisterUserHook(void (*fcn_ptr)(struct ctdluser *), int EventType);
 void CtdlRegisterXmsgHook(int (*fcn_ptr)(char *, char *, char *, char *), int order);
 void CtdlUnregisterXmsgHook(int (*fcn_ptr)(char *, char *, char *, char *), int order);
 
-void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *, recptypes*),
-							int EventType);
-void CtdlUnregisterMessageHook(int (*handler)(struct CtdlMessage *, recptypes *),
-			       int EventType);
+void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *, struct recptypes *), int EventType);
+void CtdlUnregisterMessageHook(int (*handler)(struct CtdlMessage *, struct recptypes *), int EventType);
 
 void CtdlRegisterRoomHook(int (*fcn_ptr)(struct ctdlroom *) );
 void CtdlUnregisterRoomHook(int (*fnc_ptr)(struct ctdlroom *) );
diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index 030291f6c..6eb6de68c 100644
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -322,7 +322,7 @@ int CtdlHostAlias(char *fqdn) {
  */
 int CtdlIsMe(char *addr, int addr_buf_len)
 {
-	recptypes *recp;
+	struct recptypes *recp;
 	int i;
 
 	recp = validate_recipients(addr, NULL, 0);
@@ -458,9 +458,9 @@ int alias(char *name)
  *
  * Caller needs to free the result using free_recipients()
  */
-recptypes *validate_recipients(const char *supplied_recipients, const char *RemoteIdentifier, int Flags) {
+struct recptypes *validate_recipients(const char *supplied_recipients, const char *RemoteIdentifier, int Flags) {
 	struct CitContext *CCC = CC;
-	recptypes *ret;
+	struct recptypes *ret;
 	char *recipients = NULL;
 	char *org_recp;
 	char this_recp[256];
@@ -479,11 +479,11 @@ recptypes *validate_recipients(const char *supplied_recipients, const char *Remo
 	int in_quotes = 0;
 
 	/* Initialize */
-	ret = (recptypes *) malloc(sizeof(recptypes));
+	ret = (struct recptypes *) malloc(sizeof(struct recptypes));
 	if (ret == NULL) return(NULL);
 
 	/* Set all strings to null and numeric values to zero */
-	memset(ret, 0, sizeof(recptypes));
+	memset(ret, 0, sizeof(struct recptypes));
 
 	if (supplied_recipients == NULL) {
 		recipients = strdup("");
@@ -698,7 +698,7 @@ recptypes *validate_recipients(const char *supplied_recipients, const char *Remo
 /*
  * Destructor for recptypes
  */
-void free_recipients(recptypes *valid) {
+void free_recipients(struct recptypes *valid) {
 
 	if (valid == NULL) {
 		return;
diff --git a/citadel/internet_addressing.h b/citadel/internet_addressing.h
index 2c9cf9e41..22129e464 100644
--- a/citadel/internet_addressing.h
+++ b/citadel/internet_addressing.h
@@ -2,8 +2,8 @@
 #include "server.h"
 #include "ctdl_module.h"
 
-recptypes *validate_recipients(const char *recipients, const char *RemoteIdentifier, int Flags);
-void free_recipients(recptypes *);
+struct recptypes *validate_recipients(const char *recipients, const char *RemoteIdentifier, int Flags);
+void free_recipients(struct recptypes *);
 void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name);
 char *rfc822_fetch_field(const char *rfc822, const char *fieldname);
 void sanitize_truncated_recipient(char *str);
diff --git a/citadel/journaling.c b/citadel/journaling.c
index 375589750..939ec3b7d 100644
--- a/citadel/journaling.c
+++ b/citadel/journaling.c
@@ -29,7 +29,7 @@ struct jnlq *jnlq = NULL;	/* journal queue */
  */
 void JournalBackgroundSubmit(struct CtdlMessage *msg,
 			StrBuf *saved_rfc822_version,
-			recptypes *recps) {
+			struct recptypes *recps) {
 
 	struct jnlq *jptr = NULL;
 
@@ -45,7 +45,7 @@ void JournalBackgroundSubmit(struct CtdlMessage *msg,
 		return;
 	}
 	memset(jptr, 0, sizeof(struct jnlq));
-	if (recps != NULL) memcpy(&jptr->recps, recps, sizeof(recptypes));
+	if (recps != NULL) memcpy(&jptr->recps, recps, sizeof(struct recptypes));
 	if (!CM_IsEmpty(msg, eAuthor)) jptr->from = strdup(msg->cm_fields[eAuthor]);
 	if (!CM_IsEmpty(msg, erFc822Addr)) jptr->rfca = strdup(msg->cm_fields[erFc822Addr]);
 	if (!CM_IsEmpty(msg, eMsgSubject)) jptr->subj = strdup(msg->cm_fields[eMsgSubject]);
@@ -89,7 +89,7 @@ void local_to_inetemail(char *inetemail, char *localuser, size_t inetemail_len)
 void JournalRunQueueMsg(struct jnlq *jmsg) {
 
 	struct CtdlMessage *journal_msg = NULL;
-	recptypes *journal_recps = NULL;
+	struct recptypes *journal_recps = NULL;
 	StrBuf *message_text = NULL;
 	char mime_boundary[256];
 	long mblen;
@@ -142,7 +142,7 @@ void JournalRunQueueMsg(struct jnlq *jmsg) {
 				rfc822len = 0;
 			}
 
-			message_text = NewStrBufPlain(NULL, rfc822len + sizeof(recptypes) + 1024);
+			message_text = NewStrBufPlain(NULL, rfc822len + sizeof(struct recptypes) + 1024);
 
 			/*
 			 * Here is where we begin to compose the journalized message.
diff --git a/citadel/journaling.h b/citadel/journaling.h
index 74c79816a..4a66781ae 100644
--- a/citadel/journaling.h
+++ b/citadel/journaling.h
@@ -1,6 +1,6 @@
 struct jnlq {
 	struct jnlq *next;
-	recptypes recps;
+	struct recptypes recps;
 	char *from;
 	char *node;
 	char *rfca;
@@ -11,6 +11,6 @@ struct jnlq {
 
 void JournalBackgroundSubmit(struct CtdlMessage *msg,
                         StrBuf *saved_rfc822_version,
-                        recptypes *recps);
+                        struct recptypes *recps);
 void JournalRunQueueMsg(struct jnlq *jmsg);
 void JournalRunQueue(void);
diff --git a/citadel/modules/blog/serv_blog.c b/citadel/modules/blog/serv_blog.c
index 9040d7af9..98bc938d3 100644
--- a/citadel/modules/blog/serv_blog.c
+++ b/citadel/modules/blog/serv_blog.c
@@ -51,7 +51,7 @@
  * Pre-save hook for saving a message in a blog room.
  * (Do we want to only do this for top-level messages?)
  */
-int blog_upload_beforesave(struct CtdlMessage *msg, recptypes *recp) {
+int blog_upload_beforesave(struct CtdlMessage *msg, struct recptypes *recp) {
 
 	/* Only run this hook for blog rooms */
 	if (CC->room.QRdefaultview != VIEW_BLOG) {
diff --git a/citadel/modules/calendar/serv_calendar.c b/citadel/modules/calendar/serv_calendar.c
index 941806393..55d64d9ff 100644
--- a/citadel/modules/calendar/serv_calendar.c
+++ b/citadel/modules/calendar/serv_calendar.c
@@ -171,13 +171,13 @@ void ical_send_a_reply(icalcomponent *request, char *action) {
 	icalproperty *summary = NULL;
 	char summary_string[SIZ];
 	icalproperty *me_attend = NULL;
-	recptypes *recp = NULL;
+	struct recptypes *recp = NULL;
 	icalparameter *partstat = NULL;
 	char *serialized_reply = NULL;
 	char *reply_message_text = NULL;
 	const char *ch;
 	struct CtdlMessage *msg = NULL;
-	recptypes *valid = NULL;
+	struct recptypes *valid = NULL;
 
 	*organizer_string = '\0';
 	strcpy(summary_string, "Calendar item");
@@ -1407,7 +1407,7 @@ void ical_freebusy(char *who) {
 	icalcomponent *encaps = NULL;
 	icalcomponent *fb = NULL;
 	int found_user = (-1);
-	recptypes *recp = NULL;
+	struct recptypes *recp = NULL;
 	char buf[256];
 	char host[256];
 	char type[256];
@@ -1960,7 +1960,7 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal)
 	icalcomponent *encaps = NULL;
 	char *request_message_text = NULL;
 	struct CtdlMessage *msg = NULL;
-	recptypes *valid = NULL;
+	struct recptypes *valid = NULL;
 	char attendees_string[SIZ];
 	int num_attendees = 0;
 	char this_attendee[256];
@@ -2349,7 +2349,7 @@ void ical_obj_beforesave_backend(char *name, char *filename, char *partnum,
  * If the message is being saved, we also set various message header fields
  * using data found in the iCalendar object.
  */
-int ical_obj_beforesave(struct CtdlMessage *msg, recptypes *recp)
+int ical_obj_beforesave(struct CtdlMessage *msg, struct recptypes *recp)
 {
 	/* First determine if this is a calendar or tasks room */
 	if (  (CC->room.QRdefaultview != VIEW_CALENDAR)
@@ -2416,7 +2416,7 @@ void ical_obj_aftersave_backend(char *name, char *filename, char *partnum,
  * (This will start back end tasks such as automatic generation of invitations,
  * if such actions are appropriate.)
  */
-int ical_obj_aftersave(struct CtdlMessage *msg, recptypes *recp)
+int ical_obj_aftersave(struct CtdlMessage *msg, struct recptypes *recp)
 {
 	char roomname[ROOMNAMELEN];
 
diff --git a/citadel/modules/clamav/serv_virus.c b/citadel/modules/clamav/serv_virus.c
index 18a143060..c5599b9de 100644
--- a/citadel/modules/clamav/serv_virus.c
+++ b/citadel/modules/clamav/serv_virus.c
@@ -50,7 +50,7 @@
 /*
  * Connect to the clamd server and scan a message.
  */
-int clamd(struct CtdlMessage *msg, recptypes *recp) {
+int clamd(struct CtdlMessage *msg, struct recptypes *recp) {
 	int sock = (-1);
 	int streamsock = (-1);
 	char clamhosts[SIZ];
diff --git a/citadel/modules/ctdlproto/serv_messages.c b/citadel/modules/ctdlproto/serv_messages.c
index 6550e4421..022ce2b7e 100644
--- a/citadel/modules/ctdlproto/serv_messages.c
+++ b/citadel/modules/ctdlproto/serv_messages.c
@@ -409,10 +409,10 @@ void cmd_ent0(char *entargs)
 	int anonymous = 0;
 	char errmsg[SIZ];
 	int err = 0;
-	recptypes *valid = NULL;
-	recptypes *valid_to = NULL;
-	recptypes *valid_cc = NULL;
-	recptypes *valid_bcc = NULL;
+	struct recptypes *valid = NULL;
+	struct recptypes *valid_to = NULL;
+	struct recptypes *valid_cc = NULL;
+	struct recptypes *valid_bcc = NULL;
 	char subject[SIZ];
 	int subject_required = 0;
 	int do_confirm = 0;
diff --git a/citadel/modules/imap/imap_acl.c b/citadel/modules/imap/imap_acl.c
index 05426de46..97b5f9630 100644
--- a/citadel/modules/imap/imap_acl.c
+++ b/citadel/modules/imap/imap_acl.c
@@ -209,7 +209,7 @@ void imap_listrights(int num_parms, ConstStr *Params) {
 	char savedroom[ROOMNAMELEN];
 	int msgs, new;
 	int ret;
-	recptypes *valid;
+	struct recptypes *valid;
 	struct ctdluser temp;
 
 	if (num_parms != 4) {
diff --git a/citadel/modules/inboxrules/serv_inboxrules.c b/citadel/modules/inboxrules/serv_inboxrules.c
index 204b7cbc6..b7e01278f 100644
--- a/citadel/modules/inboxrules/serv_inboxrules.c
+++ b/citadel/modules/inboxrules/serv_inboxrules.c
@@ -345,7 +345,7 @@ int inbox_do_redirect(struct irule *rule, long msgnum) {
 		return(1);					// don't delete the inbox copy if this failed
 	}
 
-	recptypes *valid = validate_recipients(rule->redirect_to, NULL, 0);
+	struct recptypes *valid = validate_recipients(rule->redirect_to, NULL, 0);
 	if (valid == NULL) {
 		syslog(LOG_WARNING, "inboxrules: inbox_do_redirect() invalid recipient <%s>", rule->redirect_to);
 		return(1);					// don't delete the inbox copy if this failed
diff --git a/citadel/modules/inetcfg/serv_inetcfg.c b/citadel/modules/inetcfg/serv_inetcfg.c
index 71155c8b0..814659d28 100644
--- a/citadel/modules/inetcfg/serv_inetcfg.c
+++ b/citadel/modules/inetcfg/serv_inetcfg.c
@@ -66,7 +66,7 @@ void inetcfg_setTo(struct CtdlMessage *msg) {
  * This handler detects changes being made to the system's Internet
  * configuration.
  */
-int inetcfg_aftersave(struct CtdlMessage *msg, recptypes *recp) {
+int inetcfg_aftersave(struct CtdlMessage *msg, struct recptypes *recp) {
 	char *ptr;
 	int linelen;
 
diff --git a/citadel/modules/listdeliver/serv_listdeliver.c b/citadel/modules/listdeliver/serv_listdeliver.c
index 75f2d6759..793291b44 100644
--- a/citadel/modules/listdeliver/serv_listdeliver.c
+++ b/citadel/modules/listdeliver/serv_listdeliver.c
@@ -110,7 +110,15 @@ void listdeliver_sweep_room(struct ctdlroom *qrbuf, void *data) {
 	
 		if (number_of_messages_processed > 0) {
 			syslog(LOG_DEBUG, "listdeliver: new lastsent is %ld", ld.msgnum);
+
 			// FIXME write lastsent back to netconfig
+			syslog(LOG_DEBUG, "\033[31mBEFORE:<%s>\033[0m", netconfig);
+			syslog(LOG_DEBUG, "\033[32mAFTER:<%s>\033[0m", netconfig);
+
+
+
+
+
 		}
 	}
 
diff --git a/citadel/modules/notes/serv_notes.c b/citadel/modules/notes/serv_notes.c
index 694f4eacd..4ae8ac077 100644
--- a/citadel/modules/notes/serv_notes.c
+++ b/citadel/modules/notes/serv_notes.c
@@ -62,7 +62,7 @@ void notes_extract_vnote(char *name, char *filename, char *partnum, char *disp,
  * and modern vNote format notes) and does its best to learn the subject (summary)
  * and EUID (uid) of the note for Citadel's own nefarious purposes.
  */
-int serv_notes_beforesave(struct CtdlMessage *msg, recptypes *recp)
+int serv_notes_beforesave(struct CtdlMessage *msg, struct recptypes *recp)
 {
 	char *p;
 	int a, i;
diff --git a/citadel/modules/smtp/serv_smtp.c b/citadel/modules/smtp/serv_smtp.c
index d4da34c0f..15110cdd6 100644
--- a/citadel/modules/smtp/serv_smtp.c
+++ b/citadel/modules/smtp/serv_smtp.c
@@ -693,7 +693,7 @@ void smtp_rcpt(long offset, long flags)
 {
 	struct CitContext *CCC = CC;
 	char message_to_spammer[SIZ];
-	recptypes *valid = NULL;
+	struct recptypes *valid = NULL;
 	citsmtp *sSMTP = SMTP;
 
 	if (StrLength(sSMTP->from) == 0) {
@@ -792,7 +792,7 @@ void smtp_data(long offset, long flags)
 	struct CtdlMessage *msg = NULL;
 	long msgnum = (-1L);
 	char nowstamp[SIZ];
-	recptypes *valid;
+	struct recptypes *valid;
 	int scan_errors;
 	int i;
 	citsmtp *sSMTP = SMTP;
diff --git a/citadel/modules/smtp/serv_smtpclient.c b/citadel/modules/smtp/serv_smtpclient.c
index c81bde42a..e528015eb 100644
--- a/citadel/modules/smtp/serv_smtpclient.c
+++ b/citadel/modules/smtp/serv_smtpclient.c
@@ -82,7 +82,7 @@ void smtp_init_spoolout(void)
  * not happen because the delivery instructions message does not
  * contain a recipient.
  */
-int smtp_aftersave(struct CtdlMessage *msg, recptypes * recps)
+int smtp_aftersave(struct CtdlMessage *msg, struct recptypes *recps)
 {
 	if ((recps != NULL) && (recps->num_internet > 0)) {
 		struct CtdlMessage *imsg = NULL;
diff --git a/citadel/modules/smtp/smtp_util.c b/citadel/modules/smtp/smtp_util.c
index 14c4e02b7..3f57c2de0 100644
--- a/citadel/modules/smtp/smtp_util.c
+++ b/citadel/modules/smtp/smtp_util.c
@@ -84,7 +84,7 @@ void smtp_do_bounce(const char *instr, int is_final)
 	int num_bounces = 0;
 	int bounce_this = 0;
 	struct CtdlMessage *bmsg = NULL;
-	recptypes *valid;
+	struct recptypes *valid;
 	int successful_bounce = 0;
 	static int seq = 0;
 	StrBuf *BounceMB;
diff --git a/citadel/modules/spam/serv_spam.c b/citadel/modules/spam/serv_spam.c
index 479ea5fec..2b9331f93 100644
--- a/citadel/modules/spam/serv_spam.c
+++ b/citadel/modules/spam/serv_spam.c
@@ -53,7 +53,7 @@
 /*
  * Connect to the SpamAssassin server and scan a message.
  */
-int spam_assassin(struct CtdlMessage *msg, recptypes *recp) {
+int spam_assassin(struct CtdlMessage *msg, struct recptypes *recp) {
 	int sock = (-1);
 	char sahosts[SIZ];
 	int num_sahosts;
diff --git a/citadel/modules/vcard/serv_vcard.c b/citadel/modules/vcard/serv_vcard.c
index a4a569e2c..dbb9255f9 100644
--- a/citadel/modules/vcard/serv_vcard.c
+++ b/citadel/modules/vcard/serv_vcard.c
@@ -179,7 +179,7 @@ void vcard_extract_vcard(char *name, char *filename, char *partnum, char *disp,
  * function accordingly (delete the user's existing vCard in the config room
  * and in the global address book).
  */
-int vcard_upload_beforesave(struct CtdlMessage *msg, recptypes *recp) {
+int vcard_upload_beforesave(struct CtdlMessage *msg, struct recptypes *recp) {
 	char *s;
 	char buf[SIZ];
 	struct ctdluser usbuf;
@@ -358,7 +358,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg, recptypes *recp) {
  * function accordingly (copy the vCard from the config room to the global
  * address book).
  */
-int vcard_upload_aftersave(struct CtdlMessage *msg, recptypes *recp) {
+int vcard_upload_aftersave(struct CtdlMessage *msg, struct recptypes *recp) {
 	char *ptr;
 	int linelen;
 	long I;
@@ -924,7 +924,7 @@ void check_get(void) {
 	
 	if (strncasecmp(cmdbuf, "GET ", 4)==0)
 	{
-		recptypes *rcpt;
+		struct recptypes *rcpt;
 		char *argbuf = &cmdbuf[4];
 		
 		extract_token(internet_addr, argbuf, 0, '|', sizeof internet_addr);
diff --git a/citadel/modules/wiki/serv_wiki.c b/citadel/modules/wiki/serv_wiki.c
index 5de715a32..3917237aa 100644
--- a/citadel/modules/wiki/serv_wiki.c
+++ b/citadel/modules/wiki/serv_wiki.c
@@ -59,7 +59,7 @@ char *wwm = "9999999999.WikiWaybackMachine";
  * Before allowing a wiki page save to execute, we have to perform version control.
  * This involves fetching the old version of the page if it exists.
  */
-int wiki_upload_beforesave(struct CtdlMessage *msg, recptypes *recp) {
+int wiki_upload_beforesave(struct CtdlMessage *msg, struct recptypes *recp) {
 	struct CitContext *CCC = CC;
 	long old_msgnum = (-1L);
 	struct CtdlMessage *old_msg = NULL;
diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index aff45e097..901ee0764 100644
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -2659,7 +2659,7 @@ void ReplicationChecks(struct CtdlMessage *msg) {
  * Save a message to disk and submit it into the delivery system.
  */
 long CtdlSubmitMsg(struct CtdlMessage *msg,	/* message to save */
-		   recptypes *recps,		/* recipients (if mail) */
+		   struct recptypes *recps,		/* recipients (if mail) */
 		   const char *force		/* force a particular room? */
 ) {
 	char hold_rm[ROOMNAMELEN];
@@ -2986,7 +2986,7 @@ long quickie_message(const char *from,
 		     const char *subject)
 {
 	struct CtdlMessage *msg;
-	recptypes *recp = NULL;
+	struct recptypes *recp = NULL;
 
 	msg = malloc(sizeof(struct CtdlMessage));
 	memset(msg, 0, sizeof(struct CtdlMessage));
diff --git a/citadel/msgbase.h b/citadel/msgbase.h
index c83b6e205..aecfc4bf9 100644
--- a/citadel/msgbase.h
+++ b/citadel/msgbase.h
@@ -78,7 +78,7 @@ void memfmout (char *mptr, const char *nl);
 void output_mime_parts(char *);
 long send_message (struct CtdlMessage *);
 void loadtroom (void);
-long CtdlSubmitMsg(struct CtdlMessage *, recptypes *, const char *);
+long CtdlSubmitMsg(struct CtdlMessage *, struct recptypes *, const char *);
 long quickie_message(const char *from, const char *fromaddr, const char *to, char *room, const char *text, int format_type, const char *subject);
 void GetMetaData(struct MetaData *, long);
 void PutMetaData(struct MetaData *);
diff --git a/citadel/serv_extensions.c b/citadel/serv_extensions.c
index f81008464..6197d2880 100644
--- a/citadel/serv_extensions.c
+++ b/citadel/serv_extensions.c
@@ -75,7 +75,7 @@ UserFunctionHook *UserHookTable = NULL;
 typedef struct MessageFunctionHook MessageFunctionHook;
 struct MessageFunctionHook {
 	MessageFunctionHook *next;
-	int (*h_function_pointer) (struct CtdlMessage *msg, recptypes *recps);
+	int (*h_function_pointer) (struct CtdlMessage *msg, struct recptypes *recps);
 	int eventtype;
 };
 MessageFunctionHook *MessageHookTable = NULL;
@@ -374,7 +374,7 @@ void CtdlUnregisterUserHook(void (*fcn_ptr) (struct ctdluser *), int EventType)
 }
 
 
-void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *, recptypes *), int EventType)
+void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *, struct recptypes *), int EventType)
 {
 
 	MessageFunctionHook *newfcn;
@@ -390,7 +390,7 @@ void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *, recptypes *),
 }
 
 
-void CtdlUnregisterMessageHook(int (*handler)(struct CtdlMessage *, recptypes *), int EventType)
+void CtdlUnregisterMessageHook(int (*handler)(struct CtdlMessage *, struct recptypes *), int EventType)
 {
 	MessageFunctionHook *cur, *p, *last;
 	last = NULL;
@@ -810,7 +810,7 @@ void PerformUserHooks(ctdluser *usbuf, int EventType)
 	}
 }
 
-int PerformMessageHooks(struct CtdlMessage *msg, recptypes *recps, int EventType)
+int PerformMessageHooks(struct CtdlMessage *msg, struct recptypes *recps, int EventType)
 {
 	MessageFunctionHook *fcn = NULL;
 	int total_retval = 0;
diff --git a/citadel/serv_extensions.h b/citadel/serv_extensions.h
index 677f4f72b..c8308cf62 100644
--- a/citadel/serv_extensions.h
+++ b/citadel/serv_extensions.h
@@ -31,7 +31,7 @@ void PerformUserHooks(struct ctdluser *usbuf, int EventType);
 
 int PerformXmsgHooks(char *, char *, char *, char *);
 
-int PerformMessageHooks(struct CtdlMessage *, recptypes *recps, int EventType);
+int PerformMessageHooks(struct CtdlMessage *, struct recptypes *recps, int EventType);
 
 int PerformRoomHooks(struct ctdlroom *);
 
diff --git a/citadel/server.h b/citadel/server.h
index ff5c3355e..0be145a20 100644
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -44,7 +44,7 @@ struct CtdlMessage {
 
 
 /* Data structure returned by validate_recipients() */
-typedef struct __recptypes {
+struct recptypes {
 	int recptypes_magic;
         int num_local;
         int num_internet;
@@ -60,7 +60,7 @@ typedef struct __recptypes {
 	char *bounce_to;
 	char *envelope_from;
 	char *sending_room;
-} recptypes;
+};
 
 #define RECPTYPES_MAGIC 0xfeeb
 
diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index df9c920fc..0dc5ae327 100644
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -623,7 +623,7 @@ int CtdlLoginExistingUser(const char *trythisname)
 	else {
 		/* native auth mode */
 
-		recptypes *valid = NULL;
+		struct recptypes *valid = NULL;
 	
 		/* First, try to log in as if the supplied name is a display name */
 		found_user = CtdlGetUser(&CC->user, username);
-- 
2.30.2