X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fproto-common.c;h=729c8fcda38e0d3ef85c085c2cf188855e87a673;hb=7fe401a165cdfb1f102cf3d545e1dffb3896a2e9;hp=daf4b868d558f971ce2f62283697be6b8190d0c1;hpb=c4ab180a14a56a57317675480f2aae18a16f3d7d;p=srvx.git

diff --git a/src/proto-common.c b/src/proto-common.c
index daf4b86..729c8fc 100644
--- a/src/proto-common.c
+++ b/src/proto-common.c
@@ -311,11 +311,11 @@ static CMD_FUNC(cmd_pass)
         return 0;
     true_pass = cManager.uplink->their_password;
     if (true_pass && strcmp(true_pass, argv[1])) {
-	/* It might be good to mark the uplink as unavailable when
-	   this happens, though there should be a way of resetting
-	   the flag. */
-	irc_squit(self, "Incorrect password received.", NULL);
-	return 1;
+        /* It might be good to mark the uplink as unavailable when
+           this happens, though there should be a way of resetting
+           the flag. */
+        irc_squit(self, "Incorrect password received.", NULL);
+        return 1;
     }
 
     cManager.uplink->state = BURSTING;
@@ -330,13 +330,13 @@ static CMD_FUNC(cmd_dummy)
 
 static CMD_FUNC(cmd_error)
 {
-    if (argv[1]) log_module(MAIN_LOG, LOG_ERROR, "Error: %s", argv[1]);
+    if (argv[1]) log_module(MAIN_LOG, LOG_ERROR, "Error from ircd: %s", argv[1]);
     log_module(MAIN_LOG, LOG_ERROR, "Error received from uplink, squitting.");
 
     if (cManager.uplink->state != CONNECTED) {
-	/* Error messages while connected should be fine. */
-	cManager.uplink->flags |= UPLINK_UNAVAILABLE;
-	log_module(MAIN_LOG, LOG_ERROR, "Disabling uplink.");
+        /* Error messages while connected should be fine. */
+        cManager.uplink->flags |= UPLINK_UNAVAILABLE;
+        log_module(MAIN_LOG, LOG_ERROR, "Disabling uplink.");
     }
 
     close_socket();
@@ -442,7 +442,6 @@ privmsg_chan_helper(struct chanNode *cn, void *data)
     /* Never send a NOTICE to a channel to one of the services */
     if (!pd->is_notice && cf->func
         && ((cn->modes & MODE_REGISTERED) || GetUserMode(cn, cf->service)))
-        cf->func(pd->user, cn, pd->text+1, cf->service);
 
     /* This catches *all* text sent to the channel that the services server sees */
     for (x = 0; x < ALLCHANMSG_FUNCS_MAX; x++) {
@@ -494,7 +493,7 @@ void
 reg_chanmsg_func(unsigned char prefix, struct userNode *service, chanmsg_func_t handler)
 {
     if (chanmsg_funcs[prefix].func)
-	log_module(MAIN_LOG, LOG_WARNING, "Re-registering new chanmsg handler for character `%c'.", prefix);
+        log_module(MAIN_LOG, LOG_WARNING, "Re-registering new chanmsg handler for character `%c'.", prefix);
     chanmsg_funcs[prefix].func = handler;
     chanmsg_funcs[prefix].service = service;
 }
@@ -525,13 +524,13 @@ void
 reg_mode_change_func(mode_change_func_t handler)
 {
     if (mcf_used == mcf_size) {
-	if (mcf_size) {
-	    mcf_size <<= 1;
-	    mcf_list = realloc(mcf_list, mcf_size*sizeof(mode_change_func_t));
-	} else {
-	    mcf_size = 8;
-	    mcf_list = malloc(mcf_size*sizeof(mode_change_func_t));
-	}
+        if (mcf_size) {
+            mcf_size <<= 1;
+            mcf_list = realloc(mcf_list, mcf_size*sizeof(mode_change_func_t));
+        } else {
+            mcf_size = 8;
+            mcf_list = malloc(mcf_size*sizeof(mode_change_func_t));
+        }
     }
     mcf_list[mcf_used++] = handler;
 }