Add 328 numeric (ChanServ channel URL) to the header files.

[solanum.git] / modules / m_testline.c

diff --git a/modules/m_testline.c b/modules/m_testline.c
index 51e5b77a25e3b56350fdc87886b5d1b5a6a367cd..0bcba6ea3bc08b8f0bfab721380514f3e7952f76 100644 (file)
--- a/modules/m_testline.c
+++ b/modules/m_testline.c
@@ -39,7 +39,6 @@
 #include "numeric.h"
 #include "s_conf.h"
 #include "s_newconf.h"
-#include "sprintf_irc.h"
 
 static int mo_testline(struct Client *, struct Client *, int, const char **);
 static int mo_testgecos(struct Client *, struct Client *, int, const char **);
@@ -141,13 +140,13 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 
        if (username != NULL)
        {
-               strlcpy(user_trunc, username, sizeof user_trunc);
-               strlcpy(notildeuser_trunc, *username == '~' ? username + 1 : username, sizeof notildeuser_trunc);
+               rb_strlcpy(user_trunc, username, sizeof user_trunc);
+               rb_strlcpy(notildeuser_trunc, *username == '~' ? username + 1 : username, sizeof notildeuser_trunc);
        }
        else
        {
-               strlcpy(user_trunc, "dummy", sizeof user_trunc);
-               strlcpy(notildeuser_trunc, "dummy", sizeof notildeuser_trunc);
+               rb_strlcpy(user_trunc, "dummy", sizeof user_trunc);
+               rb_strlcpy(notildeuser_trunc, "dummy", sizeof notildeuser_trunc);
        }
        /* now look for a matching I/K/G */
        if((aconf = find_address_conf(host, NULL, user_trunc, notildeuser_trunc,
@@ -156,7 +155,7 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 #ifdef RB_IPV6
                                 (type == HM_IPV6) ? AF_INET6 : 
 #endif
-                                 AF_INET) : 0)))
+                                 AF_INET) : 0, NULL)))
        {
                static char buf[HOSTLEN+USERLEN+2];
 
@@ -194,7 +193,8 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
        if(aconf && aconf->status & CONF_CLIENT)
        {
                sendto_one_numeric(source_p, RPL_STATSILINE, form_str(RPL_STATSILINE),
-                               aconf->name, show_iline_prefix(source_p, aconf, aconf->user),
+                               aconf->name, EmptyString(aconf->spasswd) ? "<NULL>" : aconf->spasswd,
+                               show_iline_prefix(source_p, aconf, aconf->user),
                                aconf->host, aconf->port, aconf->className);
                return 0;
        }