Fix various printf arg types.

[solanum.git] / src / s_user.c

diff --git a/src/s_user.c b/src/s_user.c
index 89b2a9f539f4aeb475c3395ea312f9204bde34bd..120088484a8b17aaa678ed787d2c1add48cc8882 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -54,6 +54,7 @@
 #include "blacklist.h"
 #include "substitution.h"
 #include "chmode.h"
+#include "s_assert.h"
 
 static void report_and_set_user_flags(struct Client *, struct ConfItem *);
 void user_welcome(struct Client *source_p);
@@ -157,7 +158,8 @@ show_lusers(struct Client *source_p)
 
        if(rb_dlink_list_length(&oper_list) > 0)
                sendto_one_numeric(source_p, RPL_LUSEROP, 
-                                  form_str(RPL_LUSEROP), rb_dlink_list_length(&oper_list));
+                                  form_str(RPL_LUSEROP),
+                                  (int)rb_dlink_list_length(&oper_list));
 
        if(rb_dlink_list_length(&unknown_list) > 0)
                sendto_one_numeric(source_p, RPL_LUSERUNKNOWN, 
@@ -373,7 +375,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                else
                        encr = source_p->localClient->passwd;
 
-               if(strcmp(encr, aconf->passwd))
+               if(encr == NULL || strcmp(encr, aconf->passwd))
                {
                        ServerStats.is_ref++;
                        sendto_one(source_p, form_str(ERR_PASSWDMISMATCH), me.name, source_p->name);
@@ -1486,10 +1488,11 @@ change_nick_user_host(struct Client *target_p,  const char *nick, const char *use
                                target_p->name, target_p->username,
                                target_p->host, nick);
 
-               sendto_realops_snomask(SNO_NCHANGE, L_ALL,
-                               "Nick change: From %s to %s [%s@%s]",
-                               target_p->name, nick,
-                               target_p->username, target_p->host);
+               if(MyConnect(target_p))
+                       sendto_realops_snomask(SNO_NCHANGE, L_ALL,
+                                       "Nick change: From %s to %s [%s@%s]",
+                                       target_p->name, nick,
+                                       target_p->username, target_p->host);
        }
 
        rb_strlcpy(target_p->username, user, sizeof target_p->username);