Changeset 06b5893

Timestamp:

2011-12-07T21:47:25Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

57da960

Parents:

aee8c19

Message:

Merging non-SASL authentication patch from #863. This also implements
hidden-default settings, which means a setting is hidden unless it was
changed from the default. This seems like appropriate behaviour for
something as obscure as this.

Files:

• protocols/jabber/io.c (modified) (2 diffs)
• protocols/jabber/jabber.c (modified) (1 diff)
• root_commands.c (modified) (1 diff)
• set.c (modified) (1 diff)
• set.h (modified) (2 diffs)

protocols/jabber/io.c

@@ -212 +212 @@
                                    this is an old server that can't do SASL
                                    authentication. */
-                                if( !sasl_supported( ic ) )
+                                if( !set_getbool( &ic->acc->set, "sasl") || !sasl_supported( ic ) )
                                 {
                                         /* If there's no version= tag, we suppose
@@ -375 +375 @@
            other way. jabber.com doesn't seem to do SASL while it pretends
            to be XMPP 1.0 compliant! */
-        else if( !( jd->flags & JFLAG_AUTHENTICATED ) && sasl_supported( ic ) )
+        else if( !( jd->flags & JFLAG_AUTHENTICATED ) && set_getbool( &ic->acc->set, "sasl") && sasl_supported( ic ) )
         {
                 if( !jabber_init_iq_auth( ic ) )

protocols/jabber/jabber.c

@@ -82 +82 @@
         s->flags |= ACC_SET_OFFLINE_ONLY;
         
+        s = set_add( &acc->set, "sasl", "true", set_eval_bool, acc );
+        s->flags |= ACC_SET_OFFLINE_ONLY | SET_HIDDEN_DEFAULT;
+
         s = set_add( &acc->set, "user_agent", "BitlBee", NULL, acc );
         

root_commands.c

@@ -362 +362 @@
                 while( s )
                 {
-                        if( !( s->flags & SET_HIDDEN ) )
+                        if( set_isvisible( s ) )
                                 cmd_showset( irc, &s, s->key );
                         s = s->next;

set.c

@@ -112 +112 @@
 }
 
+int set_isvisible( set_t *set )
+{
+        /* the default value is not stored in value, only in def */
+        return !( ( set->flags & SET_HIDDEN ) ||
+                  ( ( set->flags & SET_HIDDEN_DEFAULT ) &&
+                    ( set->value == NULL ) ) );
+}
+
 int set_setstr( set_t **head, const char *key, char *value )
 {

set.h

@@ -49 +49 @@
         SET_HIDDEN = 0x0200,
         SET_PASSWORD = 0x0400,
+        SET_HIDDEN_DEFAULT = 0x0800,
 } set_flags_t;
 
@@ -98 +99 @@
 int set_reset( set_t **head, const char *key );
 
+/* returns true if a setting shall be shown to the user */
+int set_isvisible( set_t *set );
+
 /* Two very useful generic evaluators. */
 char *set_eval_int( set_t *set, char *value );