NEX-5202 krb5 must make sure local db headers precede any possible system db headers
Reviewed by: Hans Rosenfeld <hans.rosenfeld@nexenta.com>
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>

          --- old/usr/src/lib/krb5/plugins/kdb/db2/Makefile.com
          +++ new/usr/src/lib/krb5/plugins/kdb/db2/Makefile.com

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions
  11   11  # and limitations under the License.
  12   12  #
  13   13  # When distributing Covered Code, include this CDDL HEADER in each
  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  #
  22   22  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  23   23  # Use is subject to license terms.
  24   24  #
  25   25  
  26   26  LIBRARY= db2.a
  27   27  VERS= .1
  28   28  
  29   29  # XXX need to set the install path to plugin dir
  30   30  
  31   31  # db2 plugin objects
  32   32  DB2_OBJS= \
  33   33          adb_openclose.o \
  34   34          adb_policy.o \
  35   35          db2_exp.o \
  36   36          kdb_db2.o \
  37   37          kdb_xdr.o \
  38   38          pol_xdr.o
  39   39   
  40   40  OBJECTS= $(DB2_OBJS)
  41   41  
  42   42  # include library definitions
  43   43  include $(SRC)/lib/krb5/Makefile.lib
  44   44  
  45   45  LIBS=           $(DYNLIB)

  46   46  SRCS=   $(DB2_OBJS:%.o=../%.c)
  47   47  
  48   48  include $(SRC)/lib/gss_mechs/mech_krb5/Makefile.mech_krb5
  49   49  
  50   50  POFILE = $(LIBRARY:%.a=%.po)
  51   51  POFILES = generic.po
  52   52  
  53   53  #override liblink
  54   54  INS.liblink=    -$(RM) $@; $(SYMLINK) $(LIBLINKS)$(VERS) $@
  55   55  
  56      -CPPFLAGS +=     -DHAVE_CONFIG_H -DHAVE_BT_RSEQ \
       56 +# We need to ensure we find our own libdb2, not any that happen to be on the system
       57 +CPPFLAGS.first += -DHAVE_CONFIG_H -DHAVE_BT_RSEQ \
  57   58                  -I$(SRC)/cmd/krb5/iprop \
  58   59                  -I$(SRC)/lib/krb5 \
  59   60                  -I$(SRC)/lib/krb5/kdb \
  60   61                  -I$(SRC)/lib/gss_mechs/mech_krb5/include \
  61   62                  -I$(SRC)/lib/gss_mechs/mech_krb5/krb5/os \
  62   63                  -I$(SRC)/lib/gss_mechs/mech_krb5/include/krb5 \
  63   64                  -I$(SRC)/uts/common/gssapi/include/ \
  64   65                  -I$(SRC)/uts/common/gssapi/mechs/krb5/include
  65   66  
  66   67  CFLAGS +=       $(CCVERBOSE)

  67   68  CERRWARN +=     -_gcc=-Wno-unused-variable
  68   69  CERRWARN +=     -_gcc=-Wno-unused-function
  69   70  CERRWARN +=     -_gcc=-Wno-parentheses
  70   71  CERRWARN +=     -_gcc=-Wno-uninitialized
  71   72  
  72   73  DYNFLAGS +=     $(KRUNPATH) $(KERBRUNPATH) $(KMECHLIB)
  73   74  LDLIBS +=       -L $(ROOTLIBDIR) -ldb2 -lkdb -lkadm5srv -lc -lnsl
  74   75  
  75   76  .KEEP_STATE:
  76   77  
  77   78  all:    $(LIBS)
  78   79  
  79   80  lint:   lintcheck
  80   81  
  81   82  # include library targets
  82   83  include $(SRC)/lib/krb5/Makefile.targ
  83   84  
  84   85  FRC:
  85   86  
  86   87  generic.po: FRC
  87   88          $(RM) messages.po
  88   89          $(XGETTEXT) $(XGETFLAGS) `$(GREP) -l gettext ../*.[ch]`
  89   90          $(SED) "/^domain/d" messages.po > $@
  90   91          $(RM) messages.po

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX