X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands.cpp;h=ae4b97c3e1289b81297ee835fea4744196abf7ae;hb=bf6ec00f3dc5ae23da1e8a4e20d44555eca0593a;hp=1cdf214ab2d176e9556adb8f95b1ad6acc35dfeb;hpb=2d6813e2eab42e450fb2b2914920b124373050ad;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands.cpp b/src/commands.cpp
index 1cdf214ab..ae4b97c3e 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -16,10 +16,10 @@
 
 using namespace std;
 
+#include "inspircd_config.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
 #include "inspircd_util.h"
-#include "inspircd_config.h"
 #include <unistd.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
@@ -528,7 +528,7 @@ void handle_topic(char **parameters, int pcnt, userrec *user)
 				strlcpy(topic,parameters[1],MAXBUF);
 				if (strlen(topic)>MAXTOPIC)
 				{
-					topic[MAXTOPIC-1] = '\0';
+					topic[MAXTOPIC] = '\0';
 				}
 
                                 if (!strcasecmp(user->server,ServerName))
@@ -990,7 +990,10 @@ void handle_who(char **parameters, int pcnt, userrec *user)
 						WriteServ(user->fd,"352 %s %s %s %s %s %s %s :0 %s",user->nick, Ptr ? Ptr->name : "*", i->second->ident, i->second->dhost, i->second->server, i->second->nick, tmp, i->second->fullname);
 						n_list++;
 						if (n_list > MaxWhoResults)
+						{
+							WriteServ(user->fd,"523 %s WHO :Command aborted: More results than configured limit",user->nick);
 							break;
+						}
 					}
 				}
 			}
@@ -1009,6 +1012,7 @@ void handle_who(char **parameters, int pcnt, userrec *user)
 			Ptr = FindChan(parameters[0]);
 			if (Ptr)
 			{
+				int n_list = 0;
 			  	for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
 				{
 					if ((has_channel(i->second,Ptr)) && (isnick(i->second->nick)))
@@ -1023,6 +1027,13 @@ void handle_who(char **parameters, int pcnt, userrec *user)
 						if (strchr(i->second->modes,'o')) { strlcat(tmp, "*", 9); }
 						strlcat(tmp, cmode(i->second, Ptr),5);
 						WriteServ(user->fd,"352 %s %s %s %s %s %s %s :0 %s",user->nick, Ptr->name, i->second->ident, i->second->dhost, i->second->server, i->second->nick, tmp, i->second->fullname);
+                                                n_list++;
+                                                if (n_list > MaxWhoResults)
+                                                {
+                                                        WriteServ(user->fd,"523 %s WHO :Command aborted: More results than configured limit",user->nick);
+                                                        break;
+                                                }
+
 					}
 				}
 				WriteServ(user->fd,"315 %s %s :End of /WHO list.",user->nick, parameters[0]);
@@ -1737,7 +1748,8 @@ void handle_oper(char **parameters, int pcnt, userrec *user)
 					snprintf(global,MAXBUF,"| %s %s",user->nick,TypeName);
 					NetSendToAll(global);
 					ConfValue("type","host",j,HostName,&config_f);
-					ChangeDisplayedHost(user,HostName);
+					if (*HostName)
+						ChangeDisplayedHost(user,HostName);
 					strlcpy(user->oper,TypeName,NICKMAX);
 					found = true;
 					fail2 = false;
@@ -2865,7 +2877,7 @@ void process_restricted_commands(char token,char* params,serverrec* source,serve
 		// ?
   		// ping
 		case '?':
-                        snprintf(buffer,MAXBUF,":%s !",CreateSum().c_str());
+                        snprintf(buffer,MAXBUF,"%s !",CreateSum().c_str());
                         reply->SendPacket(buffer,tcp_host);
 		break;
 		// ?