6683064 check_rtime could do with some spring cleaning

8 files changed, 38 insertions, 58 deletions

diff --git a/usr/src/lib/pam_modules/krb5/amd64/Makefile b/usr/src/lib/pam_modules/krb5/amd64/Makefile
index 4703d1ce13..b1a5f12f9c 100644
--- a/usr/src/lib/pam_modules/krb5/amd64/Makefile
+++ b/usr/src/lib/pam_modules/krb5/amd64/Makefile
@@ -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,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -32,6 +31,6 @@ include ../../../Makefile.lib.64
 LDLIBS +=	-lpam -lnsl -lc
 
 DYNFLAGS +=	-L$(ROOT_KLIBDIR64) -L$(ROOT)/$(KERBLIBDIR64) \
-		$(KRUNPATH64) -lkadm5clnt -lmech_krb5
+		$(KRUNPATH64) $(KERBRUNPATH64) -lkadm5clnt -lmech_krb5
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/lib/pam_modules/krb5/i386/Makefile b/usr/src/lib/pam_modules/krb5/i386/Makefile
index 53d3a2ede2..2d32d64b6f 100644
--- a/usr/src/lib/pam_modules/krb5/i386/Makefile
+++ b/usr/src/lib/pam_modules/krb5/i386/Makefile
@@ -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,17 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# usr/src/lib/pam_modules/krb5/i386/Makefile
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.com
 
 LDLIBS +=	-lpam -lnsl -lc
-DYNFLAGS +=   -L$(ROOT_KLIBDIR) -L$(ROOT)/$(KERBLIBDIR) \
-              $(KRUNPATH) -lkadm5clnt -lmech_krb5
 
+DYNFLAGS +=	-L$(ROOT_KLIBDIR) -L$(ROOT)/$(KERBLIBDIR) \
+		$(KRUNPATH) $(KERBRUNPATH) -lkadm5clnt -lmech_krb5
 
 install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/lib/pam_modules/krb5/sparc/Makefile b/usr/src/lib/pam_modules/krb5/sparc/Makefile
index 6d2d306d65..2d32d64b6f 100644
--- a/usr/src/lib/pam_modules/krb5/sparc/Makefile
+++ b/usr/src/lib/pam_modules/krb5/sparc/Makefile
@@ -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,18 +19,17 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# usr/src/lib/pam_modules/krb5/sparc/Makefile
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.com
 
 LDLIBS +=	-lpam -lnsl -lc
+
 DYNFLAGS +=	-L$(ROOT_KLIBDIR) -L$(ROOT)/$(KERBLIBDIR) \
-		$(KRUNPATH) -lkadm5clnt -lmech_krb5
+		$(KRUNPATH) $(KERBRUNPATH) -lkadm5clnt -lmech_krb5
 
 install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/lib/pam_modules/krb5/sparcv9/Makefile b/usr/src/lib/pam_modules/krb5/sparcv9/Makefile
index c7763c06df..b1a5f12f9c 100644
--- a/usr/src/lib/pam_modules/krb5/sparcv9/Makefile
+++ b/usr/src/lib/pam_modules/krb5/sparcv9/Makefile
@@ -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 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# usr/src/lib/pam_modules/krb5/sparcv9/Makefile
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
 LDLIBS +=	-lpam -lnsl -lc
+
 DYNFLAGS +=	-L$(ROOT_KLIBDIR64) -L$(ROOT)/$(KERBLIBDIR64) \
-		$(KRUNPATH64) -lkadm5clnt -lmech_krb5
+		$(KRUNPATH64) $(KERBRUNPATH64) -lkadm5clnt -lmech_krb5
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/lib/pam_modules/krb5_migrate/amd64/Makefile b/usr/src/lib/pam_modules/krb5_migrate/amd64/Makefile
index e90a8c7833..ea87dcb26a 100644
--- a/usr/src/lib/pam_modules/krb5_migrate/amd64/Makefile
+++ b/usr/src/lib/pam_modules/krb5_migrate/amd64/Makefile
@@ -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,18 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# usr/src/lib/pam_modules/krb5_migrate/amd64/Makefile
-#
 
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
 DYNFLAGS +=	-L$(ROOT_KLIBDIR64) -L$(ROOT)/$(KERBLIBDIR64) $(KRUNPATH64) \
-		-lkadm5clnt -lmech_krb5
+		$(KERBRUNPATH64) -lkadm5clnt -lmech_krb5
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/lib/pam_modules/krb5_migrate/i386/Makefile b/usr/src/lib/pam_modules/krb5_migrate/i386/Makefile
index 9b339a1101..da4c6d1c57 100644
--- a/usr/src/lib/pam_modules/krb5_migrate/i386/Makefile
+++ b/usr/src/lib/pam_modules/krb5_migrate/i386/Makefile
@@ -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,17 +19,15 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# usr/src/lib/pam_modules/krb5_migrate/i386/Makefile
-#
 
 include ../Makefile.com
 
 DYNFLAGS +=	-L$(ROOT_KLIBDIR) -L$(ROOT)/$(KERBLIBDIR) $(KRUNPATH) \
-		-lkadm5clnt -lmech_krb5
+		$(KERBRUNPATH) -lkadm5clnt -lmech_krb5
 
 install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/lib/pam_modules/krb5_migrate/sparc/Makefile b/usr/src/lib/pam_modules/krb5_migrate/sparc/Makefile
index d800db7cb8..da4c6d1c57 100644
--- a/usr/src/lib/pam_modules/krb5_migrate/sparc/Makefile
+++ b/usr/src/lib/pam_modules/krb5_migrate/sparc/Makefile
@@ -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,17 +19,15 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# usr/src/lib/pam_modules/krb5_migrate/sparc/Makefile
-#
 
 include ../Makefile.com
 
 DYNFLAGS +=	-L$(ROOT_KLIBDIR) -L$(ROOT)/$(KERBLIBDIR) $(KRUNPATH) \
-		-lkadm5clnt -lmech_krb5
+		$(KERBRUNPATH) -lkadm5clnt -lmech_krb5
 
 install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/lib/pam_modules/krb5_migrate/sparcv9/Makefile b/usr/src/lib/pam_modules/krb5_migrate/sparcv9/Makefile
index b631cd25d0..ea87dcb26a 100644
--- a/usr/src/lib/pam_modules/krb5_migrate/sparcv9/Makefile
+++ b/usr/src/lib/pam_modules/krb5_migrate/sparcv9/Makefile
@@ -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,18 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# usr/src/lib/pam_modules/krb5_migrate/sparcv9/Makefile
-#
 
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
 DYNFLAGS +=	-L$(ROOT_KLIBDIR64) -L$(ROOT)/$(KERBLIBDIR64) $(KRUNPATH64) \
-		-lkadm5clnt -lmech_krb5
+		$(KERBRUNPATH64) -lkadm5clnt -lmech_krb5
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64)