diff options
| author | Tomas Mraz <tm@t8m.info> | 2006-07-03 07:23:29 +0000 |
|---|---|---|
| committer | Tomas Mraz <tm@t8m.info> | 2006-07-03 07:23:29 +0000 |
| commit | c938ec2c5c0a796c4a69b8946884a49e266bdea2 (patch) | |
| tree | 419763ebc8b35659f9ce8caaee46dd573a56a28c | |
| parent | a423aae3786fa53b9db66865b603cf21955f37d7 (diff) | |
| download | pam-c938ec2c5c0a796c4a69b8946884a49e266bdea2.tar.gz pam-c938ec2c5c0a796c4a69b8946884a49e266bdea2.tar.bz2 pam-c938ec2c5c0a796c4a69b8946884a49e266bdea2.zip | |
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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | modules/pam_access/pam_access.c | 8 |
3 files changed, 12 insertions, 5 deletions
@@ -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 4e4e2ec3..4c6d1604 100644 --- 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 2218ca9a..ffb3c353 100644 --- 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) |