* pop.c: Fix ERRMAX typo (Bug#13925).

[bpt/emacs.git] / lib-src / pop.c

diff --git a/lib-src/pop.c b/lib-src/pop.c
index 74054e0..1f3f82b 100644 (file)
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -1,7 +1,7 @@
 /* pop.c: client routines for talking to a POP3-protocol post-office server
 
-Copyright (C) 1991, 1993, 1996-1997, 1999, 2001-2012
-  Free Software Foundation, Inc.
+Copyright (C) 1991, 1993, 1996-1997, 1999, 2001-2013 Free Software
+Foundation, Inc.
 
 Author: Jonathan Kamens <jik@security.ov.com>
 
@@ -1083,7 +1083,7 @@ socket_connection (char *host, int flags)
           if (it->ai_addrlen == sizeof (addr))
             {
               struct sockaddr_in *in_a = (struct sockaddr_in *) it->ai_addr;
-              memcpy (&addr.sin_addr, &in_a->sin_addr, sizeof (addr.sin_addr));
+              addr.sin_addr = in_a->sin_addr;
               if (! connect (sock, (struct sockaddr *) &addr, sizeof (addr)))
                 break;
             }
@@ -1198,7 +1198,7 @@ socket_connection (char *host, int flags)
            }
 #elif defined HAVE_KRB5_ERROR_E_TEXT
          if (err_ret && err_ret->e_text && **err_ret->e_text)
-           snprintf (pop_error + pop_error_len, ERRMAX - pop_error_len,
+           snprintf (pop_error + pop_error_len, ERROR_MAX - pop_error_len,
                      " [server says '%s']", *err_ret->e_text);
 #endif
          if (err_ret)