Add privilegeset_extend().

[irc/rqf/shadowircd.git] / src / s_user.c

diff --git a/src/s_user.c b/src/s_user.c
index 63d88dc6b212112ca4fea92c2f45cfefce492f06..57f3432e12950987f51f0f84feecf7cb20e38f18 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -53,12 +53,11 @@
 #include "snomask.h"
 #include "blacklist.h"
 #include "substitution.h"
+#include "chmode.h"
 
 static void report_and_set_user_flags(struct Client *, struct ConfItem *);
 void user_welcome(struct Client *source_p);
 
-extern char *crypt();
-
 char umodebuf[128];
 
 static int orphaned_umodes = 0;
@@ -363,7 +362,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                if(EmptyString(source_p->localClient->passwd))
                        encr = "";
                else if(IsConfEncrypted(aconf))
-                       encr = crypt(source_p->localClient->passwd, aconf->passwd);
+                       encr = rb_crypt(source_p->localClient->passwd, aconf->passwd);
                else
                        encr = source_p->localClient->passwd;
 
@@ -528,7 +527,6 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                Count.invisi++;
 
        s_assert(!IsClient(source_p));
-       del_unknown_ip(source_p);
        rb_dlinkMoveNode(&source_p->localClient->tnode, &unknown_list, &lclient_list);
        SetClient(source_p);
 
@@ -1187,7 +1185,7 @@ user_welcome(struct Client *source_p)
        sendto_one_numeric(source_p, RPL_YOURHOST, form_str(RPL_YOURHOST),
                   get_listener_name(source_p->localClient->listener), ircd_version);
        sendto_one_numeric(source_p, RPL_CREATED, form_str(RPL_CREATED), creation);
-       sendto_one_numeric(source_p, RPL_MYINFO, form_str(RPL_MYINFO), me.name, ircd_version, umodebuf);
+       sendto_one_numeric(source_p, RPL_MYINFO, form_str(RPL_MYINFO), me.name, ircd_version, umodebuf, cflagsmyinfo);
 
        show_isupport(source_p);