equal
deleted
inserted
replaced
1079 LmMessage *message, |
1079 LmMessage *message, |
1080 gpointer user_data) |
1080 gpointer user_data) |
1081 { |
1081 { |
1082 LmMessageNode *bind_node; |
1082 LmMessageNode *bind_node; |
1083 LmMessageNode *starttls_node; |
1083 LmMessageNode *starttls_node; |
1084 LmMessageNode *old_auth; |
|
1085 LmMessageNode *sasl_mechanisms; |
1084 LmMessageNode *sasl_mechanisms; |
1086 |
1085 |
1087 starttls_node = lm_message_node_find_child (message->node, "starttls"); |
1086 starttls_node = lm_message_node_find_child (message->node, "starttls"); |
1088 if (connection->ssl && lm_old_socket_get_use_starttls (connection->socket)) { |
1087 if (connection->ssl && lm_old_socket_get_use_starttls (connection->socket)) { |
1089 if (starttls_node) { |
1088 if (starttls_node) { |
1151 "%s: can't send resource binding request\n", G_STRFUNC); |
1150 "%s: can't send resource binding request\n", G_STRFUNC); |
1152 connection_do_close (connection); |
1151 connection_do_close (connection); |
1153 } |
1152 } |
1154 } |
1153 } |
1155 |
1154 |
1156 old_auth = lm_message_node_find_child (message->node, "auth"); |
|
1157 |
|
1158 sasl_mechanisms = lm_message_node_find_child (message->node, "mechanisms"); |
1155 sasl_mechanisms = lm_message_node_find_child (message->node, "mechanisms"); |
1159 if (connection->use_sasl && old_auth != NULL && sasl_mechanisms == NULL) { |
1156 if (connection->use_sasl && sasl_mechanisms == NULL) { |
1160 g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_SASL, |
1157 g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_SASL, |
1161 "Server uses XEP-0078 (jabber iq auth) instead of SASL\n"); |
1158 "Server uses XEP-0078 (jabber iq auth) instead of SASL\n"); |
1162 /* So the server is XMPP1.0, but doesn't support SASL and uses |
1159 /* So the server is XMPP1.0, but doesn't support SASL and uses |
1163 * obsolete XEP-0078 instead. Let's cope. */ |
1160 * obsolete XEP-0078 instead. Let's cope. */ |
1164 |
1161 |