Backed out changeset 7f24e5f3fb86

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

diff --git a/src/s_user.c b/src/s_user.c
index e4caebe1c08b793ff1b8fa244dbb14f15a8fa344..01a21e879a8b1d36e73b23442199eadb224273d3 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -58,8 +58,6 @@
 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;
@@ -364,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;
 
@@ -529,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);
 
@@ -1253,6 +1250,7 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p)
 
        source_p->flags2 |= oper_p->flags;
        source_p->localClient->opername = rb_strdup(oper_p->name);
+       source_p->localClient->privset = privilegeset_ref(oper_p->privset);
 
        rb_dlinkAddAlloc(source_p, &local_oper_list);
        rb_dlinkAddAlloc(source_p, &oper_list);
@@ -1279,7 +1277,8 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p)
        sendto_one_numeric(source_p, RPL_SNOMASK, form_str(RPL_SNOMASK),
                   construct_snobuf(source_p->snomask));
        sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
-       sendto_one_notice(source_p, ":*** Oper privs are %s", get_oper_privs(oper_p->flags));
+       sendto_one_notice(source_p, ":*** Oper privilege set is %s", oper_p->privset->name);
+       sendto_one_notice(source_p, ":*** Oper privs are %s", oper_p->privset->privs);
        send_oper_motd(source_p);
 
        return (1);