Changeset 9df916f for crypting.c

Timestamp:

2005-12-09T20:48:45Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

34759e6

Parents:

c2295f7 (diff), 87c24ba (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge my storage abstraction changes

File:

• crypting.c (modified) (3 diffs)

crypting.c

@@ -52 +52 @@
 #include <stdlib.h>
 
-#define irc_usermsg
-
 #endif
 
@@ -62 +60 @@
 \*/
 
-/* USE WITH CAUTION!
-   Sets pass without checking */
-void setpassnc (irc_t *irc, const char *pass) 
-{
-        if (irc->password) g_free (irc->password);
-        
-        if (pass) {
-                irc->password = g_strdup (pass);
-                irc_usermsg (irc, "Password successfully changed");
-        } else {
-                irc->password = NULL;
-        }
-}
-
-int setpass (irc_t *irc, const char *pass, const char* md5sum) 
+int checkpass (const char *pass, const char *md5sum)
 {
         md5_state_t md5state;
@@ -94 +78 @@
                 if (digits[1] != md5sum[j + 1]) return (-1);
         }
-        
-        /* If pass is correct, we end up here and we set the pass */
-        setpassnc (irc, pass);
-        
-        return (0);
-}
+
+        return( 0 );
+}
+
 
 char *hashpass (irc_t *irc) {