You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

68 lines
1.8 KiB

  1. --- a/modules/pam_access/pam_access.c
  2. +++ b/modules/pam_access/pam_access.c
  3. @@ -44,7 +44,7 @@
  4. #include <arpa/inet.h>
  5. #include <netdb.h>
  6. #include <sys/socket.h>
  7. -#ifdef HAVE_RPCSVC_YPCLNT_H
  8. +#ifdef HAVE_RPCSVC_YPCLNT_H && USE_NIS
  9. #include <rpcsvc/ypclnt.h>
  10. #endif
  11. #ifdef HAVE_LIBAUDIT
  12. --- a/modules/pam_unix/pam_unix_passwd.c
  13. +++ b/modules/pam_unix/pam_unix_passwd.c
  14. @@ -79,18 +79,18 @@
  15. #include "passverify.h"
  16. #include "bigcrypt.h"
  17. -#if (HAVE_YP_GET_DEFAULT_DOMAIN || HAVE_GETDOMAINNAME) && HAVE_YP_MASTER
  18. +#if (HAVE_YP_GET_DEFAULT_DOMAIN || HAVE_GETDOMAINNAME) && HAVE_YP_MASTER && USE_NIS
  19. # define HAVE_NIS
  20. #endif
  21. #ifdef HAVE_NIS
  22. # include <rpc/rpc.h>
  23. -# if HAVE_RPCSVC_YP_PROT_H
  24. +# if HAVE_RPCSVC_YP_PROT_H && USE_NIS
  25. # include <rpcsvc/yp_prot.h>
  26. # endif
  27. -# if HAVE_RPCSVC_YPCLNT_H
  28. +# if HAVE_RPCSVC_YPCLNT_H && USE_NIS
  29. # include <rpcsvc/ypclnt.h>
  30. # endif
  31. --- a/modules/pam_unix/support.c
  32. +++ b/modules/pam_unix/support.c
  33. @@ -19,7 +19,7 @@
  34. #include <ctype.h>
  35. #include <syslog.h>
  36. #include <sys/resource.h>
  37. -#ifdef HAVE_RPCSVC_YPCLNT_H
  38. +#ifdef HAVE_RPCSVC_YPCLNT_H && USE_NIS
  39. #include <rpcsvc/ypclnt.h>
  40. #endif
  41. @@ -402,7 +402,7 @@ int _unix_getpwnam(pam_handle_t *pamh, c
  42. }
  43. }
  44. -#if defined(HAVE_YP_GET_DEFAULT_DOMAIN) && defined (HAVE_YP_BIND) && defined (HAVE_YP_MATCH) && defined (HAVE_YP_UNBIND)
  45. +#if defined(HAVE_YP_GET_DEFAULT_DOMAIN) && defined (HAVE_YP_BIND) && defined (HAVE_YP_MATCH) && defined (HAVE_YP_UNBIND) && (USE_NIS)
  46. if (!matched && nis) {
  47. char *userinfo = NULL, *domain = NULL;
  48. int len = 0, i;
  49. --- a/modules/pam_unix/yppasswd_xdr.c
  50. +++ b/modules/pam_unix/yppasswd_xdr.c
  51. @@ -15,6 +15,10 @@
  52. #ifdef HAVE_RPC_RPC_H
  53. #include <rpc/rpc.h>
  54. +#ifdef USE_NIS
  55. +#include <rpcsvc/yp_prot.h>
  56. +#include <rpcsvc/ypclnt.h>
  57. +#endif
  58. #include "yppasswd.h"
  59. bool_t