diff -urp Linux-PAM-0.99.9.0/Makefile.am Linux-PAM-0.99.9.0-nonis/Makefile.am --- Linux-PAM-0.99.9.0/Makefile.am 2007-01-17 02:26:09.000000000 -0800 +++ Linux-PAM-0.99.9.0-nonis/Makefile.am 2007-12-11 15:36:38.000000000 -0800 @@ -5,9 +5,9 @@ AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 check-news if STATIC_MODULES -SUBDIRS = modules libpam libpamc libpam_misc tests po conf doc examples xtests +SUBDIRS = modules libpam libpamc libpam_misc po conf else -SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc examples xtests +SUBDIRS = libpam libpamc libpam_misc modules po conf endif CLEANFILES = *~ diff -urp Linux-PAM-0.99.9.0/Makefile.in Linux-PAM-0.99.9.0-nonis/Makefile.in --- Linux-PAM-0.99.9.0/Makefile.in 2007-10-09 03:07:35.000000000 -0700 +++ Linux-PAM-0.99.9.0-nonis/Makefile.in 2007-12-11 15:36:08.000000000 -0800 @@ -71,8 +71,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc \ - examples xtests +DIST_SUBDIRS = libpam libpamc libpam_misc modules po conf DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -242,8 +241,8 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 check-news -@STATIC_MODULES_FALSE@SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc examples xtests -@STATIC_MODULES_TRUE@SUBDIRS = modules libpam libpamc libpam_misc tests po conf doc examples xtests +@STATIC_MODULES_FALSE@SUBDIRS = libpam libpamc libpam_misc modules po conf +@STATIC_MODULES_TRUE@SUBDIRS = modules libpam libpamc libpam_misc po conf CLEANFILES = *~ M4_FILES = m4/codeset.m4 m4/gettext.m4 m4/glibc21.m4 m4/glibc2.m4 \ m4/iconv.m4 m4/intdiv0.m4 m4/intmax.m4 m4/inttypes_h.m4 \ diff -urp Linux-PAM-0.99.9.0/modules/pam_access/pam_access.c Linux-PAM-0.99.9.0-nonis/modules/pam_access/pam_access.c --- Linux-PAM-0.99.9.0/modules/pam_access/pam_access.c 2007-08-29 03:42:24.000000000 -0700 +++ Linux-PAM-0.99.9.0-nonis/modules/pam_access/pam_access.c 2007-12-11 14:16:10.000000000 -0800 @@ -41,7 +41,11 @@ #include #include #include + +#ifdef NIS #include +#endif + #include #include #include @@ -458,8 +462,9 @@ netgroup_match (pam_handle_t *pamh, cons char *mydomain = NULL; int retval; +#ifdef NIS yp_get_default_domain(&mydomain); - +#endif retval = innetgr (netgroup, machine, user, mydomain); if (pam_access_debug == YES) diff -urp Linux-PAM-0.99.9.0/modules/pam_unix/Makefile.am Linux-PAM-0.99.9.0-nonis/modules/pam_unix/Makefile.am --- Linux-PAM-0.99.9.0/modules/pam_unix/Makefile.am 2007-09-03 00:57:31.000000000 -0700 +++ Linux-PAM-0.99.9.0-nonis/modules/pam_unix/Makefile.am 2007-12-11 14:51:25.000000000 -0800 @@ -29,8 +29,8 @@ pam_unix_la_LDFLAGS = -no-undefined -avo @LIBCRYPT@ @LIBSELINUX@ securelib_LTLIBRARIES = pam_unix.la -noinst_HEADERS = md5.h support.h yppasswd.h bigcrypt.h +noinst_HEADERS = md5.h support.h bigcrypt.h sbin_PROGRAMS = unix_chkpwd @@ -42,7 +42,7 @@ noinst_PROGRAMS = bigcrypt pam_unix_la_SOURCES = bigcrypt.c pam_unix_acct.c \ pam_unix_auth.c pam_unix_passwd.c pam_unix_sess.c support.c \ - yppasswd_xdr.c md5_good.c md5_broken.c + md5_good.c md5_broken.c bigcrypt_SOURCES = bigcrypt.c bigcrypt_main.c bigcrypt_CFLAGS = $(AM_CFLAGS) diff -urp Linux-PAM-0.99.9.0/modules/pam_unix/Makefile.in Linux-PAM-0.99.9.0-nonis/modules/pam_unix/Makefile.in --- Linux-PAM-0.99.9.0/modules/pam_unix/Makefile.in 2007-10-09 03:07:33.000000000 -0700 +++ Linux-PAM-0.99.9.0-nonis/modules/pam_unix/Makefile.in 2007-12-11 14:51:24.000000000 -0800 @@ -74,7 +74,7 @@ securelibLTLIBRARIES_INSTALL = $(INSTALL LTLIBRARIES = $(securelib_LTLIBRARIES) pam_unix_la_DEPENDENCIES = am_pam_unix_la_OBJECTS = bigcrypt.lo pam_unix_acct.lo pam_unix_auth.lo \ - pam_unix_passwd.lo pam_unix_sess.lo support.lo yppasswd_xdr.lo \ + pam_unix_passwd.lo pam_unix_sess.lo support.lo \ md5_good.lo md5_broken.lo pam_unix_la_OBJECTS = $(am_pam_unix_la_OBJECTS) pam_unix_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -294,10 +294,10 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/inclu @LIBCRYPT@ @LIBSELINUX@ securelib_LTLIBRARIES = pam_unix.la -noinst_HEADERS = md5.h support.h yppasswd.h bigcrypt.h +noinst_HEADERS = md5.h support.h bigcrypt.h pam_unix_la_SOURCES = bigcrypt.c pam_unix_acct.c \ pam_unix_auth.c pam_unix_passwd.c pam_unix_sess.c support.c \ - yppasswd_xdr.c md5_good.c md5_broken.c + md5_good.c md5_broken.c bigcrypt_SOURCES = bigcrypt.c bigcrypt_main.c bigcrypt_CFLAGS = $(AM_CFLAGS) @@ -435,7 +435,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unix_chkpwd-md5_broken.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unix_chkpwd-md5_good.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unix_chkpwd-unix_chkpwd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yppasswd_xdr.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff -urp Linux-PAM-0.99.9.0/modules/pam_unix/pam_unix_passwd.c Linux-PAM-0.99.9.0-nonis/modules/pam_unix/pam_unix_passwd.c --- Linux-PAM-0.99.9.0/modules/pam_unix/pam_unix_passwd.c 2007-04-30 03:47:30.000000000 -0700 +++ Linux-PAM-0.99.9.0-nonis/modules/pam_unix/pam_unix_passwd.c 2007-12-11 14:24:19.000000000 -0800 @@ -54,8 +54,11 @@ #include #include #include + +#ifdef NIS #include #include +#endif #include #include @@ -81,7 +84,10 @@ static security_context_t prev_context=N #include #include +#ifdef NIS #include "yppasswd.h" +#endif + #include "md5.h" #include "support.h" #include "bigcrypt.h" @@ -187,6 +193,7 @@ static char *crypt_md5_wrapper(const cha static char *getNISserver(pam_handle_t *pamh) { +#ifdef NIS char *master; char *domainname; int port, err; @@ -213,6 +220,9 @@ static char *getNISserver(pam_handle_t * return NULL; } return master; +#else + return NULL; +#endif } #ifdef WITH_SELINUX @@ -761,6 +771,7 @@ static int _do_setpass(pam_handle_t* pam if (on(UNIX_NIS, ctrl) && _unix_comesfromsource(pamh, forwho, 0, 1)) { if ((master=getNISserver(pamh)) != NULL) { +#ifdef NIS struct timeval timeout; struct yppasswd yppwd; CLIENT *clnt; @@ -824,6 +835,7 @@ static int _do_setpass(pam_handle_t* pam #ifdef DEBUG sleep(5); #endif +#endif } else { retval = PAM_TRY_AGAIN; } diff -urp Linux-PAM-0.99.9.0/modules/pam_unix/support.c Linux-PAM-0.99.9.0-nonis/modules/pam_unix/support.c --- Linux-PAM-0.99.9.0/modules/pam_unix/support.c 2007-08-31 05:49:51.000000000 -0700 +++ Linux-PAM-0.99.9.0-nonis/modules/pam_unix/support.c 2007-12-11 14:19:55.000000000 -0800 @@ -19,7 +19,10 @@ #include #include #include + +#ifdef NIS #include +#endif #include #include @@ -257,6 +260,7 @@ int _unix_getpwnam(pam_handle_t *pamh, c if (!matched && nis) { char *userinfo = NULL, *domain = NULL; int len = 0, i; +#ifdef NIS len = yp_get_default_domain(&domain); if (len == YPERR_SUCCESS) { len = yp_bind(domain); @@ -271,6 +275,7 @@ int _unix_getpwnam(pam_handle_t *pamh, c matched = 1; } } +#endif } if (matched && (ret != NULL)) { diff -urp Linux-PAM-0.99.9.0/modules/pam_unix/yppasswd.h Linux-PAM-0.99.9.0-nonis/modules/pam_unix/yppasswd.h --- Linux-PAM-0.99.9.0/modules/pam_unix/yppasswd.h 2000-06-20 15:12:08.000000000 -0700 +++ Linux-PAM-0.99.9.0-nonis/modules/pam_unix/yppasswd.h 2007-12-11 14:25:24.000000000 -0800 @@ -13,6 +13,8 @@ #ifndef _YPPASSWD_H_ #define _YPPASSWD_H_ +#ifdef NIS + #define YPPASSWDPROG ((u_long)100009) #define YPPASSWDVERS ((u_long)1) #define YPPASSWDPROC_UPDATE ((u_long)1) @@ -48,4 +50,6 @@ typedef struct yppasswd { bool_t xdr_xpasswd(XDR * xdrs, xpasswd * objp); bool_t xdr_yppasswd(XDR * xdrs, yppasswd * objp); +#endif + #endif /* _YPPASSWD_H_ */ diff -urp Linux-PAM-0.99.9.0/modules/pam_unix/yppasswd_xdr.c Linux-PAM-0.99.9.0-nonis/modules/pam_unix/yppasswd_xdr.c --- Linux-PAM-0.99.9.0/modules/pam_unix/yppasswd_xdr.c 2005-07-20 02:46:19.000000000 -0700 +++ Linux-PAM-0.99.9.0-nonis/modules/pam_unix/yppasswd_xdr.c 2007-12-11 14:25:02.000000000 -0800 @@ -10,6 +10,8 @@ * editied manually. */ +#ifdef NIS + #include "config.h" #include @@ -36,3 +40,5 @@ xdr_yppasswd(XDR * xdrs, yppasswd * objp return xdr_string(xdrs, &objp->oldpass, ~0) && xdr_xpasswd(xdrs, &objp->newpw); } + +#endif diff -urp Linux-PAM-0.99.9.0/po/POTFILES.in Linux-PAM-0.99.9.0-nonis/po/POTFILES.in --- Linux-PAM-0.99.9.0/po/POTFILES.in 2006-11-08 06:40:27.000000000 -0800 +++ Linux-PAM-0.99.9.0-nonis/po/POTFILES.in 2007-12-11 14:25:46.000000000 -0800 @@ -85,7 +85,6 @@ ./modules/pam_unix/pam_unix_sess.c ./modules/pam_unix/support.c ./modules/pam_unix/unix_chkpwd.c -./modules/pam_unix/yppasswd_xdr.c ./modules/pam_userdb/pam_userdb.c ./modules/pam_warn/pam_warn.c ./modules/pam_wheel/pam_wheel.c