#
# This patch provides Solaris specific private interfaces to satisfy run time
# dependencies for Kerberos related components in ON:
#
# kt_* *contracted with SMB team*
# k5_profile_* *contracted with SMB team*
# mit_des_fixup_key_parity
# krb5_os_init_context
# krb5_privacy_allowed
# profile_get_options_string
# profile_get_options_boolean
#
# NOTE:
#
# 1. This patch is Solaris specific. No need to contribute upstream.
#
# 2. prof_solaris.c has a change to fix profile_iterator issue
# which has not been integrated into current Solaris code yet.
# Patch source: in-house
#
--- a/src/lib/krb5/Makefile.in
+++ b/src/lib/krb5/Makefile.in
@@ -1,6 +1,6 @@
mydir=lib$(S)krb5
BUILDTOP=$(REL)..$(S)..
-LOCALINCLUDES = -I$(srcdir)/ccache -I$(srcdir)/keytab -I$(srcdir)/rcache -I$(srcdir)/os -I$(srcdir)/unicode
+LOCALINCLUDES = -I$(srcdir)/ccache -I$(srcdir)/keytab -I$(srcdir)/rcache -I$(srcdir)/os -I$(srcdir)/unicode -I$(srcdir)/../crypto/builtin/
SUBDIRS= error_tables asn.1 ccache keytab krb os rcache unicode
WINSUBDIRS= $(SUBDIRS) posix
DEFINES=-DLOCALEDIR=\"$(KRB5_LOCALEDIR)\"
@@ -15,7 +15,8 @@ DEFINES=-DLOCALEDIR=\"$(KRB5_LOCALEDIR)\"
TST=if test -n "`cat DONE`" ; then
-STLIBOBJS=krb5_libinit.o
+STLIBOBJS=krb5_libinit.o \
+ prof_solaris.o
LIBBASE=krb5
LIBMAJOR=3
@@ -47,10 +48,16 @@ SUBDIROBJLISTS= \
$(BUILDTOP)/util/profile/OBJS.ST
OBJS=\
- $(OUTPRE)krb5_libinit.$(OBJEXT)
+ $(OUTPRE)krb5_libinit.$(OBJEXT) \
+ $(OUTPRE)missing_interfaces.$(OBJEXT) \
+ $(OUTPRE)privacy_allowed.$(OBJEXT) \
+ $(OUTPRE)prof_solaris.$(OBJEXT)
SRCS=\
- $(srcdir)/krb5_libinit.c
+ $(srcdir)/krb5_libinit.c \
+ $(srcdir)/missing_interfaces.c \
+ $(srcdir)/privacy_allowed.c \
+ $(srcdir)/prof_solaris.c
RELDIR=krb5
SHLIB_EXPDEPS = \
@@ -58,7 +65,7 @@ SHLIB_EXPDEPS = \
$(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB)
SHLIB_EXPLIBS=-lk5crypto -lcom_err $(SUPPORT_LIB) @GEN_LIB@ $(LIBS)
-all-unix:: all-liblinks
+all-unix:: all-liblinks missing_interfaces.o privacy_allowed.o
all-windows::
--- a/src/lib/krb5/keytab/Makefile.in
+++ b/src/lib/krb5/keytab/Makefile.in
@@ -15,7 +15,8 @@ STLIBOBJS= \
kt_file.o \
kt_memory.o \
kt_srvtab.o \
- read_servi.o
+ read_servi.o \
+ kt_solaris.o
OBJS= \
$(OUTPRE)ktadd.$(OBJEXT) \
@@ -27,7 +28,8 @@ OBJS= \
$(OUTPRE)kt_file.$(OBJEXT) \
$(OUTPRE)kt_memory.$(OBJEXT) \
$(OUTPRE)kt_srvtab.$(OBJEXT) \
- $(OUTPRE)read_servi.$(OBJEXT)
+ $(OUTPRE)read_servi.$(OBJEXT) \
+ $(OUTPRE)kt_solaris.$(OBJEXT)
SRCS= \
$(srcdir)/ktadd.c \
@@ -39,7 +41,8 @@ SRCS= \
$(srcdir)/kt_file.c \
$(srcdir)/kt_memory.c \
$(srcdir)/kt_srvtab.c \
- $(srcdir)/read_servi.c
+ $(srcdir)/read_servi.c \
+ $(srcdir)/kt_solaris.c
EXTRADEPSRCS= \
$(srcdir)/t_keytab.c