From laffer1 at midnightbsd.org Wed Apr 20 08:57:56 2016 From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org) Date: Wed, 20 Apr 2016 08:57:56 -0400 (EDT) Subject: [Midnightbsd-cvs] src [7543] trunk/lib/libpam/modules/pam_unix: fix some warnings Message-ID: <201604201257.u3KCvuBS096796@stargazer.midnightbsd.org> Revision: 7543 http://svnweb.midnightbsd.org/src/?rev=7543 Author: laffer1 Date: 2016-04-20 08:57:56 -0400 (Wed, 20 Apr 2016) Log Message: ----------- fix some warnings Modified Paths: -------------- trunk/lib/libpam/modules/pam_unix/Makefile trunk/lib/libpam/modules/pam_unix/pam_unix.8 trunk/lib/libpam/modules/pam_unix/pam_unix.c Modified: trunk/lib/libpam/modules/pam_unix/Makefile =================================================================== --- trunk/lib/libpam/modules/pam_unix/Makefile 2016-04-16 17:50:38 UTC (rev 7542) +++ trunk/lib/libpam/modules/pam_unix/Makefile 2016-04-20 12:57:56 UTC (rev 7543) @@ -34,16 +34,14 @@ # # $FreeBSD$ -NO_PROFILE= -NO_INSTALLLIB= -.include +.include LIB= pam_unix SRCS= pam_unix.c MAN= pam_unix.8 -DPADD= ${LIBUTIL} ${LIBCRYPT} -LDADD= -lutil -lcrypt +DPADD+= ${LIBUTIL} ${LIBCRYPT} +LDADD+= -lutil -lcrypt .if ${MK_NIS} != "no" CFLAGS+= -DYP Modified: trunk/lib/libpam/modules/pam_unix/pam_unix.8 =================================================================== --- trunk/lib/libpam/modules/pam_unix/pam_unix.8 2016-04-16 17:50:38 UTC (rev 7542) +++ trunk/lib/libpam/modules/pam_unix/pam_unix.8 2016-04-20 12:57:56 UTC (rev 7543) @@ -32,7 +32,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $FreeBSD: stable/9/lib/libpam/modules/pam_unix/pam_unix.8 247568 2013-03-01 19:42:50Z des $ .\" .Dd June 20, 2009 .Dt PAM_UNIX 8 @@ -199,3 +199,9 @@ .Xr pam 8 , .Xr pw 8 , .Xr yp 8 +.Sh BUGS +The +.Nm +module ignores the +.Dv PAM_CHANGE_EXPIRED_AUTHTOK +flag. Modified: trunk/lib/libpam/modules/pam_unix/pam_unix.c =================================================================== --- trunk/lib/libpam/modules/pam_unix/pam_unix.c 2016-04-16 17:50:38 UTC (rev 7542) +++ trunk/lib/libpam/modules/pam_unix/pam_unix.c 2016-04-20 12:57:56 UTC (rev 7543) @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: stable/9/lib/libpam/modules/pam_unix/pam_unix.c 247568 2013-03-01 19:42:50Z des $"); #include #include @@ -96,13 +96,13 @@ const char *pass, *user, *realpw, *prompt; if (openpam_get_option(pamh, PAM_OPT_AUTH_AS_SELF)) { - pwd = getpwnam(getlogin()); + user = getlogin(); } else { retval = pam_get_user(pamh, &user, NULL); if (retval != PAM_SUCCESS) return (retval); - pwd = getpwnam(user); } + pwd = getpwnam(user); PAM_LOG("Got user: %s", user); From laffer1 at midnightbsd.org Wed Apr 20 21:38:01 2016 From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org) Date: Wed, 20 Apr 2016 21:38:01 -0400 (EDT) Subject: [Midnightbsd-cvs] src [7544] trunk/lib/clang/include/clang/Basic/Version.inc: set clang vendor Message-ID: <201604210138.u3L1c1Dv071944@stargazer.midnightbsd.org> Revision: 7544 http://svnweb.midnightbsd.org/src/?rev=7544 Author: laffer1 Date: 2016-04-20 21:38:00 -0400 (Wed, 20 Apr 2016) Log Message: ----------- set clang vendor Modified Paths: -------------- trunk/lib/clang/include/clang/Basic/Version.inc Modified: trunk/lib/clang/include/clang/Basic/Version.inc =================================================================== --- trunk/lib/clang/include/clang/Basic/Version.inc 2016-04-20 12:57:56 UTC (rev 7543) +++ trunk/lib/clang/include/clang/Basic/Version.inc 2016-04-21 01:38:00 UTC (rev 7544) @@ -4,7 +4,7 @@ #define CLANG_VERSION_MAJOR 3 #define CLANG_VERSION_MINOR 3 -#define CLANG_VENDOR "FreeBSD " +#define CLANG_VENDOR "MidnightBSD " #define CLANG_VENDOR_SUFFIX " 20130610" #define SVN_REVISION "183502" From laffer1 at midnightbsd.org Wed Apr 20 21:55:44 2016 From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org) Date: Wed, 20 Apr 2016 21:55:44 -0400 (EDT) Subject: [Midnightbsd-cvs] src [7545] trunk/Makefile.inc1: add MACHINE_INCLUDES Message-ID: <201604210155.u3L1tiMR073743@stargazer.midnightbsd.org> Revision: 7545 http://svnweb.midnightbsd.org/src/?rev=7545 Author: laffer1 Date: 2016-04-20 21:55:44 -0400 (Wed, 20 Apr 2016) Log Message: ----------- add MACHINE_INCLUDES Modified Paths: -------------- trunk/Makefile.inc1 Modified: trunk/Makefile.inc1 =================================================================== --- trunk/Makefile.inc1 2016-04-21 01:38:00 UTC (rev 7544) +++ trunk/Makefile.inc1 2016-04-21 01:55:44 UTC (rev 7545) @@ -212,6 +212,7 @@ # Common environment for world related stages CROSSENV= MAKEOBJDIRPREFIX=${OBJTREE} \ + MACHINE_INCLUDES="${WORLDTMP}/include" \ MACHINE_ARCH=${TARGET_ARCH} \ MACHINE=${TARGET} \ CPUTYPE=${TARGET_CPUTYPE} @@ -226,6 +227,7 @@ # bootstrap-tools stage BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ + MACHINE_INCLUDES="${WORLDTMP}/include" \ PATH=${BPATH}:${PATH} \ WORLDTMP=${WORLDTMP} \ VERSION="${VERSION}" \ @@ -259,6 +261,7 @@ WMAKEENV= ${CROSSENV} \ _SHLIBDIRPREFIX=${WORLDTMP} \ _LDSCRIPTROOT= \ + MACHINE_INCLUDES="${WORLDTMP}/include" \ VERSION="${VERSION}" \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} @@ -310,6 +313,8 @@ CXX="${CXX} ${LIB32FLAGS}" \ LIBDIR=/usr/lib32 \ SHLIBDIR=/usr/lib32 \ + LIBPRIVATEDIR=/usr/lib32/private \ + MACHINE_INCLUDES="${WORLDTMP}/include" \ COMPILER_TYPE=${WMAKE_COMPILER_TYPE} LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ From laffer1 at midnightbsd.org Wed Apr 20 08:57:56 2016 From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org) Date: Wed, 20 Apr 2016 08:57:56 -0400 (EDT) Subject: [Midnightbsd-cvs] src [7543] trunk/lib/libpam/modules/pam_unix: fix some warnings Message-ID: <201604201257.u3KCvuBS096796@stargazer.midnightbsd.org> Revision: 7543 http://svnweb.midnightbsd.org/src/?rev=7543 Author: laffer1 Date: 2016-04-20 08:57:56 -0400 (Wed, 20 Apr 2016) Log Message: ----------- fix some warnings Modified Paths: -------------- trunk/lib/libpam/modules/pam_unix/Makefile trunk/lib/libpam/modules/pam_unix/pam_unix.8 trunk/lib/libpam/modules/pam_unix/pam_unix.c Modified: trunk/lib/libpam/modules/pam_unix/Makefile =================================================================== --- trunk/lib/libpam/modules/pam_unix/Makefile 2016-04-16 17:50:38 UTC (rev 7542) +++ trunk/lib/libpam/modules/pam_unix/Makefile 2016-04-20 12:57:56 UTC (rev 7543) @@ -34,16 +34,14 @@ # # $FreeBSD$ -NO_PROFILE= -NO_INSTALLLIB= -.include +.include LIB= pam_unix SRCS= pam_unix.c MAN= pam_unix.8 -DPADD= ${LIBUTIL} ${LIBCRYPT} -LDADD= -lutil -lcrypt +DPADD+= ${LIBUTIL} ${LIBCRYPT} +LDADD+= -lutil -lcrypt .if ${MK_NIS} != "no" CFLAGS+= -DYP Modified: trunk/lib/libpam/modules/pam_unix/pam_unix.8 =================================================================== --- trunk/lib/libpam/modules/pam_unix/pam_unix.8 2016-04-16 17:50:38 UTC (rev 7542) +++ trunk/lib/libpam/modules/pam_unix/pam_unix.8 2016-04-20 12:57:56 UTC (rev 7543) @@ -32,7 +32,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $FreeBSD: stable/9/lib/libpam/modules/pam_unix/pam_unix.8 247568 2013-03-01 19:42:50Z des $ .\" .Dd June 20, 2009 .Dt PAM_UNIX 8 @@ -199,3 +199,9 @@ .Xr pam 8 , .Xr pw 8 , .Xr yp 8 +.Sh BUGS +The +.Nm +module ignores the +.Dv PAM_CHANGE_EXPIRED_AUTHTOK +flag. Modified: trunk/lib/libpam/modules/pam_unix/pam_unix.c =================================================================== --- trunk/lib/libpam/modules/pam_unix/pam_unix.c 2016-04-16 17:50:38 UTC (rev 7542) +++ trunk/lib/libpam/modules/pam_unix/pam_unix.c 2016-04-20 12:57:56 UTC (rev 7543) @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: stable/9/lib/libpam/modules/pam_unix/pam_unix.c 247568 2013-03-01 19:42:50Z des $"); #include #include @@ -96,13 +96,13 @@ const char *pass, *user, *realpw, *prompt; if (openpam_get_option(pamh, PAM_OPT_AUTH_AS_SELF)) { - pwd = getpwnam(getlogin()); + user = getlogin(); } else { retval = pam_get_user(pamh, &user, NULL); if (retval != PAM_SUCCESS) return (retval); - pwd = getpwnam(user); } + pwd = getpwnam(user); PAM_LOG("Got user: %s", user); From laffer1 at midnightbsd.org Wed Apr 20 21:38:01 2016 From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org) Date: Wed, 20 Apr 2016 21:38:01 -0400 (EDT) Subject: [Midnightbsd-cvs] src [7544] trunk/lib/clang/include/clang/Basic/Version.inc: set clang vendor Message-ID: <201604210138.u3L1c1Dv071944@stargazer.midnightbsd.org> Revision: 7544 http://svnweb.midnightbsd.org/src/?rev=7544 Author: laffer1 Date: 2016-04-20 21:38:00 -0400 (Wed, 20 Apr 2016) Log Message: ----------- set clang vendor Modified Paths: -------------- trunk/lib/clang/include/clang/Basic/Version.inc Modified: trunk/lib/clang/include/clang/Basic/Version.inc =================================================================== --- trunk/lib/clang/include/clang/Basic/Version.inc 2016-04-20 12:57:56 UTC (rev 7543) +++ trunk/lib/clang/include/clang/Basic/Version.inc 2016-04-21 01:38:00 UTC (rev 7544) @@ -4,7 +4,7 @@ #define CLANG_VERSION_MAJOR 3 #define CLANG_VERSION_MINOR 3 -#define CLANG_VENDOR "FreeBSD " +#define CLANG_VENDOR "MidnightBSD " #define CLANG_VENDOR_SUFFIX " 20130610" #define SVN_REVISION "183502" From laffer1 at midnightbsd.org Wed Apr 20 21:55:44 2016 From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org) Date: Wed, 20 Apr 2016 21:55:44 -0400 (EDT) Subject: [Midnightbsd-cvs] src [7545] trunk/Makefile.inc1: add MACHINE_INCLUDES Message-ID: <201604210155.u3L1tiMR073743@stargazer.midnightbsd.org> Revision: 7545 http://svnweb.midnightbsd.org/src/?rev=7545 Author: laffer1 Date: 2016-04-20 21:55:44 -0400 (Wed, 20 Apr 2016) Log Message: ----------- add MACHINE_INCLUDES Modified Paths: -------------- trunk/Makefile.inc1 Modified: trunk/Makefile.inc1 =================================================================== --- trunk/Makefile.inc1 2016-04-21 01:38:00 UTC (rev 7544) +++ trunk/Makefile.inc1 2016-04-21 01:55:44 UTC (rev 7545) @@ -212,6 +212,7 @@ # Common environment for world related stages CROSSENV= MAKEOBJDIRPREFIX=${OBJTREE} \ + MACHINE_INCLUDES="${WORLDTMP}/include" \ MACHINE_ARCH=${TARGET_ARCH} \ MACHINE=${TARGET} \ CPUTYPE=${TARGET_CPUTYPE} @@ -226,6 +227,7 @@ # bootstrap-tools stage BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ + MACHINE_INCLUDES="${WORLDTMP}/include" \ PATH=${BPATH}:${PATH} \ WORLDTMP=${WORLDTMP} \ VERSION="${VERSION}" \ @@ -259,6 +261,7 @@ WMAKEENV= ${CROSSENV} \ _SHLIBDIRPREFIX=${WORLDTMP} \ _LDSCRIPTROOT= \ + MACHINE_INCLUDES="${WORLDTMP}/include" \ VERSION="${VERSION}" \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} @@ -310,6 +313,8 @@ CXX="${CXX} ${LIB32FLAGS}" \ LIBDIR=/usr/lib32 \ SHLIBDIR=/usr/lib32 \ + LIBPRIVATEDIR=/usr/lib32/private \ + MACHINE_INCLUDES="${WORLDTMP}/include" \ COMPILER_TYPE=${WMAKE_COMPILER_TYPE} LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \