Ticket #863: sasl_optional_HIDDEN_DEFAULT_flag.patch

protocols/jabber/io.c

@@ -211 +211 @@
                                 /* If there's no version attribute, assume
                                    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
                                            this server does NOT implement: XMPP 1.0,
@@ -374 +374 @@
            support it after all, we should try to do authentication the
            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 ) )
                         return XT_ABORT;

protocols/jabber/jabber.c

@@ -81 +81 @@
         s = set_add( &acc->set, "tls", "try", set_eval_tls, acc );
         s->flags |= ACC_SET_OFFLINE_ONLY;
         
+        s = set_add( &acc->set, "sasl", "true", set_eval_bool, acc );
+        s->flags |= ACC_SET_OFFLINE_ONLY;
+        s->flags |= SET_HIDDEN_DEFAULT;
+
         s = set_add( &acc->set, "user_agent", "BitlBee", NULL, acc );
         
         s = set_add( &acc->set, "xmlconsole", "false", set_eval_bool, acc );

root_commands.c

@@ -361 +361 @@
                 set_t *s = *head;
                 while( s )
                 {
-                        if( !( s->flags & SET_HIDDEN ) )
-                                cmd_showset( irc, &s, s->key );
-                        s = s->next;
+                  if( set_isvisible(s) )
+                        cmd_showset( irc, &s, s->key );
+                  s = s->next;
                 }
         }
         

set.c

@@ -111 +111 @@
         return bool2int( s );
 }
 
+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_t *s = set_find( head, key );

set.h

@@ -48 +48 @@
         SET_NULL_OK = 0x0100,
         SET_HIDDEN = 0x0200,
         SET_PASSWORD = 0x0400,
+        SET_HIDDEN_DEFAULT = 0x0800,
 } set_flags_t;
 
 typedef struct set
@@ -97 +98 @@
 void set_del( set_t **head, const char *key );
 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 );
 char *set_eval_bool( set_t *set, char *value );