BOPM/TCM do not need the ability to global kill, so remove it from server_bot

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

diff --git a/extensions/m_mkpasswd.c b/extensions/m_mkpasswd.c
index 0d54494dd5bbbaa9f0c706a2a4817059fe10510d..16b76f1c24f894022136e37e3019ec33f3c186e5 100644 (file)
--- a/extensions/m_mkpasswd.c
+++ b/extensions/m_mkpasswd.c
@@ -6,7 +6,7 @@
  *
  *  You can use this code in any way as long as these names remain.
  *
- *  $Id: m_mkpasswd.c 6 2005-09-10 01:02:21Z nenolod $
+ *  $Id: m_mkpasswd.c 3161 2007-01-25 07:23:01Z nenolod $
  */
 
 /* List of ircd includes from ../include/ */
@@ -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,
@@ -47,7 +44,7 @@ struct Message mkpasswd_msgtab = {
 
 mapi_clist_av1 mkpasswd_clist[] = { &mkpasswd_msgtab, NULL };
 
-DECLARE_MODULE_AV1(mkpasswd, NULL, NULL, mkpasswd_clist, NULL, NULL, "$Revision: 6 $");
+DECLARE_MODULE_AV1(mkpasswd, NULL, NULL, mkpasswd_clist, NULL, NULL, "$Revision: 3161 $");
 
 
 static int
@@ -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, parv[0], "MKPASSWD");
                return 0;
        }
        else
        {
-               last_used = CurrentTime;
+               last_used = rb_current_time();
        }
 
        if(parc == 3)
@@ -82,9 +79,7 @@ m_mkpasswd(struct Client *client_p, struct Client *source_p, int parc, const cha
                }
                else
                {
-                       sendto_one(source_p,
-                                  ":%s NOTICE %s :MKPASSWD syntax error:  MKPASSWD pass [DES|MD5]",
-                                  me.name, parv[0]);
+                       sendto_one_notice(source_p, ":MKPASSWD syntax error:  MKPASSWD pass [DES|MD5]");
                        return 0;
                }
        }
@@ -92,8 +87,8 @@ 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");
        else
-               sendto_one(source_p, ":%s NOTICE %s :Encryption for [%s]:  %s",
-                          me.name, parv[0], parv[1], crypt(parv[1],
+               sendto_one_notice(source_p, ":Encryption for [%s]:  %s",
+                          parv[1], rb_crypt(parv[1],
                                                            is_md5 ? make_md5_salt() :
                                                            make_salt()));
 
@@ -125,9 +120,8 @@ mo_mkpasswd(struct Client *client_p, struct Client *source_p, int parc, const ch
                }
                else
                {
-                       sendto_one(source_p,
-                                  ":%s NOTICE %s :MKPASSWD syntax error:  MKPASSWD pass [DES|MD5]",
-                                  me.name, parv[0]);
+                       sendto_one_notice(source_p,
+                                  ":MKPASSWD syntax error:  MKPASSWD pass [DES|MD5]");
                        return 0;
                }
        }
@@ -135,10 +129,8 @@ 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");
        else
-               sendto_one(source_p, ":%s NOTICE %s :Encryption for [%s]:  %s",
-                          me.name, parv[0], parv[1], crypt(parv[1],
-                                                           is_md5 ? make_md5_salt() :
-                                                           make_salt()));
+               sendto_one_notice(source_p, ":Encryption for [%s]:  %s",
+                          parv[1], rb_crypt(parv[1], is_md5 ? make_md5_salt() : make_salt()));
 
        return 0;
 }