X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmod_helsinki.cpp;h=af6b211a940f64e0887b7969cd457537edff2009;hb=343901a04fab67869d432a4c93f5c6e1046ae6a5;hp=5558c87d3265f544baff01b55574243b2730b75e;hpb=7163b9178c89a7fc866dd33309ca6a1067758b92;p=yazproxy-moved-to-github.git diff --git a/src/mod_helsinki.cpp b/src/mod_helsinki.cpp index 5558c87..af6b211 100644 --- a/src/mod_helsinki.cpp +++ b/src/mod_helsinki.cpp @@ -1,4 +1,4 @@ -/* $Id: mod_helsinki.cpp,v 1.1 2006-03-25 10:56:28 adam Exp $ +/* $Id: mod_helsinki.cpp,v 1.4 2007-10-08 08:14:02 adam Exp $ Copyright (c) 1998-2005, Index Data. This file is part of the yaz-proxy. @@ -29,7 +29,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include -#if HAVE_XSLT +#if YAZ_HAVE_XSLT #include #include #include @@ -125,7 +125,7 @@ int my_authenticate(void *user_handle, { // see if we have an "args" attribute const char *args = 0; -#if HAVE_XSLT +#if YAZ_HAVE_XSLT xmlNodePtr ptr = (xmlNodePtr) element_ptr; struct _xmlAttr *attr; @@ -138,7 +138,7 @@ int my_authenticate(void *user_handle, #endif // args holds args (or NULL if none are provided) - yaz_log(YLOG_LOG, "Authentication: authenticating user %s, address %s", user ? user : "-", peer_IP ? peer_IP : "-"); + yaz_log(YLOG_LOG, "Authentication: authenticating user %s, address %s", user ? user : "(none)", peer_IP ? peer_IP : "-"); // authentication handler char user_file[255], ip_file[255]; @@ -146,7 +146,7 @@ int my_authenticate(void *user_handle, *ip_file = '\0'; sscanf(args, "%254[^:]:%254s", user_file, ip_file); - yaz_log(YLOG_LOG, "Authentication: user file: %s, ip file: %s", user_file, ip_file); + yaz_log(YLOG_DEBUG, "Authentication: user file: %s, ip file: %s", user_file, ip_file); // Check if the IP address is listed in the file of allowed address ranges. // The format of the file: @@ -156,11 +156,13 @@ int my_authenticate(void *user_handle, int status = YAZPROXY_RET_PERM; if (ip_file && peer_IP) { - yaz_log(YLOG_LOG, "Authentication: checking ip address"); + yaz_log(YLOG_DEBUG, "Authentication: checking ip address"); const char *pIP = peer_IP; if (strncmp(pIP, "tcp:", 4) == 0) pIP += 4; + if (strncmp(pIP, "::ffff:", 7) == 0) + pIP += 7; IP_ADDRESS peer_address; if (str_to_address(pIP, &peer_address) != 4) yaz_log(YLOG_WARN, "Authentication: could not decode peer IP address %s properly", pIP); @@ -202,7 +204,7 @@ int my_authenticate(void *user_handle, if (!user || !password || !*user_file) { - yaz_log(YLOG_WARN, "Authentication: no user name, password or user file specified"); + yaz_log(YLOG_LOG, "Authentication: anonymous authentication failed"); return YAZPROXY_RET_PERM; }