explicitly show IP in SNO_BANNED snotes

[solanum.git] / extensions / createauthonly.c

diff --git a/extensions/createauthonly.c b/extensions/createauthonly.c
index 4f7477ac1347f7b3575c184a36d95b4e3421b91c..2baa2e5a1a4068e64cac3ac5be4884a215db46dc 100644 (file)
--- a/extensions/createauthonly.c
+++ b/extensions/createauthonly.c
@@ -1,11 +1,9 @@
 /*
  * This module restricts channel creation to authenticated users
- * only. This module could be useful for running private chat
- * systems, or if a network gets droneflood problems. It will
- * return ERR_NEEDREGGEDNICK on failure.
+ * and IRC operators only. This module could be useful for
+ * running private chat systems, or if a network gets droneflood
+ * problems. It will return ERR_NEEDREGGEDNICK on failure.
  *    -- nenolod
- *
- * $Id: createauthonly.c 833 2006-02-15 00:27:59Z jilles $
  */
 
 #include "stdinc.h"
@@ -17,21 +15,25 @@
 #include "s_conf.h"
 #include "snomask.h"
 #include "numeric.h"
+#include "s_newconf.h"
 
-static void h_can_create_channel_authenticated(hook_data_client_approval *);
+static const char restrict_desc[] = "Restricts channel creation to authenticated users and IRC operators only";
+
+static void h_can_create_channel_authenticated(void *);
 
 mapi_hfn_list_av1 restrict_hfnlist[] = {
-       { "can_create_channel", (hookfn) h_can_create_channel_authenticated },
+       { "can_create_channel", h_can_create_channel_authenticated },
        { NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(createauthonly, NULL, NULL, NULL, NULL, restrict_hfnlist, "$Revision: 833 $");
+DECLARE_MODULE_AV2(createauthonly, NULL, NULL, NULL, NULL, restrict_hfnlist, NULL, NULL, restrict_desc);
 
 static void
-h_can_create_channel_authenticated(hook_data_client_approval *data)
+h_can_create_channel_authenticated(void *data_)
 {
+       hook_data_client_approval *data = data_;
        struct Client *source_p = data->client;
 
-       if (*source_p->user->suser == '\0')
+       if (*source_p->user->suser == '\0' && !IsOperGeneral(source_p))
                data->approved = ERR_NEEDREGGEDNICK;
 }