Merge from trunk.

4 files changed, 21 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 15f742ed91a..ae54b3733f6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * mail/smtpmail.el (smtpmail-via-smtp): Query the user for
+        password if we get errors 550 to 554.
+
 2011-07-16  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * net/gnutls.el (gnutls-log-level): Removed.
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 073e2fa4a3c..cc46660712f 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -788,10 +788,11 @@ The list is in preference order.")
                   nil)
                  ((and auth-mechanisms
                        (not ask-for-password)
-                       (= (car result) 550))
-                  ;; We got a "550 relay not permitted", and the server
-                  ;; accepts credentials, so we try again, but ask for a
-                  ;; password first.
+                       (>= (car result) 550)
+                       (<= (car result) 554))
+                  ;; We got a "550 relay not permitted" (or the like),
+                  ;; and the server accepts credentials, so we try
+                  ;; again, but ask for a password first.
                   (smtpmail-send-command process "QUIT")
                   (smtpmail-read-response process)
                   (delete-process process)
diff --git a/src/ChangeLog b/src/ChangeLog
index 9e46b7d3318..1dcf39498f3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -242,6 +242,14 @@
         Use EMACS_INT, not EMACS_UINT, for sizes.  The code works equally
         well either way, and we prefer signed to unsigned.
 
+2011-07-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * fileio.c (Fcopy_file): Pacify gcc re fchown.  (Bug#9002)
+        This works around a problem with the previous change to Fcopy_file.
+        Recent glibc declares fchown with __attribute__((warn_unused_result)),
+        and without this change, GCC might complain about discarding
+        fchown's return value.
+
 2011-07-16  Juanma Barranquero  <lekktu@gmail.com>
 
         * makefile.w32-in (GLOBAL_SOURCES): Add gnutls.c (followup to bug#9059).
diff --git a/src/fileio.c b/src/fileio.c
index c67bea79bd3..bdea302a0d6 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -38,6 +38,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <selinux/context.h>
 #endif
 
+#include <ignore-value.h>
+
 #include "lisp.h"
 #include "intervals.h"
 #include "buffer.h"
@@ -1960,7 +1962,7 @@ on the system, we copy the SELinux context of FILE to NEWNAME.  */)
   if (input_file_statable_p)
     {
       if (!NILP (preserve_uid_gid))
-        fchown (ofd, st.st_uid, st.st_gid);
+        ignore_value (fchown (ofd, st.st_uid, st.st_gid));
       if (fchmod (ofd, st.st_mode & 07777) != 0)
         report_file_error ("Doing chmod", Fcons (newname, Qnil));
     }