Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2005-03-19 22:52:45 UTC
Modified files:
ircd/m_oper.c doc/example.conf ChangeLog
Log message:
Fix crash when /oper operator badpass. Fix comment explaining the
crypted passwords.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.563 ircu2.10/ChangeLog:1.564
--- ircu2.10/ChangeLog:1.563 Tue Mar 8 04:56:14 2005
+++ ircu2.10/ChangeLog Sat Mar 19 14:52:33 2005
@@ -1,3 +1,11 @@
+2005-03-19 Michael Poole <[EMAIL PROTECTED]>
+
+ * doc/example.conf (Operator): Correct the comment explaining
+ hashed passwords.
+
+ * ircd/m_oper.c (oper_password_match): Check correct variable to
+ determine whether the hashed password matched.
+
2005-03-08 Michael Poole <[EMAIL PROTECTED]>
* ircd/match.c (ipmask_parse): Explicitly zero-initialize the mask
Index: ircu2.10/doc/example.conf
diff -u ircu2.10/doc/example.conf:1.47 ircu2.10/doc/example.conf:1.48
--- ircu2.10/doc/example.conf:1.47 Mon Mar 7 13:12:21 2005
+++ ircu2.10/doc/example.conf Sat Mar 19 14:52:33 2005
@@ -609,9 +609,11 @@
# # and the default setting.
# };
#
-# The encrypted password is optional. If you wish to encrypt your
-# password, there is a utility in the ircd. Please read the file
-# tools/README.
+# By default, the password is hashed using the system's native crypt()
+# function. Other password mechanisms are available; the umkpasswd
+# utility from the ircd directory can hash passwords using those
+# mechanisms.
+#
# All privileges are shown with their default values; if you wish to
# override defaults, you should set only those privileges for the
# operator. Listing defaulted privileges just makes things harder to
Index: ircu2.10/ircd/m_oper.c
diff -u ircu2.10/ircd/m_oper.c:1.24 ircu2.10/ircd/m_oper.c:1.25
--- ircu2.10/ircd/m_oper.c:1.24 Fri Dec 10 21:13:48 2004
+++ ircu2.10/ircd/m_oper.c Sat Mar 19 14:52:33 2005
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: m_oper.c,v 1.24 2004/12/11 05:13:48 klmitch Exp $
+ * $Id: m_oper.c,v 1.25 2005/03/19 22:52:33 entrope Exp $
*/
/*
@@ -121,7 +121,7 @@
crypt_clear if it's enabled -- hikari */
crypted = ircd_crypt(to_match, passwd);
- if (to_match == NULL)
+ if (!crypted)
return 0;
res = strcmp(crypted, passwd);
MyFree(crypted);
----------------------- End of diff -----------------------
