Fix some bungling of the remote port in rfc1413.c so that

IdentityCheck retrieves the proper user id instead of failing
and thus always returning "nobody."

Submitted by:    Dick Streefland <Dick.Streefland@xs4all.nl>
Reviewed by:     Jeff Trawick

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91632 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index a942ac295ab0dac642ee73497af2812e9e87a875..1ad9ee67a976b5593b0b5baaa51c194ea8f1d857 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
 Changes with Apache 2.0.27-dev
 
+  *) Fix some bungling of the remote port in rfc1413.c so that 
+     IdentityCheck retrieves the proper user id instead of failing
+     and thus always returning "nobody."  
+     [Dick Streefland <Dick.Streefland@xs4all.nl>]
+
   *) Introduced thread saftey for mod_rewrite's internal cache.
      [Brian Pane <bpane@pacbell.net>]
 

diff --git a/server/rfc1413.c b/server/rfc1413.c
index 669c9e97c64c032a75ddce601de99d890b723dee..fd2e99c159716740aa4796494adb6d87a0a7b4d0 100644 (file)
--- a/server/rfc1413.c
+++ b/server/rfc1413.c
@@ -195,11 +195,9 @@ static apr_status_t rfc1413_query(apr_socket_t *sock, conn_rec *conn,
     char buffer[RFC1413_MAXDATA + 1];
     char user[RFC1413_USERLEN + 1];    /* XXX */
     apr_size_t buflen;
-    apr_sockaddr_t *localsa;
 
-    apr_socket_addr_get(&localsa, APR_LOCAL, sock);
-    apr_sockaddr_port_get(&sav_our_port, localsa);
-    sav_rmt_port = RFC1413_PORT;
+    apr_sockaddr_port_get(&sav_our_port, conn->local_addr);
+    apr_sockaddr_port_get(&sav_rmt_port, conn->remote_addr);
 
     /* send the data */
     buflen = apr_snprintf(buffer, sizeof(buffer), "%hu,%hu\r\n", sav_rmt_port,