rpms/stunnel/devel stunnel-4.25-EAI_SERVICE.patch, NONE, 1.1 stunnel.spec, 1.51, 1.52

[Miloslav Trmac (mitr)]

Author: mitr

Update of /cvs/pkgs/rpms/stunnel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24490

Modified Files:
	stunnel.spec 
Added Files:
	stunnel-4.25-EAI_SERVICE.patch 
Log Message:
* Sun Jun  8 2008 Miloslav Trmač <mitr at redhat.com> - 4.25-2
- Use a clearer error message if the service name is unknown in "accept"
  Resolves: #450344


stunnel-4.25-EAI_SERVICE.patch:

--- NEW FILE stunnel-4.25-EAI_SERVICE.patch ---
diff -up stunnel-4.25/src/resolver.c~ stunnel-4.25/src/resolver.c
--- stunnel-4.25/src/resolver.c~	2008-03-26 20:09:48.000000000 +0100
+++ stunnel-4.25/src/resolver.c	2008-06-08 06:43:43.000000000 +0200
@@ -124,8 +124,11 @@ int hostport2addrlist(SOCKADDR_LIST *add
 
     err=getaddrinfo(hostname, portname, &hints, &res);
     if(err) {
-        s_log(LOG_ERR, "Error resolving '%s': %s",
-            hostname, s_gai_strerror(err));
+        if(err == EAI_SERVICE)
+	    s_log(LOG_ERR, "Unknown TCP service '%s'", portname);
+	else
+	    s_log(LOG_ERR, "Error resolving '%s': %s",
+		hostname, s_gai_strerror(err));
         if(res)
             freeaddrinfo(res);
         return 0; /* Error */


Index: stunnel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stunnel/devel/stunnel.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- stunnel.spec	2 Jun 2008 01:11:51 -0000	1.51
+++ stunnel.spec	8 Jun 2008 05:01:32 -0000	1.52
@@ -1,7 +1,7 @@
 Summary: An SSL-encrypting socket wrapper
 Name: stunnel
 Version: 4.25
-Release: 1
+Release: 2
 License: GPLv2
 Group: Applications/Internet
 URL: http://stunnel.mirt.net/
@@ -14,6 +14,7 @@
 Source6: stunnel-pop3s-client.conf
 Patch0: stunnel-4.08-authpriv.patch
 Patch1: stunnel-4.18-sample.patch
+Patch2: stunnel-4.25-EAI_SERVICE.patch
 Buildroot: %{_tmppath}/stunnel-root
 # util-linux is needed for rename
 BuildRequires: openssl-devel, pkgconfig, tcp_wrappers-devel, util-linux
@@ -27,6 +28,7 @@
 %setup -q
 %patch0 -p1 -b .authpriv
 %patch1 -p1 -b .sample
+%patch2 -p1 -b .EAI_SERVICE
 
 iconv -f iso-8859-1 -t utf-8 < doc/stunnel.fr.8 > doc/stunnel.fr.8_
 mv doc/stunnel.fr.8_ doc/stunnel.fr.8
@@ -81,6 +83,10 @@
 %exclude %{_sysconfdir}/stunnel/*
 
 %changelog
+* Sun Jun  8 2008 Miloslav Trmač <mitr at redhat.com> - 4.25-2
+- Use a clearer error message if the service name is unknown in "accept"
+  Resolves: #450344
+
 * Mon Jun  2 2008 Miloslav Trmač <mitr at redhat.com> - 4.25-1
 - Update to stunnel-4.25