Update TODO.

[irc/rqf/shadowircd.git] / extensions / m_mkpasswd.c

diff --git a/extensions/m_mkpasswd.c b/extensions/m_mkpasswd.c
index b160c5f4de65776f54fea7e5a03945e6ddbee885..bf5f038f2f7a9607c583e60c4f8912f4506a3f3c 100644 (file)
--- a/extensions/m_mkpasswd.c
+++ b/extensions/m_mkpasswd.c
@@ -14,12 +14,11 @@
 #include "client.h"
 #include "common.h"            /* FALSE bleah */
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
-#include "patricia.h"
 #include "s_newconf.h"
 #include "s_conf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "send.h"
 #include "msg.h"
@@ -28,8 +27,6 @@
 
 #include <string.h>
 
-extern char *crypt();
-
 static int m_mkpasswd(struct Client *client_p, struct Client *source_p,
                      int parc, const char *parv[]);
 static int mo_mkpasswd(struct Client *client_p, struct Client *source_p,
@@ -56,15 +53,15 @@ m_mkpasswd(struct Client *client_p, struct Client *source_p, int parc, const cha
        static time_t last_used = 0;
        int is_md5 = 0;
 
-       if((last_used + ConfigFileEntry.pace_wait) > CurrentTime)
+       if((last_used + ConfigFileEntry.pace_wait) > rb_current_time())
        {
                /* safe enough to give this on a local connect only */
-               sendto_one(source_p, form_str(RPL_LOAD2HI), me.name, parv[0]);
+               sendto_one(source_p, form_str(RPL_LOAD2HI), me.name, source_p->name, "MKPASSWD");
                return 0;
        }
        else
        {
-               last_used = CurrentTime;
+               last_used = rb_current_time();
        }
 
        if(parc == 3)
@@ -88,10 +85,10 @@ m_mkpasswd(struct Client *client_p, struct Client *source_p, int parc, const cha
        }
 
        if(parc == 1)
-               sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS), me.name, parv[0], "MKPASSWD");
+               sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS), me.name, source_p->name, "MKPASSWD");
        else
                sendto_one_notice(source_p, ":Encryption for [%s]:  %s",
-                          parv[1], crypt(parv[1],
+                          parv[1], rb_crypt(parv[1],
                                                            is_md5 ? make_md5_salt() :
                                                            make_salt()));
 
@@ -100,7 +97,6 @@ m_mkpasswd(struct Client *client_p, struct Client *source_p, int parc, const cha
 
 /*
 ** mo_test
-**      parv[0] = sender prefix
 **      parv[1] = parameter
 */
 static int
@@ -130,10 +126,10 @@ mo_mkpasswd(struct Client *client_p, struct Client *source_p, int parc, const ch
        }
 
        if(parc == 1)
-               sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS), me.name, parv[0], "MKPASSWD");
+               sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS), me.name, source_p->name, "MKPASSWD");
        else
                sendto_one_notice(source_p, ":Encryption for [%s]:  %s",
-                          parv[1], crypt(parv[1], is_md5 ? make_md5_salt() : make_salt()));
+                          parv[1], rb_crypt(parv[1], is_md5 ? make_md5_salt() : make_salt()));
 
        return 0;
 }