From: Andreas Schwab <schwab@linux-m68k.org>
Date: Thu, 3 Jun 2010 22:47:35 +0000 (+0200)
Subject: * process.c (conv_lisp_to_sockaddr): Fix conversion of IPv4
X-Git-Tag: emacs-pretest-23.2.90~139^2~147
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0eb7675e675e6b3c241e13dca1b9be898b534924;p=emacs.git

* process.c (conv_lisp_to_sockaddr): Fix conversion of IPv4
address.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 5ce7e4a11b2..79fde00d9ad 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-03  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* process.c (conv_lisp_to_sockaddr): Fix conversion of IPv4
+	address.
+
 2010-06-03  Juanma Barranquero  <lekktu@gmail.com>
 
 	* ccl.c (Fccl_program_p): Fix typo in docstring.
diff --git a/src/process.c b/src/process.c
index 53cc42f223e..7adc114075e 100644
--- a/src/process.c
+++ b/src/process.c
@@ -2540,9 +2540,11 @@ conv_lisp_to_sockaddr (family, address, sa, len)
 		ip6[i] = ntohs (j);
 	      }
 	  sa->sa_family = family;
+	  return;
 	}
 #endif
-      return;
+      else
+	return;
     }
   else if (STRINGP (address))
     {