From 41615da91c55d1b5eb4b1c7252b88124333c63b7 Mon Sep 17 00:00:00 2001
From: Jilles Tjoelker <jilles@stack.nl>
Date: Wed, 3 Dec 2008 00:16:05 +0100
Subject: [PATCH 1/2] Add operspy /topic. This allows querying any channel's
 topic under the operspy rules, but not changing it.

---
 help/opers/operspy |  1 +
 modules/m_topic.c  | 39 ++++++++++++++++++++++++++++++---------
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/help/opers/operspy b/help/opers/operspy
index 0f02c2b03..2b60cc0da 100644
--- a/help/opers/operspy
+++ b/help/opers/operspy
@@ -11,3 +11,4 @@ who !#channel   - Gives a full output of users on the channel.
 mode !#channel  - Gives the full modes of a channel including any keys.
 chantrace !#channel - Gives full output despite not being on channel.
 masktrace !nick!user@host :gecos - Lists matching users on all servers.
+topic !#channel - Gives full output despite not being on channel.
diff --git a/modules/m_topic.c b/modules/m_topic.c
index da5a8c2ce..a69a99e29 100644
--- a/modules/m_topic.c
+++ b/modules/m_topic.c
@@ -32,6 +32,7 @@
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
+#include "s_newconf.h"
 #include "s_conf.h"
 #include "s_serv.h"
 #include "msg.h"
@@ -62,26 +63,43 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
 	struct Channel *chptr = NULL;
 	struct membership *msptr;
 	char *p = NULL;
+	const char *name;
+	int operspy = 0;
 
 	if((p = strchr(parv[1], ',')))
 		*p = '\0';
 
+	name = parv[1];
+
+	if(IsOperSpy(source_p) && parv[1][0] == '!')
+	{
+		name++;
+		operspy = 1;
+
+		if(EmptyString(name))
+		{
+			sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
+					me.name, source_p->name, "TOPIC");
+			return 0;
+		}
+	}
+
 	if(MyClient(source_p) && !IsFloodDone(source_p))
 		flood_endgrace(source_p);
 
-	if(!IsChannelName(parv[1]))
+	if(!IsChannelName(name))
 	{
 		sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
-				   form_str(ERR_NOSUCHCHANNEL), parv[1]);
+				   form_str(ERR_NOSUCHCHANNEL), name);
 		return 0;
 	}
 
-	chptr = find_channel(parv[1]);
+	chptr = find_channel(name);
 
 	if(chptr == NULL)
 	{
 		sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
-				form_str(ERR_NOSUCHCHANNEL), parv[1]);
+				form_str(ERR_NOSUCHCHANNEL), name);
 		return 0;
 	}
 
@@ -93,7 +111,7 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
 		if(msptr == NULL)
 		{
 			sendto_one_numeric(source_p, ERR_NOTONCHANNEL,
-					form_str(ERR_NOTONCHANNEL), parv[1]);
+					form_str(ERR_NOTONCHANNEL), name);
 			return 0;
 		}
 
@@ -116,19 +134,22 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
 		}
 		else
 			sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
-					me.name, source_p->name, parv[1]);
+					me.name, source_p->name, name);
 	}
 	else if(MyClient(source_p))
 	{
-		if(!IsMember(source_p, chptr) && SecretChannel(chptr))
+		if(operspy)
+			report_operspy(source_p, "TOPIC", chptr->chname);
+		if(!IsMember(source_p, chptr) && SecretChannel(chptr) &&
+				!operspy)
 		{
 			sendto_one_numeric(source_p, ERR_NOTONCHANNEL,
-					form_str(ERR_NOTONCHANNEL), parv[1]);
+					form_str(ERR_NOTONCHANNEL), name);
 			return 0;
 		}
 		if(chptr->topic == NULL)
 			sendto_one(source_p, form_str(RPL_NOTOPIC),
-					me.name, source_p->name, parv[1]);
+					me.name, source_p->name, name);
 		else
 		{
 			sendto_one(source_p, form_str(RPL_TOPIC),

From d4db3063c72969f530949a28c321e3bc2b98de69 Mon Sep 17 00:00:00 2001
From: Jilles Tjoelker <jilles@stack.nl>
Date: Wed, 3 Dec 2008 00:39:07 +0100
Subject: [PATCH 2/2] Specify RTLD_LOCAL explicitly.

As in atheme-services, I guess some versions of
MacOS X need this.
---
 src/modules.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/modules.c b/src/modules.c
index a8b84afe8..0d5cab54b 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -533,6 +533,10 @@ mo_modrestart(struct Client *client_p, struct Client *source_p, int parc, const
 #define RTLD_NOW RTLD_LAZY	/* openbsd deficiency */
 #endif
 
+#ifndef RTLD_LOCAL
+#define RTLD_LOCAL 0
+#endif
+
 #ifdef CHARYBDIS_PROFILE
 # ifndef RTLD_PROFILE
 #  warning libdl may not support profiling, sucks. :(
@@ -792,9 +796,9 @@ load_a_module(const char *path, int warn, int core)
 	mod_basename = irc_basename(path);
 
 #ifdef CHARYBDIS_PROFILE
-	tmpptr = dlopen(path, RTLD_NOW | RTLD_PROFILE);
+	tmpptr = dlopen(path, RTLD_NOW | RTLD_LOCAL | RTLD_PROFILE);
 #else
-	tmpptr = dlopen(path, RTLD_NOW);
+	tmpptr = dlopen(path, RTLD_NOW | RTLD_LOCAL);
 #endif
 
 	if(tmpptr == NULL)