Changeset 8efa2f4 for crypting.c

Timestamp:

2005-12-08T14:57:13Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

09adf08

Parents:

7989fcf3 (diff), c2295f7 (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 some fixes from my integration branch

File:

• crypting.c (modified) (3 diffs)

crypting.c

@@ -46 +46 @@
 } irc_t;
 
-#define set_add( a, b, c, d )
-#define set_find( a, b ) NULL
-
 #include "md5.h"
 #include "crypting.h"
@@ -69 +66 @@
 void setpassnc (irc_t *irc, const char *pass) 
 {
-        if (!set_find (irc, "password"))
-                set_add (irc, "password", NULL, passchange);
-        
         if (irc->password) g_free (irc->password);
         
@@ -82 +76 @@
 }
 
-char *passchange (irc_t *irc, void *set, char *value) {
-        setpassnc (irc, value);
-        return (NULL);
-}
-
-int setpass (irc_t *irc, const char *pass, char* md5sum) {
+int setpass (irc_t *irc, const char *pass, const char* md5sum) 
+{
         md5_state_t md5state;
         md5_byte_t digest[16];