Changeset 09d4922

Timestamp:

2010-11-21T19:34:59Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

9564e55

Parents:

bdedc14

Message:

Be clearer about password settings being intentionally hidden (and not
really empty). Bug #657 and confusing BitlBee users since probably 2002.

Files:

• irc.c (modified) (1 diff)
• protocols/account.c (modified) (1 diff)
• root_commands.c (modified) (2 diffs)
• set.h (modified) (1 diff)

irc.c

@@ -123 +123 @@
         s->old_key = g_strdup( "buddy_sendbuffer_delay" );
         s = set_add( &b->set, "password", NULL, set_eval_password, irc );
-        s->flags |= SET_NULL_OK;
+        s->flags |= SET_NULL_OK | SET_PASSWORD;
         s = set_add( &b->set, "private", "true", set_eval_bool, irc );
         s = set_add( &b->set, "query_order", "lifo", NULL, irc );

protocols/account.c

@@ -64 +64 @@
         
         s = set_add( &a->set, "password", NULL, set_eval_account, a );
-        s->flags |= ACC_SET_NOSAVE | SET_NULL_OK;
+        s->flags |= ACC_SET_NOSAVE | SET_NULL_OK | SET_PASSWORD;
         
         s = set_add( &a->set, "tag", NULL, set_eval_account, a );

root_commands.c

@@ -274 +274 @@
 static void cmd_showset( irc_t *irc, set_t **head, char *key )
 {
+        set_t *set;
         char *val;
         
         if( ( val = set_getstr( head, key ) ) )
                 irc_usermsg( irc, "%s = `%s'", key, val );
-        else if( !set_find( head, key ) )
+        else if( !( set = set_find( head, key ) ) )
         {
                 irc_usermsg( irc, "Setting `%s' does not exist.", key );
@@ -285 +286 @@
                                      "See \x02help account set\x02 and \x02help channel set\x02." );
         }
+        else if( set->flags & SET_PASSWORD )
+                irc_usermsg( irc, "%s = `********' (hidden)", key );
         else
                 irc_usermsg( irc, "%s is empty", key );

set.h

@@ -48 +48 @@
         SET_NULL_OK = 0x0100,
         SET_HIDDEN = 0x0200,
+        SET_PASSWORD = 0x0400,
 } set_flags_t;