summaryrefslogtreecommitdiff
path: root/usr
diff options
context:
space:
mode:
Diffstat (limited to 'usr')
-rw-r--r--usr/src/cmd/cmd-inet/usr.sbin/Makefile40
-rw-r--r--usr/src/cmd/krb5/kdestroy/Makefile20
-rw-r--r--usr/src/cmd/krb5/kinit/Makefile17
-rw-r--r--usr/src/cmd/krb5/kwarn/Makefile23
-rw-r--r--usr/src/lib/gss_mechs/mech_krb5/mapfile-vers2
-rw-r--r--usr/src/lib/pam_modules/krb5/Makefile.com46
-rw-r--r--usr/src/lib/pam_modules/krb5/amd64/Makefile2
-rw-r--r--usr/src/lib/pam_modules/krb5/i386/Makefile2
-rw-r--r--usr/src/lib/pam_modules/krb5/sparc/Makefile2
-rw-r--r--usr/src/lib/pam_modules/krb5/sparcv9/Makefile2
10 files changed, 36 insertions, 120 deletions
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/Makefile
index c6d37ea1f0..64fbfd89e0 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/Makefile
@@ -98,31 +98,6 @@ include ../Makefile.cmd-inet
ROOTSBINPROG = $(ROOTFS_PROG:%=$(ROOTSBIN)/%)
ROOTUSRSBINLINKS = $(SBINLINKS:%=$(ROOTUSRSBIN)/%)
-KWARN_OBJS = kwarnd_clnt_stubs.o kwarnd_clnt.o kwarnd_handle.o kwarnd_xdr.o
-KWARN_SRC = $(KWARN_OBJS:%.o=%.c)
-KWARN_SRC += kwarnd.h
-kwarnd.h: $(SRC)/cmd/krb5/kwarn/kwarnd.x
- $(RM) $@
- $(RPCGEN) -M -h $(SRC)/cmd/krb5/kwarn/kwarnd.x | \
- $(SED) -e 's!$(SRC)/cmd/krb5/kwarn/kwarnd.h!kwarnd.h!' > $@
-
-kwarnd_xdr.c: kwarnd.h $(SRC)/cmd/krb5/kwarn/kwarnd.x
- $(RM) $@
- $(RPCGEN) -M -c $(SRC)/cmd/krb5/kwarn/kwarnd.x | \
- $(SED) -e 's!$(SRC)/cmd/krb5/kwarn/kwarnd.h!kwarnd.h!' > $@
-
-kwarnd_clnt.c: kwarnd.h $(SRC)/cmd/krb5/kwarn/kwarnd.x
- $(RM) $@
- $(RPCGEN) -M -l $(SRC)/cmd/krb5/kwarn/kwarnd.x | \
- $(SED) -e 's!$(SRC)/cmd/krb5/kwarn/kwarnd.h!kwarnd.h!' > $@
-kwarnd_clnt_stubs.c: kwarnd.h $(SRC)/cmd/krb5/kwarn/kwarnd_clnt_stubs.c
- $(RM) $@
- $(CP) $(SRC)/cmd/krb5/kwarn/kwarnd_clnt_stubs.c $@
-
-kwarnd_handle.c: $(SRC)/cmd/krb5/kwarn/kwarnd_handle.c
- $(RM) $@
- $(CP) $(SRC)/cmd/krb5/kwarn/kwarnd_handle.c $@
-
COMMONOBJS= addr_match.o kcmd.o store_forw_creds.o
COMMONSRCS= $(COMMONOBJS:%.o=$(CMDINETCOMMONDIR)/%.c)
SRCS+= $(COMMONSRCS)
@@ -140,9 +115,8 @@ clobber:= TARGET= clobber
lint:= TARGET= lint
_msg:= TARGET= _msg
-CLOBBERFILES += $(ROOTFS_PROG) $(PROG) $(KWARN_SRC)
+CLOBBERFILES += $(ROOTFS_PROG) $(PROG)
CLEANFILES += $(COMMONOBJS) $(K5RLOGINOBJS) $(K5RSHDOBJS) $(TFTPDOBJS)
-CLEANFILES += $(KWARN_OBJS)
CPPFLAGS += -DSYSV -DBSD_COMP -I$(CMDINETCOMMONDIR) -I
@@ -196,16 +170,16 @@ $(POFILE): $(POFILES)
%.o: $(CMDINETCOMMONDIR)/%.c
$(COMPILE.c) -o $@ $<
-in.telnetd: $(K5TELNETOBJS) $(KWARN_OBJS)
- $(LINK.c) $(K5TELNETOBJS) $(KWARN_OBJS) -o $@ $(LDLIBS)
+in.telnetd: $(K5TELNETOBJS)
+ $(LINK.c) $(K5TELNETOBJS) -o $@ $(LDLIBS)
$(POST_PROCESS)
-in.rlogind: $(K5RLOGINOBJS) $(COMMONOBJS) $(KWARN_OBJS)
- $(LINK.c) $(K5RLOGINOBJS) $(COMMONOBJS) $(KWARN_OBJS) -o $@ $(LDLIBS)
+in.rlogind: $(K5RLOGINOBJS) $(COMMONOBJS)
+ $(LINK.c) $(K5RLOGINOBJS) $(COMMONOBJS) -o $@ $(LDLIBS)
$(POST_PROCESS)
-in.rshd: $(K5RSHDOBJS) $(COMMONOBJS) $(KWARN_OBJS)
- $(LINK.c) $(K5RSHDOBJS) $(COMMONOBJS) $(KWARN_OBJS) -o $@ $(LDLIBS)
+in.rshd: $(K5RSHDOBJS) $(COMMONOBJS)
+ $(LINK.c) $(K5RSHDOBJS) $(COMMONOBJS) -o $@ $(LDLIBS)
$(POST_PROCESS)
in.tftpd: $(TFTPDOBJS)
diff --git a/usr/src/cmd/krb5/kdestroy/Makefile b/usr/src/cmd/krb5/kdestroy/Makefile
index 8131fccfe3..ba3d4515a8 100644
--- a/usr/src/cmd/krb5/kdestroy/Makefile
+++ b/usr/src/cmd/krb5/kdestroy/Makefile
@@ -1,5 +1,5 @@
#
-# 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"
@@ -7,13 +7,9 @@
PROG= kdestroy
-OBJS = kdestroy.o kwarnd_clnt_stubs.o kwarnd_clnt.o kwarnd_handle.o kwarnd_xdr.o krpc_sys.o
+OBJS = kdestroy.o krpc_sys.o
-SRCS = kdestroy.c krpc_sys.c \
- ../kwarn/kwarnd_clnt_stubs.c \
- ../kwarn/kwarnd_clnt.c \
- ../kwarn/kwarnd_handle.c \
- ../kwarn/kwarnd_xdr.c
+SRCS = kdestroy.c krpc_sys.c
include ../../Makefile.cmd
include $(SRC)/lib/gss_mechs/mech_krb5/Makefile.mech_krb5
@@ -22,14 +18,14 @@ POFILE = kdestroy.po
POFILES = generic.po
CPPFLAGS += -I../../../lib/gss_mechs/mech_krb5/include \
- -I$(SRC)/uts/common/gssapi/mechs/krb5/include \
- -I../kwarn
+ -I$(SRC)/uts/common/gssapi/mechs/krb5/include
+
i386_CPPFLAGS =
sparc_CPPFLAGS += -D$(MACH)
LDFLAGS += $(KRUNPATH)
-LDLIBS += $(KMECHLIB) -lnsl
+LDLIBS += $(KMECHLIB)
.KEEP_STATE:
all: $(PROG)
@@ -38,10 +34,6 @@ krpc_sys.o: krpc_sys.c
$(COMPILE.c) -o $@ krpc_sys.c
$(POST_PROCESS_O)
-%.o: ../kwarn/%.c
- $(COMPILE.c) -o $@ $<
- $(POST_PROCESS_O)
-
$(PROG): $(OBJS)
$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
$(POST_PROCESS)
diff --git a/usr/src/cmd/krb5/kinit/Makefile b/usr/src/cmd/krb5/kinit/Makefile
index 2f622dfeb7..8603af381e 100644
--- a/usr/src/cmd/krb5/kinit/Makefile
+++ b/usr/src/cmd/krb5/kinit/Makefile
@@ -1,5 +1,5 @@
#
-# 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"
@@ -7,12 +7,8 @@
PROG= kinit
-OBJS = kinit.o kwarnd_clnt_stubs.o kwarnd_clnt.o kwarnd_handle.o kwarnd_xdr.o
-SRCS = kinit.c \
- ../kwarn/kwarnd_clnt_stubs.c \
- ../kwarn/kwarnd_clnt.c \
- ../kwarn/kwarnd_handle.c \
- ../kwarn/kwarnd_xdr.c
+OBJS = kinit.o
+SRCS = kinit.c
DEFS = -DHAVE_LIBSOCKET=1 -DHAVE_LIBNSL=1 -DHAVE_PWD_H=1 -DHAVE_COMPILE=1 -DHAVE_STEP=1
@@ -28,20 +24,15 @@ CPPFLAGS += -I../../lib/gss_mechs/mech_krb5/include \
-I$(SRC)/lib/gss_mechs/mech_krb5 \
-I$(SRC)/lib/gss_mechs/mech_krb5/include \
-I$(SRC)/uts/common/gssapi/mechs/krb5/include \
- -I../kwarn \
$(DEFS)
LDFLAGS += $(KRUNPATH)
-LDLIBS += $(KMECHLIB) -lnsl
+LDLIBS += $(KMECHLIB)
.KEEP_STATE:
all: $(PROG)
-%.o: ../kwarn/%.c
- $(COMPILE.c) -o $@ $<
- $(POST_PROCESS_O)
-
$(PROG): $(OBJS)
$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
$(POST_PROCESS)
diff --git a/usr/src/cmd/krb5/kwarn/Makefile b/usr/src/cmd/krb5/kwarn/Makefile
index 498ba11f82..65979fb199 100644
--- a/usr/src/cmd/krb5/kwarn/Makefile
+++ b/usr/src/cmd/krb5/kwarn/Makefile
@@ -20,7 +20,7 @@
#
#
-# Copyright 2007 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,13 +32,13 @@ PROG= ktkt_warnd
MANIFEST= ktkt_warn.xml
KWARNDOBJS = kwarnd.o kwarnd_svc.o kwarnd_proc.o kwarnd_generic.o kwarnd_send.o
-KWARNCOBJS = kwarndtest.o kwarnd_clnt.o \
- kwarnd_clnt_stubs.o kwarnd_handle.o
+KWARNTOBJS = kwarndtest.o
+
G_OBJS = kwarnd_xdr.o
-OBJS = $(KWARNDOBJS) $(KWARNCOBJS) $(G_OBJS)
+OBJS = $(KWARNDOBJS) $(KWARNTOBJS) $(G_OBJS)
SRCS = $(OBJS:.o=.c)
-RSRC = kwarnd.h kwarnd_clnt.c kwarnd_svc.c kwarnd_xdr.c
+RSRC = kwarnd_xdr.c
CLOBBERFILES += $(TESTPROG)
@@ -72,8 +72,9 @@ $(PROG): $(G_OBJS) $(KWARNDOBJS) $$(MAPFILES)
$(LINK.c) $(KWARNDOBJS) $(G_OBJS) -o $@ $(LDLIBS)
$(POST_PROCESS)
-$(TESTPROG): $(G_OBJS) $(KWARNCOBJS)
- $(LINK.c) $(KWARNCOBJS) $(G_OBJS) -o $@ $(LDLIBS)
+# the client entry points (kwarn_*_warning) are now avail in mech_krb5.so
+$(TESTPROG): $(KWARNTOBJS)
+ $(LINK.c) $(KWARNTOBJS) -o $@ $(LDLIBS)
$(POST_PROCESS)
# Rules to generate derived rpcgen files from kwarnd.x spec file.
@@ -82,14 +83,6 @@ kwarnd.h: kwarnd.x
$(RM) $@
$(RPCGEN) -M -h kwarnd.x > $@
-kwarnd_clnt.c: kwarnd.x
- $(RM) $@
- $(RPCGEN) -M -l kwarnd.x > $@
-
-kwarnd_svc.c: kwarnd.x
- $(RM) $@
- $(RPCGEN) -M -m kwarnd.x > $@
-
kwarnd_xdr.c: kwarnd.x
$(RM) $@
$(RPCGEN) -M -c kwarnd.x > $@
diff --git a/usr/src/lib/gss_mechs/mech_krb5/mapfile-vers b/usr/src/lib/gss_mechs/mech_krb5/mapfile-vers
index a4fc442972..69486fc940 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/mapfile-vers
+++ b/usr/src/lib/gss_mechs/mech_krb5/mapfile-vers
@@ -742,6 +742,8 @@ SUNWprivate_1.1 {
krb5int_pbkdf2_hmac_sha1;
krb5int_sendtokdc_debug_handler;
krb5int_vset_error;
+ kwarn_add_warning;
+ kwarn_del_warning;
kv5m_error_table;
mit_des_check_key_parity;
mit_des_fixup_key_parity;
diff --git a/usr/src/lib/pam_modules/krb5/Makefile.com b/usr/src/lib/pam_modules/krb5/Makefile.com
index e2fdb51c30..0fa83784d5 100644
--- a/usr/src/lib/pam_modules/krb5/Makefile.com
+++ b/usr/src/lib/pam_modules/krb5/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,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2005 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/Makefile.com
@@ -39,19 +38,7 @@ PRIV_OBJ= krb5_authenticate.o \
krb5_session.o \
utils.o
-DERIVED_OBJ= kwarnd_clnt_stubs.o \
- kwarnd_clnt.o \
- kwarnd_handle.o \
- kwarnd_xdr.o
-
-OBJECTS= $(PRIV_OBJ) $(DERIVED_OBJ)
-
-JOBJ= kwarnd.x \
- kwarnd.h \
- kwarnd_clnt_stubs.c \
- kwarnd_handle.c \
- kwarnd_xdr.c \
- kwarnd_clnt.c
+OBJECTS= $(PRIV_OBJ)
include ../../Makefile.pam_modules
@@ -66,7 +53,7 @@ CPPFLAGS += -I../../../gss_mechs/mech_krb5/include \
# called after dlclose()
DYNFLAGS += $(ZNODELETE)
-CLOBBERFILES += $(LINTLIB) $(LINTOUT) $(JOBJ) $(POFILE)
+CLOBBERFILES += $(LINTLIB) $(LINTOUT) $(POFILE)
#
# Don't lint derived files
@@ -78,26 +65,3 @@ all: $(LIBS)
lint: lintcheck
include $(SRC)/lib/Makefile.targ
-
-kwarnd.h: $(SRC)/cmd/krb5/kwarn/kwarnd.x
- $(RM) $@
- $(RPCGEN) -M -h $(SRC)/cmd/krb5/kwarn/kwarnd.x | \
- $(SED) -e 's!$(SRC)/cmd/krb5/kwarn/kwarnd.h!kwarnd.h!' > $@
-
-kwarnd_xdr.c: kwarnd.h $(SRC)/cmd/krb5/kwarn/kwarnd.x
- $(RM) $@
- $(RPCGEN) -M -c $(SRC)/cmd/krb5/kwarn/kwarnd.x | \
- $(SED) -e 's!$(SRC)/cmd/krb5/kwarn/kwarnd.h!kwarnd.h!' > $@
-
-kwarnd_clnt.c: kwarnd.h $(SRC)/cmd/krb5/kwarn/kwarnd.x
- $(RM) $@
- $(RPCGEN) -M -l $(SRC)/cmd/krb5/kwarn/kwarnd.x | \
- $(SED) -e 's!$(SRC)/cmd/krb5/kwarn/kwarnd.h!kwarnd.h!' > $@
-
-kwarnd_clnt_stubs.c: kwarnd.h $(SRC)/cmd/krb5/kwarn/kwarnd_clnt_stubs.c
- $(RM) $@
- $(CP) $(SRC)/cmd/krb5/kwarn/kwarnd_clnt_stubs.c $@
-
-kwarnd_handle.c: $(SRC)/cmd/krb5/kwarn/kwarnd_handle.c
- $(RM) $@
- $(CP) $(SRC)/cmd/krb5/kwarn/kwarnd_handle.c $@
diff --git a/usr/src/lib/pam_modules/krb5/amd64/Makefile b/usr/src/lib/pam_modules/krb5/amd64/Makefile
index b1a5f12f9c..2d96165ec2 100644
--- a/usr/src/lib/pam_modules/krb5/amd64/Makefile
+++ b/usr/src/lib/pam_modules/krb5/amd64/Makefile
@@ -28,7 +28,7 @@
include ../Makefile.com
include ../../../Makefile.lib.64
-LDLIBS += -lpam -lnsl -lc
+LDLIBS += -lpam -lc
DYNFLAGS += -L$(ROOT_KLIBDIR64) -L$(ROOT)/$(KERBLIBDIR64) \
$(KRUNPATH64) $(KERBRUNPATH64) -lkadm5clnt -lmech_krb5
diff --git a/usr/src/lib/pam_modules/krb5/i386/Makefile b/usr/src/lib/pam_modules/krb5/i386/Makefile
index 2d32d64b6f..c653b54dd6 100644
--- a/usr/src/lib/pam_modules/krb5/i386/Makefile
+++ b/usr/src/lib/pam_modules/krb5/i386/Makefile
@@ -27,7 +27,7 @@
include ../Makefile.com
-LDLIBS += -lpam -lnsl -lc
+LDLIBS += -lpam -lc
DYNFLAGS += -L$(ROOT_KLIBDIR) -L$(ROOT)/$(KERBLIBDIR) \
$(KRUNPATH) $(KERBRUNPATH) -lkadm5clnt -lmech_krb5
diff --git a/usr/src/lib/pam_modules/krb5/sparc/Makefile b/usr/src/lib/pam_modules/krb5/sparc/Makefile
index 2d32d64b6f..c653b54dd6 100644
--- a/usr/src/lib/pam_modules/krb5/sparc/Makefile
+++ b/usr/src/lib/pam_modules/krb5/sparc/Makefile
@@ -27,7 +27,7 @@
include ../Makefile.com
-LDLIBS += -lpam -lnsl -lc
+LDLIBS += -lpam -lc
DYNFLAGS += -L$(ROOT_KLIBDIR) -L$(ROOT)/$(KERBLIBDIR) \
$(KRUNPATH) $(KERBRUNPATH) -lkadm5clnt -lmech_krb5
diff --git a/usr/src/lib/pam_modules/krb5/sparcv9/Makefile b/usr/src/lib/pam_modules/krb5/sparcv9/Makefile
index b1a5f12f9c..2d96165ec2 100644
--- a/usr/src/lib/pam_modules/krb5/sparcv9/Makefile
+++ b/usr/src/lib/pam_modules/krb5/sparcv9/Makefile
@@ -28,7 +28,7 @@
include ../Makefile.com
include ../../../Makefile.lib.64
-LDLIBS += -lpam -lnsl -lc
+LDLIBS += -lpam -lc
DYNFLAGS += -L$(ROOT_KLIBDIR64) -L$(ROOT)/$(KERBLIBDIR64) \
$(KRUNPATH64) $(KERBRUNPATH64) -lkadm5clnt -lmech_krb5
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-26 20:59:53 +0000