mergegcc9

15 files changed, 38 insertions, 112 deletions

diff --git a/usr/src/lib/gss_mechs/mech_dh/Makefile b/usr/src/lib/gss_mechs/mech_dh/Makefile
index 7a992970ab..c25e99a230 100644
--- a/usr/src/lib/gss_mechs/mech_dh/Makefile
+++ b/usr/src/lib/gss_mechs/mech_dh/Makefile
@@ -20,27 +20,22 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright (c) 1997, by Sun Microsystems, Inc.
 # All rights reserved.
 #
-# lib/gss_mechs/mech_dh/Makefile
-#
 
-SUBDIRS= backend .WAIT dh192 dh640 dh1024 
+SUBDIRS= backend .WAIT dh192 dh640 dh1024
 MSGSUBDIRS = backend
 
 all :=		TARGET= all
 install :=	TARGET= install
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
-lint :=		TARGET= lint
 _msg :=		TARGET= _msg
 
 .KEEP_STATE:
 
-all clean clobber lint: $(SUBDIRS)
+all clean clobber: $(SUBDIRS)
 
 install: $(SUBDIRS)
 
diff --git a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile
index 8640e0d68c..5854be0a30 100644
--- a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile
+++ b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile
@@ -47,7 +47,6 @@ clean :=        TARGET= clean
 clobber :=      TARGET= clobber
 delete :=       TARGET= delete
 install :=      TARGET= install
-lint :=         TARGET= lint
 catalog :=      TARGET= catalog
 package :=      TARGET= package
 _msg :=		TARGET= _msg
@@ -57,7 +56,7 @@ all:            $(DERIVED_FILES) .WAIT $(SUBDIRS)
 
 install:        $(DERIVED_FILES) .WAIT $(SUBDIRS)
 
-clean clobber delete lint catalog package:      $(SUBDIRS)
+clean clobber delete catalog package:      $(SUBDIRS)
 
 #
 # Rules for building the derived files
diff --git a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com
index 5c527bd27d..7943530d91 100644
--- a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com
@@ -27,7 +27,7 @@
 #
 # This make file will build mech_dh.so.1. This shared object
 # contains all the functionality needed to support Diffie-Hellman GSS-API
-# mechanism. 
+# mechanism.
 #
 
 LIBRARY= mech_dh.a
@@ -54,8 +54,8 @@ CERRWARN +=	$(CNOWARN_UNINIT)
 # needs work
 SMATCH=off
 
-$(PICS) := 	CFLAGS += $(XFFLAG)
-$(PICS) := 	CCFLAGS += $(XFFLAG)
+$(PICS) :=	CFLAGS += $(XFFLAG)
+$(PICS) :=	CCFLAGS += $(XFFLAG)
 $(PICS) :=	CFLAGS64 += $(XFFLAG)
 $(PICS) :=	CCFLAGS64 += $(XFFLAG)
 
@@ -66,7 +66,7 @@ LIBNAME = $(LIBRARY:%.a=%)
 
 MAPFILES =	../mapfile-vers
 
-LDLIBS +=  -lgss -lnsl -lc 
+LDLIBS +=  -lgss -lnsl -lc
 
 RPCGEN += -C
 SED = sed
@@ -79,17 +79,6 @@ SRCS=	$(CSRCS)
 ROOTLIBDIR = $(ROOT)/usr/lib/gss
 ROOTLIBDIR64 = $(ROOT)/usr/lib/$(MACH64)/gss
 
-#LINTFLAGS += -dirout=lint -errfmt=simple
-#LINTFLAGS64 += -dirout=lint -errfmt=simple -errchk all
-LINTOUT =	lint.out
-LINTSRC =	$(LINTLIB:%.ln=%)
-ROOTLINTDIR =	$(ROOTLIBDIR)
-#ROOTLINT = 	$(LINTSRC:%=$(ROOTLINTDIR)/%)
-
-CLEANFILES += $(LINTOUT) $(LINTLIB)
-
-lint: lintcheck
-
 $(ROOTLIBDIR):
 	$(INS.dir)
 
diff --git a/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile b/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile
index 15006b3deb..c4fbf0cca8 100644
--- a/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile
+++ b/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile
@@ -39,16 +39,11 @@ clean :=        TARGET= clean
 clobber :=      TARGET= clobber
 delete :=       TARGET= delete
 install :=      TARGET= install
-lint :=         TARGET= lint
 catalog :=      TARGET= catalog
 package :=      TARGET= package
 
 .KEEP_STATE:
-all:            $(SUBDIRS)
-
-install:        $(SUBDIRS)
-
-clean clobber delete lint catalog package:      $(SUBDIRS)
+all install clean clobber delete catalog package:      $(SUBDIRS)
 
 # include library targets
 include ../../../Makefile.targ
diff --git a/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile.com b/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile.com
index ddb5828231..d041e6067d 100644
--- a/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile.com
@@ -26,7 +26,7 @@
 #
 # This make file will build dh1024.so.1. This shared object
 # contains the functionality needed to initialize the  Diffie-Hellman GSS-API
-# mechanism with 1024 bit key length. This library, in turn, loads the 
+# mechanism with 1024 bit key length. This library, in turn, loads the
 # generic Diffie-Hellman GSS-API backend, dhmech.so
 #
 
@@ -35,7 +35,7 @@ VERS = .1
 
 DH1024=	dh1024.o dh_common.o generic_key.o
 
-OBJECTS= $(DH1024) 
+OBJECTS= $(DH1024)
 
 # include library definitions
 include ../../../../Makefile.lib
@@ -44,8 +44,8 @@ CPPFLAGS += -I../../backend/mech -I../../backend/crypto
 CPPFLAGS += -I$(SRC)/lib/libnsl/include
 CPPFLAGS += -I$(SRC)/uts/common/gssapi/include
 
-$(PICS) := 	CFLAGS += $(XFFLAG)
-$(PICS) := 	CCFLAGS += $(XFFLAG)
+$(PICS) :=	CFLAGS += $(XFFLAG)
+$(PICS) :=	CCFLAGS += $(XFFLAG)
 $(PICS) :=	CFLAGS64 += $(XFFLAG)
 $(PICS) :=	CCFLAGS64 += $(XFFLAG)
 
@@ -65,17 +65,6 @@ SRCS=	../dh1024.c ../../dh_common/dh_common.c ../../dh_common/generic_key.c
 ROOTLIBDIR = $(ROOT)/usr/lib/gss
 ROOTLIBDIR64 = $(ROOT)/usr/lib/$(MACH64)/gss
 
-#LINTFLAGS += -errfmt=simple
-#LINTFLAGS64 += -errfmt=simple
-LINTOUT =	lint.out
-LINTSRC =	$(LINTLIB:%.ln=%)
-ROOTLINTDIR =	$(ROOTLIBDIR)
-#ROOTLINT = 	$(LINTSRC:%=$(ROOTLINTDIR)/%)
-
-CLEANFILES += $(LINTOUT) $(LINTLIB)
-
-lint: lintcheck
-
 $(ROOTLIBDIR):
 	$(INS.dir)
 
diff --git a/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile b/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile
index adef19508b..a65ee24611 100644
--- a/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile
+++ b/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile
@@ -39,7 +39,6 @@ clean :=        TARGET= clean
 clobber :=      TARGET= clobber
 delete :=       TARGET= delete
 install :=      TARGET= install
-lint :=         TARGET= lint
 catalog :=      TARGET= catalog
 package :=      TARGET= package
 
@@ -48,7 +47,7 @@ all:            $(SUBDIRS)
 
 install:        $(SUBDIRS)
 
-clean clobber delete lint catalog package:      $(SUBDIRS)
+clean clobber delete catalog package:      $(SUBDIRS)
 
 # include library targets
 include ../../../Makefile.targ
diff --git a/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile.com b/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile.com
index 2019a1a955..5b38cae4e3 100644
--- a/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile.com
@@ -26,7 +26,7 @@
 #
 # This make file will build dh192.so.1. This shared object
 # contains the functionality needed to initialize the  Diffie-Hellman GSS-API
-# mechanism with 192 bit key length. This library, in turn, loads the 
+# mechanism with 192 bit key length. This library, in turn, loads the
 # generic Diffie-Hellman GSS-API backend, dhmech.so
 #
 
@@ -44,8 +44,8 @@ CPPFLAGS += -I../../backend/mech -I../../backend/crypto
 CPPFLAGS += -I$(SRC)/lib/libnsl/include
 CPPFLAGS += -I$(SRC)/uts/common/gssapi/include
 
-$(PICS) := 	CFLAGS += $(XFFLAG)
-$(PICS) := 	CCFLAGS += $(XFFLAG)
+$(PICS) :=	CFLAGS += $(XFFLAG)
+$(PICS) :=	CCFLAGS += $(XFFLAG)
 $(PICS) :=	CFLAGS64 += $(XFFLAG)
 $(PICS) :=	CCFLAGS64 += $(XFFLAG)
 
@@ -65,17 +65,6 @@ SRCS=	../dh192.c ../../dh_common/dh_common.c ../../dh_common/generic_key.c
 ROOTLIBDIR = $(ROOT)/usr/lib/gss
 ROOTLIBDIR64 = $(ROOT)/usr/lib/$(MACH64)/gss
 
-#LINTFLAGS += -errfmt=simple
-#LINTFLAGS64 += -errfmt=simple
-LINTOUT =	lint.out
-LINTSRC =	$(LINTLIB:%.ln=%)
-ROOTLINTDIR =	$(ROOTLIBDIR)
-#ROOTLINT = 	$(LINTSRC:%=$(ROOTLINTDIR)/%)
-
-CLEANFILES += $(LINTOUT) $(LINTLIB)
-
-lint: lintcheck
-
 $(ROOTLIBDIR):
 	$(INS.dir)
 
diff --git a/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile b/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile
index 95bad6b558..69d6430ece 100644
--- a/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile
+++ b/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile
@@ -39,7 +39,6 @@ clean :=        TARGET= clean
 clobber :=      TARGET= clobber
 delete :=       TARGET= delete
 install :=      TARGET= install
-lint :=         TARGET= lint
 catalog :=      TARGET= catalog
 package :=      TARGET= package
 
@@ -48,7 +47,7 @@ all:            $(SUBDIRS)
 
 install:        $(SUBDIRS)
 
-clean clobber delete lint catalog package:      $(SUBDIRS)
+clean clobber delete catalog package:      $(SUBDIRS)
 
 # include library targets
 include ../../../Makefile.targ
diff --git a/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile.com b/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile.com
index 97c6e9d4e9..a6c4339047 100644
--- a/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile.com
@@ -26,7 +26,7 @@
 #
 # This make file will build dh640.so.1. This shared object
 # contains the functionality needed to initialize the  Diffie-Hellman GSS-API
-# mechanism with 640 bit key length. This library, in turn, loads the 
+# mechanism with 640 bit key length. This library, in turn, loads the
 # generic Diffie-Hellman GSS-API backend, dhmech.so
 #
 
@@ -35,7 +35,7 @@ VERS = .1
 
 DH640=	dh640.o dh_common.o generic_key.o
 
-OBJECTS= $(DH640) 
+OBJECTS= $(DH640)
 
 # include library definitions
 include ../../../../Makefile.lib
@@ -44,8 +44,8 @@ CPPFLAGS += -I../../backend/mech -I../../backend/crypto
 CPPFLAGS += -I$(SRC)/lib/libnsl/include
 CPPFLAGS += -I$(SRC)/uts/common/gssapi/include
 
-$(PICS) := 	CFLAGS += $(XFFLAG)
-$(PICS) := 	CCFLAGS += $(XFFLAG)
+$(PICS) :=	CFLAGS += $(XFFLAG)
+$(PICS) :=	CCFLAGS += $(XFFLAG)
 $(PICS) :=	CFLAGS64 += $(XFFLAG)
 $(PICS) :=	CCFLAGS64 += $(XFFLAG)
 
@@ -65,17 +65,6 @@ SRCS=	../dh640.c ../../dh_common/dh_common.c ../../dh_common/generic_key.c
 ROOTLIBDIR = $(ROOT)/usr/lib/gss
 ROOTLIBDIR64 = $(ROOT)/usr/lib/$(MACH64)/gss
 
-#LINTFLAGS += -errfmt=simple
-#LINTFLAGS64 += -errfmt=simple
-LINTOUT =	lint.out
-LINTSRC =	$(LINTLIB:%.ln=%)
-ROOTLINTDIR =	$(ROOTLIBDIR)
-#ROOTLINT = 	$(LINTSRC:%=$(ROOTLINTDIR)/%)
-
-CLEANFILES += $(LINTOUT) $(LINTLIB)
-
-lint: lintcheck
-
 $(ROOTLIBDIR):
 	$(INS.dir)
 
diff --git a/usr/src/lib/gss_mechs/mech_dummy/Makefile b/usr/src/lib/gss_mechs/mech_dummy/Makefile
index a79f39443f..e2c1b55c6a 100644
--- a/usr/src/lib/gss_mechs/mech_dummy/Makefile
+++ b/usr/src/lib/gss_mechs/mech_dummy/Makefile
@@ -30,7 +30,7 @@
 #
 # This make file will build mech_dummy.so.1. This shared object
 # contains all the functionality needed to support the Dummy GSS-API
-# mechanism. 
+# mechanism.
 #
 
 include ../../../Makefile.master
@@ -51,14 +51,11 @@ all :=		TARGET= all
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 install :=	TARGET= install
-lint :=		TARGET= lint
 
 .KEEP_STATE:
 
 all:	.WAIT $(SUBDIRS)
 
-lint:	.WAIT $(SUBDIRS)
-
 install: all
 
 install_h:
diff --git a/usr/src/lib/gss_mechs/mech_dummy/Makefile.com b/usr/src/lib/gss_mechs/mech_dummy/Makefile.com
index d8f784220a..f227fcd0b5 100644
--- a/usr/src/lib/gss_mechs/mech_dummy/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_dummy/Makefile.com
@@ -39,7 +39,7 @@ include $(SRC)/lib/Makefile.lib
 MAPFILES =
 
 CPPFLAGS +=	-I../../libgss -I$(SRC)/uts/common/gssapi/include \
-	    	-I$(ROOT)/usr/include/gssapi
+		-I$(ROOT)/usr/include/gssapi
 
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	$(CNOWARN_UNINIT)
@@ -55,6 +55,4 @@ LDLIBS +=	-lgss -lc
 
 all: $(LIBS)
 
-lint: lintcheck
-
 include $(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/gss_mechs/mech_krb5/Makefile b/usr/src/lib/gss_mechs/mech_krb5/Makefile
index c725934855..eb74dd593d 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/Makefile
+++ b/usr/src/lib/gss_mechs/mech_krb5/Makefile
@@ -55,11 +55,10 @@ all :=          TARGET= all
 clean :=        TARGET= clean
 clobber :=      TARGET= clobber
 install :=      TARGET= install
-lint :=         TARGET= lint
 
 .KEEP_STATE:
 
-all clean lint:    $(SUBDIRS)
+all clean:    $(SUBDIRS)
 
 install: install_dir all .WAIT $(SUBDIRS)
 
diff --git a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com
index f60e973d26..5c09e472fc 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com
@@ -55,10 +55,10 @@ CRYPTO_UTS= cksumtypes.o decrypt.o encrypt.o encrypt_length.o \
 CRYPTO_RAW= raw_decrypt.o raw_encrypt.o
 
 # crypto/des user space only
-CRYPTO_DES= afsstring2key.o string2key.o 
+CRYPTO_DES= afsstring2key.o string2key.o
 
 # crypto/des common to user and kernel space
-CRYPTO_DES_UTS= f_cbc.o f_cksum.o f_parity.o weak_key.o d3_cbc.o 
+CRYPTO_DES_UTS= f_cbc.o f_cksum.o f_parity.o weak_key.o d3_cbc.o
 
 # crypto/arcfour user space only
 CRYPTO_ARCFOUR= arcfour_str2key.o
@@ -95,7 +95,7 @@ CRYPTO_KEYHASH= k5_md5des.o hmac_md5.o
 CRYPTO_KEYHASH_UTS= descbc.o
 
 # crypto/old
-CRYPTO_OLD=  des_stringtokey.o 
+CRYPTO_OLD=  des_stringtokey.o
 
 # crypto/old
 CRYPTO_OLD_UTS=  old_encrypt.o old_decrypt.o
@@ -159,7 +159,7 @@ K5_POSIX= setenv.o
 K5_RCACHE=rc_base.o rc_file.o rc_mem.o rc_common.o rc_io.o rcdef.o rc_conv.o \
 	ser_rc.o rcfns.o rc_none.o
 
-MECH= 	accept_sec_context.o store_cred.o \
+MECH=	accept_sec_context.o store_cred.o \
 	add_cred.o disp_com_err_status.o  disp_major_status.o \
 	compare_name.o context_time.o copy_ccache.o \
 	disp_name.o disp_status.o export_sec_context.o \
@@ -269,7 +269,7 @@ SMATCH=off
 
 MAPFILES =	../mapfile-vers
 
-#CPPFLAGS += 	-D_REENTRANT
+#CPPFLAGS +=	-D_REENTRANT
 $(PICS) :=	CFLAGS += $(XFFLAG)
 $(PICS) :=	CFLAGS64 += $(XFFLAG)
 $(PICS) :=	CCFLAGS += $(XFFLAG)
@@ -572,10 +572,3 @@ kwarnd_handle.c: $(SRC)/cmd/krb5/kwarn/kwarnd_handle.c
 
 CLOBBERFILES += kwarnd.h \
 	kwarnd_clnt.c kwarnd_clnt_stubs.c kwarnd_handle.c kwarnd_xdr.c
-
-# So lint.out won't be needlessly recreated
-lint: $(LINTOUT)
-
-$(LINTOUT): $(SOURCES)
-	$(LINT.c) -o $(LIBNAME) $(SOURCES) > $(LINTOUT) 2>&1
-
diff --git a/usr/src/lib/gss_mechs/mech_spnego/Makefile b/usr/src/lib/gss_mechs/mech_spnego/Makefile
index 027c489ed5..2a7b009bc6 100644
--- a/usr/src/lib/gss_mechs/mech_spnego/Makefile
+++ b/usr/src/lib/gss_mechs/mech_spnego/Makefile
@@ -24,9 +24,8 @@
 #
 
 #
-# This make file will build mech_spnego.so.1. This shared object
-# contains all the functionality needed to support the 
-# SPNEGO GSS-API mechanism. 
+# This make file will build mech_spnego.so.1. This shared object contains all
+# the functionality needed to support the SPNEGO GSS-API mechanism.
 #
 
 include ../../Makefile.lib
@@ -41,11 +40,10 @@ all :=		TARGET= all
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 install :=	TARGET= install
-lint :=         TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install lint:  $(SUBDIRS)
+all clean clobber install:  $(SUBDIRS)
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/gss_mechs/mech_spnego/Makefile.com b/usr/src/lib/gss_mechs/mech_spnego/Makefile.com
index a3bfcc615a..31b942a0f4 100644
--- a/usr/src/lib/gss_mechs/mech_spnego/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_spnego/Makefile.com
@@ -26,19 +26,19 @@
 #
 # This make file will build mech_spnego.so.1. This shared object
 # contains all the functionality needed to support the SPNEGO GSS-API
-# mechanism. 
+# mechanism.
 #
 
-LIBRARY = 	mech_spnego.a
-VERS = 		.1
-OBJECTS = 	spnego_mech.o spnego_disp_status.o spnego_kerrs.o
+LIBRARY =	mech_spnego.a
+VERS =		.1
+OBJECTS =	spnego_mech.o spnego_disp_status.o spnego_kerrs.o
 
 # include library definitions
 include ../../../Makefile.lib
 
-LIBS = 		$(DYNLIB)
+LIBS =		$(DYNLIB)
 ROOTLIBDIR =	$(ROOT)/usr/lib/gss
-ROOTLIBDIR64 = 	$(ROOT)/usr/lib/$(MACH64)/gss
+ROOTLIBDIR64 =	$(ROOT)/usr/lib/$(MACH64)/gss
 SRCDIR =	../mech
 
 MAPFILES =	../mapfile-vers
@@ -55,8 +55,6 @@ SMATCH=off
 
 all: $(LIBS)
 
-lint: lintcheck
-
 # include library targets
 include ../../../Makefile.targ