diff options
Diffstat (limited to 'usr/src/lib/krb5')
26 files changed, 30 insertions, 101 deletions
diff --git a/usr/src/lib/krb5/Makefile b/usr/src/lib/krb5/Makefile index 0e290610da..1a18b1fe7a 100644 --- a/usr/src/lib/krb5/Makefile +++ b/usr/src/lib/krb5/Makefile @@ -2,10 +2,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/krb5/Makefile -# + # include global definitions include ../../Makefile.master @@ -27,12 +24,11 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all install clean clobber lint _msg: $(SUBDIRS) +all install clean clobber _msg: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/krb5/Makefile.lib b/usr/src/lib/krb5/Makefile.lib index 1cd613abdb..f20baca434 100644 --- a/usr/src/lib/krb5/Makefile.lib +++ b/usr/src/lib/krb5/Makefile.lib @@ -22,19 +22,8 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/Makefile.lib ROOTLIBDIR= $(ROOT)/usr/lib/krb5 ROOTLIBDIR64= $(ROOT)/usr/lib/krb5/$(MACH64) -ROOTLINTDIR= $(ROOT)/usr/lib/krb5 - -# definitions for lint -LINTFLAGS= -u -I.. -LINTFLAGS64= -u -I.. -LINTSRC= $(LINTLIB:%.ln=%) -ROOTLINT= $(LINTSRC:%=$(ROOTLINTDIR)/%) - -CLEANFILES += $(LINTOUT) $(LINTLIB) diff --git a/usr/src/lib/krb5/Makefile.targ b/usr/src/lib/krb5/Makefile.targ index ff183bcdc0..794676c7b9 100644 --- a/usr/src/lib/krb5/Makefile.targ +++ b/usr/src/lib/krb5/Makefile.targ @@ -2,13 +2,6 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" -# -# -# lib/krb5/Makefile.targ -# -# included to define local library targets -# include $(SRC)/lib/Makefile.targ @@ -33,7 +26,3 @@ $(POFILE): $(DERIVED_FILES) .WAIT $(POFILES) $(MSGDOMAIN): $(INS.dir) - -# install rule for lint library target -$(ROOTLINTDIR)/%: ./% - $(INS.file) diff --git a/usr/src/lib/krb5/dyn/Makefile b/usr/src/lib/krb5/dyn/Makefile index fb23ce54a0..7efe47e87a 100644 --- a/usr/src/lib/krb5/dyn/Makefile +++ b/usr/src/lib/krb5/dyn/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -33,11 +31,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) _msg: diff --git a/usr/src/lib/krb5/dyn/Makefile.com b/usr/src/lib/krb5/dyn/Makefile.com index 0036b363b4..a0ab5662b9 100644 --- a/usr/src/lib/krb5/dyn/Makefile.com +++ b/usr/src/lib/krb5/dyn/Makefile.com @@ -71,7 +71,6 @@ SMOFF += no_if_block all: $(LIBS) -lint: lintcheck # include library targets include ../../Makefile.targ diff --git a/usr/src/lib/krb5/kadm5/Makefile b/usr/src/lib/krb5/kadm5/Makefile index bcdff4783e..b869878a5d 100644 --- a/usr/src/lib/krb5/kadm5/Makefile +++ b/usr/src/lib/krb5/kadm5/Makefile @@ -2,10 +2,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# lib/krb5/kadm5/Makefile -# + # include global definitions include ../../../Makefile.master @@ -19,12 +16,11 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all clean clobber install lint _msg: $(SUBDIRS) +all clean clobber install _msg: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/krb5/kadm5/clnt/Makefile b/usr/src/lib/krb5/kadm5/clnt/Makefile index ee930293f6..f5ae215ddc 100644 --- a/usr/src/lib/krb5/kadm5/clnt/Makefile +++ b/usr/src/lib/krb5/kadm5/clnt/Makefile @@ -32,15 +32,14 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint -LIBRARY= libkadm5clnt.a +LIBRARY= libkadm5clnt.a POFILE= $(LIBRARY:%.a=%.po) POFILES= generic.po .KEEP_STATE: -all clean install lint: $(SUBDIRS) +all clean install: $(SUBDIRS) clobber: $(SUBDIRS) $(RM) $(CLOBBERFILES) diff --git a/usr/src/lib/krb5/kadm5/clnt/Makefile.com b/usr/src/lib/krb5/kadm5/clnt/Makefile.com index 7d1ba760d9..4f0ea34d96 100644 --- a/usr/src/lib/krb5/kadm5/clnt/Makefile.com +++ b/usr/src/lib/krb5/kadm5/clnt/Makefile.com @@ -105,7 +105,6 @@ $(LIBS): $(ISRCHDR) CLEANFILES += $(ISRCHDR) -lint: lintcheck # include library targets include ../../../Makefile.targ diff --git a/usr/src/lib/krb5/kadm5/srv/Makefile b/usr/src/lib/krb5/kadm5/srv/Makefile index d85cc5dadb..d515234243 100644 --- a/usr/src/lib/krb5/kadm5/srv/Makefile +++ b/usr/src/lib/krb5/kadm5/srv/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -33,12 +31,11 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all clean clobber install lint _msg: $(SUBDIRS) +all clean clobber install _msg: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/krb5/kadm5/srv/Makefile.com b/usr/src/lib/krb5/kadm5/srv/Makefile.com index 4242c57ff3..1b6295e378 100644 --- a/usr/src/lib/krb5/kadm5/srv/Makefile.com +++ b/usr/src/lib/krb5/kadm5/srv/Makefile.com @@ -57,7 +57,7 @@ include ../../../Makefile.lib SRCS= $(SRV_OBJS:%.o=../%.c) \ $(SHARED_OBJS:%.o=../../%.c) -KRB5LIB= $(ROOT)/usr/lib/krb5 +KRB5LIB= $(ROOT)/usr/lib/krb5 LIBS= $(DYNLIB) @@ -100,7 +100,6 @@ SMOFF += all_func_returns,indenting all: $(LIBS) -lint: lintcheck # include library targets include ../../../Makefile.targ diff --git a/usr/src/lib/krb5/kdb/Makefile b/usr/src/lib/krb5/kdb/Makefile index 99160be316..d661792aec 100644 --- a/usr/src/lib/krb5/kdb/Makefile +++ b/usr/src/lib/krb5/kdb/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -33,12 +31,11 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all clean clobber install lint _msg: $(SUBDIRS) +all clean clobber install _msg: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/krb5/kdb/Makefile.com b/usr/src/lib/krb5/kdb/Makefile.com index bf341da1be..12e7bc3bbd 100644 --- a/usr/src/lib/krb5/kdb/Makefile.com +++ b/usr/src/lib/krb5/kdb/Makefile.com @@ -111,11 +111,6 @@ CLEANFILES += $(ISRCHDR) $(ISRCXDR) # Explicitly state the dependancy on iprop.h $(LIBS): $(ISRCHDR) -# We turn off ptr-cast warnings, since we're doing mmapping in kdb_log -LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN - -lint: lintcheck - # include library targets include ../../Makefile.targ diff --git a/usr/src/lib/krb5/plugins/Makefile b/usr/src/lib/krb5/plugins/Makefile index baeda9e18e..adbd4dadd7 100644 --- a/usr/src/lib/krb5/plugins/Makefile +++ b/usr/src/lib/krb5/plugins/Makefile @@ -37,12 +37,11 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all install clean clobber lint _msg: $(SUBDIRS) +all install clean clobber _msg: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/krb5/plugins/kdb/Makefile b/usr/src/lib/krb5/plugins/kdb/Makefile index 98ebdf761e..0b2411bbe6 100644 --- a/usr/src/lib/krb5/plugins/kdb/Makefile +++ b/usr/src/lib/krb5/plugins/kdb/Makefile @@ -21,8 +21,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# + # include global definitions include ../../../../Makefile.master @@ -38,12 +37,11 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all install clean clobber lint _msg: $(SUBDIRS) +all install clean clobber _msg: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/krb5/plugins/kdb/db2/Makefile b/usr/src/lib/krb5/plugins/kdb/db2/Makefile index 81afe989cb..07be6f773a 100644 --- a/usr/src/lib/krb5/plugins/kdb/db2/Makefile +++ b/usr/src/lib/krb5/plugins/kdb/db2/Makefile @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/krb5/Makefile.lib @@ -37,12 +35,11 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all clean clobber lint _msg: $(SUBDIRS) +all clean clobber _msg: $(SUBDIRS) $(ROOTLIBDIR): $(INS.dir) diff --git a/usr/src/lib/krb5/plugins/kdb/db2/Makefile.com b/usr/src/lib/krb5/plugins/kdb/db2/Makefile.com index 2715dee4aa..eaaa569dc2 100644 --- a/usr/src/lib/krb5/plugins/kdb/db2/Makefile.com +++ b/usr/src/lib/krb5/plugins/kdb/db2/Makefile.com @@ -37,7 +37,7 @@ DB2_OBJS= \ kdb_db2.o \ kdb_xdr.o \ pol_xdr.o - + OBJECTS= $(DB2_OBJS) # include library definitions @@ -54,7 +54,7 @@ POFILES = generic.po #override liblink INS.liblink= -$(RM) $@; $(SYMLINK) $(LIBLINKS)$(VERS) $@ -CPPFLAGS += -DHAVE_CONFIG_H -DHAVE_BT_RSEQ \ +CPPFLAGS += -DHAVE_CONFIG_H -DHAVE_BT_RSEQ \ -I$(SRC)/cmd/krb5/iprop \ -I$(SRC)/lib/krb5 \ -I$(SRC)/lib/krb5/kdb \ @@ -80,7 +80,6 @@ LDLIBS += -L $(ROOTLIBDIR) -ldb2 -lkdb -lkadm5srv -lc -lnsl all: $(LIBS) -lint: lintcheck # include library targets include $(SRC)/lib/krb5/Makefile.targ diff --git a/usr/src/lib/krb5/plugins/kdb/db2/libdb2/Makefile b/usr/src/lib/krb5/plugins/kdb/db2/libdb2/Makefile index c30b49d724..4b0dbd8a70 100644 --- a/usr/src/lib/krb5/plugins/kdb/db2/libdb2/Makefile +++ b/usr/src/lib/krb5/plugins/kdb/db2/libdb2/Makefile @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/krb5/Makefile.lib @@ -35,7 +33,6 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg README= README.db2 @@ -44,7 +41,7 @@ $(ROOTLIBDIR)/$(README) := FILEMODE= 444 .KEEP_STATE: -all clean clobber lint _msg: $(SUBDIRS) +all clean clobber _msg: $(SUBDIRS) $(ROOTLIBDIR): $(INS.dir) diff --git a/usr/src/lib/krb5/plugins/kdb/db2/libdb2/Makefile.com b/usr/src/lib/krb5/plugins/kdb/db2/libdb2/Makefile.com index 21245b1a0a..eff6cc3052 100644 --- a/usr/src/lib/krb5/plugins/kdb/db2/libdb2/Makefile.com +++ b/usr/src/lib/krb5/plugins/kdb/db2/libdb2/Makefile.com @@ -27,7 +27,7 @@ LIBRARY= libdb2.a VERS= .1 -# btree +# btree BTREE_OBJS= \ bt_close.o \ bt_conv.o \ @@ -41,9 +41,9 @@ BTREE_OBJS= \ bt_search.o \ bt_seq.o \ bt_split.o \ - bt_utils.o - -# db + bt_utils.o + +# db DB_OBJS= db.o # hash @@ -92,7 +92,7 @@ POFILES = generic.po #override liblink INS.liblink= -$(RM) $@; $(SYMLINK) $(LIBLINKS)$(VERS) $@ -CPPFLAGS += -DHAVE_CONFIG_H \ +CPPFLAGS += -DHAVE_CONFIG_H \ -I$(SRC)/lib/krb5/plugins/kdb/db2/libdb2/mpool \ -I$(SRC)/lib/krb5/plugins/kdb/db2/libdb2/db \ -I$(SRC)/lib/krb5/plugins/kdb/db2/libdb2/hash \ @@ -118,7 +118,6 @@ DYNFLAGS += $(ZINTERPOSE) all: $(LIBS) -lint: lintcheck # include library targets include $(SRC)/lib/krb5/Makefile.targ diff --git a/usr/src/lib/krb5/plugins/kdb/ldap/Makefile b/usr/src/lib/krb5/plugins/kdb/ldap/Makefile index e8f2cca368..219b4ba659 100644 --- a/usr/src/lib/krb5/plugins/kdb/ldap/Makefile +++ b/usr/src/lib/krb5/plugins/kdb/ldap/Makefile @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/krb5/Makefile.lib @@ -35,12 +33,11 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all clean clobber lint: $(SUBDIRS) +all clean clobber: $(SUBDIRS) # no messages in this current dir but there are in libkdb_ldap _msg: libkdb_ldap diff --git a/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/Makefile b/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/Makefile index caf1946078..b109a1c1b4 100644 --- a/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/Makefile +++ b/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/Makefile @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/krb5/Makefile.lib @@ -35,7 +33,6 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg LDIF= kerberos.ldif @@ -45,7 +42,7 @@ $(ROOTLDIF) := FILEMODE= 444 .KEEP_STATE: -all clean clobber lint _msg: $(SUBDIRS) +all clean clobber _msg: $(SUBDIRS) $(ROOTLIBDIR): $(INS.dir) diff --git a/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/Makefile.com b/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/Makefile.com index a3751a8a9b..da239b2e3b 100644 --- a/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/Makefile.com +++ b/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/Makefile.com @@ -45,7 +45,7 @@ LIBKLDAP_OBJS= \ ldap_service_stash.o \ ldap_services.o \ ldap_tkt_policy.o \ - princ_xdr.o + princ_xdr.o OBJECTS= $(LIBKLDAP_OBJS) @@ -64,7 +64,7 @@ POFILES = generic.po #override liblink INS.liblink= -$(RM) $@; $(SYMLINK) $(LIBLINKS)$(VERS) $@ -CPPFLAGS += -DHAVE_CONFIG_H \ +CPPFLAGS += -DHAVE_CONFIG_H \ -I$(SRC)/lib/krb5 \ -I$(SRC)/lib/krb5/kdb \ -I$(SRC)/lib/gss_mechs/mech_krb5/include \ @@ -88,7 +88,6 @@ LDLIBS += -L $(ROOTLIBDIR) -lkadm5srv -lc -lnsl -lldap all: $(LIBS) -lint: lintcheck # include library targets include $(SRC)/lib/krb5/Makefile.targ diff --git a/usr/src/lib/krb5/plugins/preauth/Makefile b/usr/src/lib/krb5/plugins/preauth/Makefile index 884a2af6ff..7add481d7d 100644 --- a/usr/src/lib/krb5/plugins/preauth/Makefile +++ b/usr/src/lib/krb5/plugins/preauth/Makefile @@ -36,12 +36,11 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all install clean clobber lint _msg: $(SUBDIRS) +all install clean clobber _msg: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile b/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile index 84965753db..9cc69b1f11 100644 --- a/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile +++ b/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile @@ -34,12 +34,11 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint _msg := TARGET= _msg .KEEP_STATE: -all clean clobber lint _msg: $(SUBDIRS) +all clean clobber _msg: $(SUBDIRS) $(ROOTLIBDIR): $(INS.dir) diff --git a/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com b/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com index 361550a94a..f8ad41f345 100644 --- a/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com +++ b/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com @@ -84,7 +84,6 @@ $(ROOTLIBDIR): all: $(LIBS) -lint: lintcheck # include library targets include $(SRC)/lib/krb5/Makefile.targ diff --git a/usr/src/lib/krb5/ss/Makefile b/usr/src/lib/krb5/ss/Makefile index 06dbca35d3..7f2ec44406 100644 --- a/usr/src/lib/krb5/ss/Makefile +++ b/usr/src/lib/krb5/ss/Makefile @@ -31,16 +31,15 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint -LIBRARY= libss.a +LIBRARY= libss.a POFILE = $(LIBRARY:%.a=%.po) POFILES = generic.po .KEEP_STATE: -all clean install lint: $(SUBDIRS) +all clean install: $(SUBDIRS) clobber: $(SUBDIRS) $(RM) $(CLOBBERFILES) diff --git a/usr/src/lib/krb5/ss/Makefile.com b/usr/src/lib/krb5/ss/Makefile.com index e8a090776a..c4b4f98bdc 100644 --- a/usr/src/lib/krb5/ss/Makefile.com +++ b/usr/src/lib/krb5/ss/Makefile.com @@ -82,7 +82,6 @@ $(PICS) := CFLAGS += $(XFFLAG) all: $(LIBS) -lint: lintcheck # include library targets include ../../Makefile.targ |