Merge branch 'master' into HostServ

[srvx.git] / src / nickserv.c

diff --git a/src/nickserv.c b/src/nickserv.c
index 5da64a780a3291a57df60ac1684492d401cdaee7..25c2a43cfa9dc427b1adead6d1e66e0e02632d6d 100644 (file)
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -988,7 +988,7 @@ reg_handle_rename_func(handle_rename_func_t func)
     rf_list[rf_list_used++] = func;
 }
 
-static char *
+char *
 generate_fakehost(struct handle_info *handle)
 {
     extern const char *hidden_host_suffix;
@@ -1009,7 +1009,7 @@ generate_fakehost(struct handle_info *handle)
     return handle->fakehost;
 }
 
-static char *
+char *
 generate_fakeident(struct handle_info *handle, struct userNode *user)
 {
     static char buffer[USERLEN+1];
@@ -1023,7 +1023,7 @@ generate_fakeident(struct handle_info *handle, struct userNode *user)
     return handle->fakeident;
 }
 
-static void
+void
 apply_fakehost(struct handle_info *handle, struct userNode *user)
 {
     struct userNode *target;
@@ -1969,7 +1969,7 @@ static NICKSERV_FUNC(cmd_auth)
     return 1;
 }
 
-struct handle_info *checklogin(const char *user, const char *pass, const char *numeric, const char *hostmask, const char *ipmask)
+struct handle_info *checklogin(const char *user, const char *pass, UNUSED_ARG(const char *numeric), const char *hostmask, const char *ipmask)
 {
     struct handle_info *hi;
     unsigned int match = 0, ii = 0;
@@ -2421,13 +2421,15 @@ nickserv_addmask(struct userNode *user, struct handle_info *hi, const char *mask
     char *new_mask = canonicalize_hostmask(strdup(mask));
     for (i=0; i<hi->masks->used; i++) {
         if (!irccasecmp(new_mask, hi->masks->list[i])) {
-            send_message(user, nickserv, "NSMSG_ADDMASK_ALREADY", new_mask);
+            if(user)
+                send_message(user, nickserv, "NSMSG_ADDMASK_ALREADY", new_mask);
             free(new_mask);
             return 0;
         }
     }
     string_list_append(hi->masks, new_mask);
-    send_message(user, nickserv, "NSMSG_ADDMASK_SUCCESS", new_mask);
+    if(user)
+        send_message(user, nickserv, "NSMSG_ADDMASK_SUCCESS", new_mask);
     return 1;
 }