[gnome-keyring] [pam] Fix use of constant not found in Solaris or FreeBSD.
- From: Stefan Walter <stefw src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-keyring] [pam] Fix use of constant not found in Solaris or FreeBSD.
- Date: Fri, 31 Jul 2009 03:27:41 +0000 (UTC)
commit 9c505e89975af6d8849987e4d1ecb88d1e8482f9
Author: Stef Walter <stef memberwebs com>
Date: Fri Jul 31 03:25:32 2009 +0000
[pam] Fix use of constant not found in Solaris or FreeBSD.
The PAM_BAD_ITEM constant is linux specific. We don't need to use it,
so I've removed usage. Fixes bug #590268
pam/gkr-pam-module.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/pam/gkr-pam-module.c b/pam/gkr-pam-module.c
index d3f72f1..1137e35 100644
--- a/pam/gkr-pam-module.c
+++ b/pam/gkr-pam-module.c
@@ -230,7 +230,7 @@ evaluate_inlist (const char *needle, const char *haystack)
const char *remaining;
if (!needle)
- return PAM_BAD_ITEM;
+ return 0;
remaining = haystack;
@@ -244,7 +244,7 @@ evaluate_inlist (const char *needle, const char *haystack)
item += strlen (needle);
/* is item really needle? */
if (*item == '\0' || *item == ',')
- return PAM_SUCCESS;
+ return 1;
}
remaining = strchr (item, ',');
@@ -255,7 +255,7 @@ evaluate_inlist (const char *needle, const char *haystack)
++remaining;
}
- return PAM_BAD_ITEM;
+ return 0;
}
/* -----------------------------------------------------------------------------
@@ -821,7 +821,7 @@ parse_args (pam_handle_t *ph, int argc, const char **argv)
} else if (strncmp (argv[i], "only_if=", only_if_len) == 0) {
const char *value = argv[i] + only_if_len;
- if (evaluate_inlist (svc, value) != PAM_SUCCESS)
+ if (evaluate_inlist (svc, value))
args |= ARG_IGNORE_SERVICE;
} else if (strcmp (argv[i], "use_authtok") == 0) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]