diff options
| author | <Mark.Phalan@Sun.COM> | 2008-12-11 16:18:47 +0100 |
|---|---|---|
| committer | <Mark.Phalan@Sun.COM> | 2008-12-11 16:18:47 +0100 |
| commit | e0d8bef656731559f2d1d5dca0077a6a66c6f8b9 (patch) | |
| tree | 678fbb7252733d6acc9493d7c4be1c3d387022cf /usr/src/lib/pam_modules | |
| parent | a026686c807bfa501e774c70b45ef875ed7de130 (diff) | |
| download | illumos-joyent-e0d8bef656731559f2d1d5dca0077a6a66c6f8b9.tar.gz | |
6768868 CPPFLAGS from Makefile.mech_krb5 get clobbered for pam_krb5 and pam_krb5_migrate
Diffstat (limited to 'usr/src/lib/pam_modules')
| -rw-r--r-- | usr/src/lib/pam_modules/krb5/Makefile.com | 5 | ||||
| -rw-r--r-- | usr/src/lib/pam_modules/krb5_migrate/Makefile.com | 10 |
2 files changed, 6 insertions, 9 deletions
diff --git a/usr/src/lib/pam_modules/krb5/Makefile.com b/usr/src/lib/pam_modules/krb5/Makefile.com index 0fa83784d5..b4e93ccbfd 100644 --- a/usr/src/lib/pam_modules/krb5/Makefile.com +++ b/usr/src/lib/pam_modules/krb5/Makefile.com @@ -19,17 +19,15 @@ # CDDL HEADER END # # -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # usr/src/lib/pam_modules/krb5/Makefile.com # -# ident "%Z%%M% %I% %E% SMI" LIBRARY= pam_krb5.a VERS= .1 -include $(SRC)/lib/gss_mechs/mech_krb5/Makefile.mech_krb5 PRIV_OBJ= krb5_authenticate.o \ krb5_setcred.o \ @@ -41,6 +39,7 @@ PRIV_OBJ= krb5_authenticate.o \ OBJECTS= $(PRIV_OBJ) include ../../Makefile.pam_modules +include $(SRC)/lib/gss_mechs/mech_krb5/Makefile.mech_krb5 CPPFLAGS += -I../../../gss_mechs/mech_krb5/include \ -I$(SRC)/uts/common/gssapi/include/ \ diff --git a/usr/src/lib/pam_modules/krb5_migrate/Makefile.com b/usr/src/lib/pam_modules/krb5_migrate/Makefile.com index 98c1d38432..6871d9f713 100644 --- a/usr/src/lib/pam_modules/krb5_migrate/Makefile.com +++ b/usr/src/lib/pam_modules/krb5_migrate/Makefile.com @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -20,19 +19,18 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # usr/src/lib/pam_modules/krb5_migrate/Makefile.com # -# ident "%Z%%M% %I% %E% SMI" LIBRARY= pam_krb5_migrate.a VERS= .1 OBJECTS= krb5_migrate_authenticate.o -include $(SRC)/lib/gss_mechs/mech_krb5/Makefile.mech_krb5 include ../../Makefile.pam_modules +include $(SRC)/lib/gss_mechs/mech_krb5/Makefile.mech_krb5 CPPFLAGS += -I../../../gss_mechs/mech_krb5/include \ -I$(SRC)/uts/common/gssapi/include/ \ |