fix smtp auth when fields are empty

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 2e5a6f4bc8f78d072c2450988c292237bbc7e1ac..e1987c31fc88461b831d94284ea72336c579e526 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-07-14 [colin]     0.9.12cvs18.10
+
+       * src/send_message.c
+               Fix smtp auth when user is null or empty
+

 2004-07-13 [colin]     0.9.12cvs18.9
 
        * src/gtk/quicksearch.c
 2004-07-13 [colin]     0.9.12cvs18.9
 
        * src/gtk/quicksearch.c

diff --git a/PATCHSETS b/PATCHSETS
index 59246e6dcf67561fb3d58fb50e5128083ba95a9f..f7ed383921f14627901defe6339e2c63c71223d8 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -23,3 +23,4 @@
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gtk/quicksearch.c; ) > 0.9.12cvs18.7.patchset
 ( cvs diff -u -r 1.56.2.14 -r 1.56.2.15 src/pop.c; ) > 0.9.12cvs18.8.patchset
 ( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/gtk/quicksearch.c; ) > 0.9.12cvs18.9.patchset
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gtk/quicksearch.c; ) > 0.9.12cvs18.7.patchset
 ( cvs diff -u -r 1.56.2.14 -r 1.56.2.15 src/pop.c; ) > 0.9.12cvs18.8.patchset
 ( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/gtk/quicksearch.c; ) > 0.9.12cvs18.9.patchset

+( cvs diff -u -r 1.17.2.3 -r 1.17.2.4 src/send_message.c; ) > 0.9.12cvs18.10.patchset

diff --git a/configure.ac b/configure.ac
index de8e5e1811110b6ad3c153da54bfdd6fb4e27b49..d321acfca0f0f623f1077e20206aa70841f69d63 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=18
 EXTRA_RELEASE=
 BINARY_AGE=0
 EXTRA_VERSION=18
 EXTRA_RELEASE=

-EXTRA_GTK2_VERSION=.9
+EXTRA_GTK2_VERSION=.10

 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/send_message.c b/src/send_message.c
index 0532f15cea1e1c9d99b2bd234e18013a5f363ed1..e49c01f367308a56044403c7a66de6c50335fb26 100644 (file)
--- a/src/send_message.c
+++ b/src/send_message.c
@@ -307,8 +307,7 @@ gint send_message_smtp(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp)
 
        if (ac_prefs->use_smtp_auth) {
                smtp_session->forced_auth_type = ac_prefs->smtp_auth_type;
 
        if (ac_prefs->use_smtp_auth) {
                smtp_session->forced_auth_type = ac_prefs->smtp_auth_type;

-
-               if (ac_prefs->smtp_userid) {
+               if (ac_prefs->smtp_userid && strlen(ac_prefs->smtp_userid)) {

                        smtp_session->user = g_strdup(ac_prefs->smtp_userid);
                        if (ac_prefs->smtp_passwd)
                                smtp_session->pass =
                        smtp_session->user = g_strdup(ac_prefs->smtp_userid);
                        if (ac_prefs->smtp_passwd)
                                smtp_session->pass =