rpms/authd/devel authd-1.4.3-ipv6-mapping.patch, NONE, 1.1 authd.spec, 1.30, 1.31

[fedora-cvs-commits at redhat.com]

Author: stransky

Update of /cvs/dist/rpms/authd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8822

Modified Files:
	authd.spec 
Added Files:
	authd-1.4.3-ipv6-mapping.patch 
Log Message:
fix for #150502 (authd doesn't map IPv6 to IPv4 from xinetd)

authd-1.4.3-ipv6-mapping.patch:
 authd.c |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

--- NEW FILE authd-1.4.3-ipv6-mapping.patch ---
--- authd-1.4.3/authd.c.old	2005-06-24 16:08:04.000000000 +0200
+++ authd-1.4.3/authd.c	2005-06-24 16:12:06.000000000 +0200
@@ -485,8 +485,19 @@
 
                 assert(opt.mapped != NULL);
                 strcpy(peer_128, opt.mapped); strcpy(host_128, opt.mapped);
-                strncpy(host_128, addr_hex, z);
-                strncpy(peer_128, peer_addr_hex, strlen(peer_addr_hex));
+
+                /*
+                   If mapping IPV4 to IPV6 space is enabled,
+                   take only last 4 numbers of IPV6
+                */
+                if(opt.mapped[0]) {
+                  strncpy(host_128, addr_hex+z-8, 8);
+                  strncpy(peer_128, peer_addr_hex, 8);
+                } else {
+                  strncpy(host_128, addr_hex, z);
+                  strncpy(peer_128, peer_addr_hex, strlen(peer_addr_hex));
+                }
+
                 if (strcmp(peer_128, host_128) != 0) return addr;
             }
             // hex addr must have even number of digits


Index: authd.spec
===================================================================
RCS file: /cvs/dist/rpms/authd/devel/authd.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- authd.spec	8 Apr 2005 10:05:01 -0000	1.30
+++ authd.spec	24 Jun 2005 14:22:15 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: a RFC 1413 ident protocol daemon
 Name: authd
 Version: 1.4.3
-Release: 4.devel
+Release: 5.devel
 License: GPL
 Group: System Environment/Daemons
 Obsoletes: pidentd
@@ -10,8 +10,10 @@
 Source0: %{name}-%{version}.tar.gz
 Patch0: authd-1.4.3-gcc4.patch
 Patch1: authd-1.4.3-disable.patch
+Patch2: authd-1.4.3-ipv6-mapping.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: openssl-devel
+Prereq: xinetd
 
 %description
 authd is a small and fast RFC 1413 ident protocol daemon
@@ -23,6 +25,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1 -b .ipv6map
 sed -i -e "s|/etc|%{_sysconfdir}|" config.h
 
 %build
@@ -63,6 +66,10 @@
 %{_sbindir}/in.authd
 
 %changelog
+* Thu Jun 24 2005 Martin Stransky <stransky at redhat.com> - 1.4.3-5.devel
+- add xinetd to Prereq
+- fix for #150502 (authd doesn't map IPv6 to IPv4 from xinetd)
+
 * Fri Apr  8 2005 Martin Stransky <stransky at redhat.com> - 1.4.3-4.devel
 - clear last update