Alex Kiernan's patch for a problem with libradius.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index fe529c45bfd1928f38c8c73b086741707a19c02e..1ae87c6279ba68b2fe9e2fc5eba5b1b2233ed1fd 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.361 2006/06/27 15:38:07 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.362 2006/06/28 13:59:12 ph10 Exp $

 
 Change log file for Exim from version 4.21
 -------------------------------------------
 
 Change log file for Exim from version 4.21
 -------------------------------------------


@@ -49,6 +49,9 @@ PH/04 Applied Magnus Holmgren's patch to fix Bugzilla #98: transport's home
       directory not expanded when it should be if an expanded home directory
       was set for the address (which is overridden by the transport).
 
       directory not expanded when it should be if an expanded home directory
       was set for the address (which is overridden by the transport).
 

+PH/05 Applied Alex Kiernan's patch to fix Bugzilla #99: a problem with
+      libradius.
+

 
 Exim version 4.62
 -----------------
 
 Exim version 4.62
 -----------------

diff --git a/src/ACKNOWLEDGMENTS b/src/ACKNOWLEDGMENTS
index 8eb06f40260d1d4d897db8fbd77550dfb2f37ff4..3a8bfbb9fb5e60c02f5f1cbde30b692690939622 100644 (file)
--- a/src/ACKNOWLEDGMENTS
+++ b/src/ACKNOWLEDGMENTS
@@ -1,4 +1,4 @@
-$Cambridge: exim/src/ACKNOWLEDGMENTS,v 1.47 2006/06/27 14:34:26 ph10 Exp $
+$Cambridge: exim/src/ACKNOWLEDGMENTS,v 1.48 2006/06/28 13:59:13 ph10 Exp $

 
 EXIM ACKNOWLEDGEMENTS
 
 
 EXIM ACKNOWLEDGEMENTS
 


@@ -20,7 +20,7 @@ relatively small patches.
 Philip Hazel
 
 Lists created: 20 November 2002
 Philip Hazel
 
 Lists created: 20 November 2002

-Last updated:  27 June 2006
+Last updated:  28 June 2006

 
 
 THE OLD LIST
 
 
 THE OLD LIST


@@ -167,7 +167,7 @@ John Jetmore              Writing and maintaining the 'exipick' utility
 Bob Johannessen           Patch for Sieve envelope tests bug
                           Patch for negative uid/gid bug
 Christian Kellner         Patch for LDAP dereferencing
 Bob Johannessen           Patch for Sieve envelope tests bug
                           Patch for negative uid/gid bug
 Christian Kellner         Patch for LDAP dereferencing

-Alex Kiernan              Patch for libradius
+Alex Kiernan              Patches for libradius

                           Diagnosis of milliwait clock-backwards bug
                           Patch for BDB 4.3 API change
 Tom Kistner               SPA server code
                           Diagnosis of milliwait clock-backwards bug
                           Patch for BDB 4.3 API change
 Tom Kistner               SPA server code

diff --git a/src/src/auths/call_radius.c b/src/src/auths/call_radius.c
index 7faa83d8f6db81c23d8cc083f9ca4c0102883d22..90e2e68806d7fc3b36656d778fc4fb1eb372ed80 100644 (file)
--- a/src/src/auths/call_radius.c
+++ b/src/src/auths/call_radius.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/auths/call_radius.c,v 1.5 2006/02/07 11:19:01 ph10 Exp $ */
+/* $Cambridge: exim/src/src/auths/call_radius.c,v 1.6 2006/06/28 13:59:13 ph10 Exp $ */

 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *


@@ -177,7 +177,8 @@ if (rad_config(h, RADIUS_CONFIG_FILE) != 0 ||
     rad_create_request(h, RAD_ACCESS_REQUEST) != 0 ||
     rad_put_string(h, RAD_USER_NAME, CS user) != 0 ||
     rad_put_string(h, RAD_USER_PASSWORD, CS radius_args) != 0 ||
     rad_create_request(h, RAD_ACCESS_REQUEST) != 0 ||
     rad_put_string(h, RAD_USER_NAME, CS user) != 0 ||
     rad_put_string(h, RAD_USER_PASSWORD, CS radius_args) != 0 ||

-    rad_put_int(h, RAD_SERVICE_TYPE, RAD_AUTHENTICATE_ONLY) != 0)
+    rad_put_int(h, RAD_SERVICE_TYPE, RAD_AUTHENTICATE_ONLY) != 0 ||
+    rad_put_string(h, RAD_NAS_IDENTIFIER, CS primary_hostname) != 0)

   {
   *errptr = string_sprintf("RADIUS: %s", rad_strerror(h));
   result = ERROR;
   {
   *errptr = string_sprintf("RADIUS: %s", rad_strerror(h));
   result = ERROR;