irc-info.c |   15 +++++++++++++--
 messages.h |    4 ++--
 2 files changed, 15 insertions(+), 4 deletions(-)

Index: src/ngircd/irc-info.c
===================================================================
RCS file: /srv/cvs/ngircd/ngircd/src/ngircd/irc-info.c,v
retrieving revision 1.34
diff -u -p -r1.34 irc-info.c
--- src/ngircd/irc-info.c	16 Sep 2006 12:22:09 -0000	1.34
+++ src/ngircd/irc-info.c	1 Oct 2006 16:59:13 -0000
@@ -833,6 +833,9 @@ GLOBAL bool
 IRC_Send_LUSERS( CLIENT *Client )
 {
 	long cnt;
+#ifndef STRICT_RFC
+	long max;
+#endif
 
 	assert( Client != NULL );
 
@@ -861,9 +864,17 @@ IRC_Send_LUSERS( CLIENT *Client )
 
 #ifndef STRICT_RFC
 	/* Maximum number of local users */
-	if( ! IRC_WriteStrClient( Client, RPL_LOCALUSERS_MSG, Client_ID( Client ), Client_MyUserCount( ), Client_MyMaxUserCount( ))) return DISCONNECTED;
+	cnt = Client_MyUserCount();
+	max = Client_MyMaxUserCount();
+	if (! IRC_WriteStrClient(Client, RPL_LOCALUSERS_MSG, Client_ID(Client),
+			cnt, max, cnt, max))
+		return DISCONNECTED;
 	/* Maximum number of users in the network */
-	if( ! IRC_WriteStrClient( Client, RPL_NETUSERS_MSG, Client_ID( Client ), Client_UserCount( ), Client_MaxUserCount( ))) return DISCONNECTED;
+	cnt = Client_UserCount();
+	max = Client_MaxUserCount();
+	if(! IRC_WriteStrClient(Client, RPL_NETUSERS_MSG, Client_ID(Client),
+			cnt, max, cnt, max))
+		return DISCONNECTED;
 #endif
 	
 	return CONNECTED;
Index: src/ngircd/messages.h
===================================================================
RCS file: /srv/cvs/ngircd/ngircd/src/ngircd/messages.h,v
retrieving revision 1.67
diff -u -p -r1.67 messages.h
--- src/ngircd/messages.h	2 Sep 2005 12:50:25 -0000	1.67
+++ src/ngircd/messages.h	1 Oct 2006 16:59:13 -0000
@@ -41,8 +41,8 @@
 #define RPL_ADMINLOC2_MSG		"258 %s :%s"
 #define RPL_ADMINEMAIL_MSG		"259 %s :%s"
 #define RPL_TRACEEND_MSG		"262 %s %s %s-%s.%s :End of TRACE"
-#define RPL_LOCALUSERS_MSG		"265 %s :Current local users: %ld, Max: %ld"
-#define RPL_NETUSERS_MSG		"266 %s :Current global users: %ld, Max: %ld"
+#define RPL_LOCALUSERS_MSG		"265 %s %ld %ld :Current local users: %ld, Max: %ld"
+#define RPL_NETUSERS_MSG		"266 %s %ld %ld :Current global users: %ld, Max: %ld"
 
 #define RPL_AWAY_MSG			"301 %s %s :%s"
 #define RPL_USERHOST_MSG		"302 %s :"