Relevant BUGIDs:

Purpose of commit: bugfix

Commit summary:
---------------
        * configure.in: Fixed have_key_syscalls test.

        * modules/pam_access/pam_access.c (from_match): Fixed IPv4 network match,
        removed AI_ADDRCONFIG flag.

diff --git a/ChangeLog b/ChangeLog
index 4f747367dcec3df1857fe350ffa623d284dbfd84..40b3c3f7a007c46cd72e0ee8705a6dffb2e99569 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-03  Dan Yefimov <dan@D00M.lightwave.net.ru>
+
+       * configure.in: Fixed have_key_syscalls test.
+
+       * modules/pam_access/pam_access.c (from_match): Fixed IPv4 network match,
+       removed AI_ADDRCONFIG flag.
+
 2006-06-30  Tomas Mraz <t8m@centrum.cz>
 
        * modules/pam_namespace/Makefile.am(EXTRA_DIST): Add namespace.init.

diff --git a/configure.in b/configure.in
index 4e4e2ec3266c91d0a2dd111a836c4707765e89ca..4c6d16048c8222691f5c526754a8323dbf435b60 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -465,7 +465,7 @@ if test $HAVE_KEY_MANAGEMENT = 1; then
 fi
 AC_SUBST([HAVE_KEY_MANAGEMENT], $HAVE_KEY_MANAGEMENT)
 
-AM_CONDITIONAL([HAVE_KEY_MANAGEMENT], [test ! -z "$have_key_syscalls"])
+AM_CONDITIONAL([HAVE_KEY_MANAGEMENT], [test "$have_key_syscalls" = 1])
 
 dnl Files to be created from when we run configure
 AC_OUTPUT(Makefile libpam/Makefile libpamc/Makefile libpamc/test/Makefile \

diff --git a/modules/pam_access/pam_access.c b/modules/pam_access/pam_access.c
index 2218ca9ac815e2b6efda26534b34660a3ed14fd4..ffb3c353a7935fa2dda1f6eaf8029b17e1b7e094 100644 (file)
--- a/modules/pam_access/pam_access.c
+++ b/modules/pam_access/pam_access.c
@@ -535,7 +535,7 @@ from_match (pam_handle_t *pamh UNUSED, char *tok, struct login_info *item)
       struct addrinfo hint;
 
       memset (&hint, '\0', sizeof (hint));
-      hint.ai_flags = AI_ADDRCONFIG | AI_CANONNAME;
+      hint.ai_flags = AI_CANONNAME;
       hint.ai_family = AF_INET;
 
       if (getaddrinfo (string, NULL, &hint, &res) != 0)
@@ -561,10 +561,10 @@ from_match (pam_handle_t *pamh UNUSED, char *tok, struct login_info *item)
                      freeaddrinfo (res);
                      return YES;
                    }
-                 runp = runp->ai_next;
                }
-             freeaddrinfo (res);
+             runp = runp->ai_next;
            }
+         freeaddrinfo (res);
        }
     } else  if (isipaddr(string, NULL, NULL) == YES) {
       /* Assume network/netmask with a IP of a host.  */
@@ -576,7 +576,7 @@ from_match (pam_handle_t *pamh UNUSED, char *tok, struct login_info *item)
       struct addrinfo hint;
 
       memset (&hint, '\0', sizeof (hint));
-      hint.ai_flags = AI_ADDRCONFIG | AI_CANONNAME;
+      hint.ai_flags = AI_CANONNAME;
       hint.ai_family = AF_UNSPEC;
 
       if (getaddrinfo (string, NULL, &hint, &res) != 0)