aboutsummaryrefslogtreecommitdiff
path: root/lib/libpam
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2016-04-11 15:24:59 +0000
committerGlen Barber <gjb@FreeBSD.org>2016-04-11 15:24:59 +0000
commit876d357fa7bc8aeb8d050dd8fe227dd4fd8ed4df (patch)
treef5194d1ce3fa45b67cf63080fc519fec83abc57a /lib/libpam
parent7a888f325e494860d6158821dfbcef85a3310783 (diff)
parentb2d7040c1cc76c5bbbf54cd2351b4d137b8c22b6 (diff)
downloadsrc-876d357fa7bc8aeb8d050dd8fe227dd4fd8ed4df.tar.gz
src-876d357fa7bc8aeb8d050dd8fe227dd4fd8ed4df.zip
MFH
Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/projects/release-pkg/; revision=297824
Diffstat (limited to 'lib/libpam')
-rw-r--r--lib/libpam/modules/pam_krb5/pam_krb5.c2
-rw-r--r--lib/libpam/modules/pam_login_access/login_access.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/libpam/modules/pam_krb5/pam_krb5.c b/lib/libpam/modules/pam_krb5/pam_krb5.c
index 19592e3fcdfc..8c72e288315a 100644
--- a/lib/libpam/modules/pam_krb5/pam_krb5.c
+++ b/lib/libpam/modules/pam_krb5/pam_krb5.c
@@ -860,7 +860,7 @@ verify_krb_v5_tgt(krb5_context context, krb5_ccache ccache,
services[0] = "host";
services[1] = pam_service;
services[2] = NULL;
- keyblock = 0;
+ keyblock = NULL;
retval = -1;
for (service = &services[0]; *service != NULL; service++) {
retval = krb5_sname_to_principal(context, NULL, *service,
diff --git a/lib/libpam/modules/pam_login_access/login_access.c b/lib/libpam/modules/pam_login_access/login_access.c
index dacb9d7c432e..9b6d25798339 100644
--- a/lib/libpam/modules/pam_login_access/login_access.c
+++ b/lib/libpam/modules/pam_login_access/login_access.c
@@ -124,7 +124,7 @@ list_match(char *list, const char *item,
* the match is affected by any exceptions.
*/
- for (tok = strtok(list, sep); tok != 0; tok = strtok((char *) 0, sep)) {
+ for (tok = strtok(list, sep); tok != NULL; tok = strtok((char *) 0, sep)) {
if (strcasecmp(tok, "EXCEPT") == 0) /* EXCEPT: give up */
break;
if ((match = (*match_fn)(tok, item)) != 0) /* YES */
@@ -135,7 +135,7 @@ list_match(char *list, const char *item,
if (match != NO) {
while ((tok = strtok((char *) 0, sep)) && strcasecmp(tok, "EXCEPT"))
/* VOID */ ;
- if (tok == 0 || list_match((char *) 0, item, match_fn) == NO)
+ if (tok == NULL || list_match((char *) 0, item, match_fn) == NO)
return (match);
}
return (NO);