diff options
author | Steve Langasek <vorlon@debian.org> | 2010-07-29 20:16:39 -0700 |
---|---|---|
committer | Steve Langasek <vorlon@debian.org> | 2019-01-08 21:32:38 -0800 |
commit | 655c7a8843261079fecf0b6e15de77972a0eb708 (patch) | |
tree | 167aeb717538bdc9f685a652009038d586530779 /modules/pam_unix/support.c | |
parent | 6ce511785e4b9751ef184236c2cf8f63bc25f512 (diff) | |
parent | 8645d4f5131d25692dfd78d3e1c46b03f33febf3 (diff) | |
download | pam-655c7a8843261079fecf0b6e15de77972a0eb708.tar.gz pam-655c7a8843261079fecf0b6e15de77972a0eb708.tar.bz2 pam-655c7a8843261079fecf0b6e15de77972a0eb708.zip |
merge from trunk
Diffstat (limited to 'modules/pam_unix/support.c')
-rw-r--r-- | modules/pam_unix/support.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/modules/pam_unix/support.c b/modules/pam_unix/support.c index 050e0dc1..2a47d157 100644 --- a/modules/pam_unix/support.c +++ b/modules/pam_unix/support.c @@ -19,7 +19,9 @@ #include <ctype.h> #include <syslog.h> #include <sys/resource.h> +#ifdef HAVE_RPCSVC_YPCLNT_H #include <rpcsvc/ypclnt.h> +#endif #include <security/_pam_macros.h> #include <security/pam_modules.h> @@ -275,6 +277,7 @@ int _unix_getpwnam(pam_handle_t *pamh, const char *name, } } +#if defined(HAVE_YP_GET_DEFAULT_DOMAIN) && defined (HAVE_YP_BIND) && defined (HAVE_YP_MATCH) && defined (HAVE_YP_UNBIND) if (!matched && nis) { char *userinfo = NULL, *domain = NULL; int len = 0, i; @@ -293,6 +296,10 @@ int _unix_getpwnam(pam_handle_t *pamh, const char *name, } } } +#else + /* we don't have NIS support, make compiler happy. */ + nis = 0; +#endif if (matched && (ret != NULL)) { *ret = NULL; |