Changeset devel,71

Timestamp:

2005-12-08T14:51:06Z (4 years ago)

Author:

Jelmer Vernooij <jelmer@…>

branch-nick:

integration

revision id:

jelmer@samba.org-20051208145106-38dc18e64f8fb57d

Message:

Move some crypting-unrelated code

Location:

devel

Files:

• crypting.c (modified) (3 diffs)
• crypting.h (modified) (1 diff)
• irc.c (modified) (2 diffs)

devel/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);
         
@@ -80 +74 @@
                 irc->password = NULL;
         }
-}
-
-char *passchange (irc_t *irc, void *set, const char *value) {
-        setpassnc (irc, value);
-        return (NULL);
 }
 

devel/crypting.h

@@ -25 +25 @@
 
 void setpassnc (irc_t *irc, const char *pass); /* USE WITH CAUTION! */
-char *passchange (irc_t *irc, void *set, const char *value);
 int setpass (irc_t *irc, const char *pass, const char* md5sum);
 char *hashpass (irc_t *irc);

devel/irc.c

@@ -31 +31 @@
 
 GSList *irc_connection_list = NULL;
+
+char *passchange (irc_t *irc, void *set, char *value) 
+{
+        setpassnc (irc, value);
+        return (NULL);
+}
 
 irc_t *irc_new( int fd )
@@ -129 +135 @@
         set_add( irc, "to_char", ": ", set_eval_to_char );
         set_add( irc, "typing_notice", "false", set_eval_bool );
+        set_add( irc, "password", NULL, passchange);
         
         conf_loaddefaults( irc );