From 8baf4f951af3e9e291859c8e5cb2ea4a83c6a531 Mon Sep 17 00:00:00 2001
From: Alexander Pyhalov <apyhalov@gmail.com>
Date: Tue, 30 Jan 2018 16:15:59 +0300
Subject: [PATCH] 9015 krb5-config emits unnecessary -R flags 1295 krb5-config
 only understands krb5 Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
 Reviewed by: Toomas Soome <tsoome@me.com> Approved by: Dan McDonald
 <danmcd@joyent.com>

---
 usr/src/cmd/krb5/krb5-config/krb5-config.sh | 58 +++++------------------------
 1 file changed, 9 insertions(+), 49 deletions(-)

diff --git a/usr/src/cmd/krb5/krb5-config/krb5-config.sh b/usr/src/cmd/krb5/krb5-config/krb5-config.sh
index 9ad5b9fb06..b9e1e21a54 100644
--- a/usr/src/cmd/krb5/krb5-config/krb5-config.sh
+++ b/usr/src/cmd/krb5/krb5-config/krb5-config.sh
@@ -36,16 +36,6 @@ prefix=/usr
 exec_prefix=${prefix}
 includedir=${prefix}/include/kerberosv5
 libdir=${exec_prefix}/lib
-CC_LINK='$(PURE) $(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)'
-#KRB4_LIB=-lkrb4
-#DES425_LIB=-ldes425
-KDB5_DB_LIB=
-LDFLAGS=''
-RPATH_FLAG='-R'
-PTHREAD_CFLAGS='-D_REENTRANT '
-
-#LIBS='-lresolv -lsocket -lnsl '
-GEN_LIB=
 
 # Defaults for program
 library=krb5
@@ -87,6 +77,9 @@ while test $# != 0; do
 	krb5)
 	    library=krb5
 	    ;;
+	gssapi)
+	    library=gssapi
+	    ;;
 	*)
 	    echo "$0: Unknown option \`$1' -- use \`--help' for usage"
 	    exit 1
@@ -113,6 +106,7 @@ if test -n "$do_help"; then
     echo "        [--libs]          List libraries required to link [LIBRARIES]"
     echo "Libraries:"
     echo "        krb5              Kerberos 5 application"
+    echo "        gssapi            GSSAPI application"
  
     exit 0
 fi
@@ -155,53 +149,19 @@ if test -n "$do_cflags"; then
     echo "-I${includedir}"
 fi
 
-
 if test -n "$do_libs"; then
-    # Ugly gross hack for our build tree
-    lib_flags=`echo $CC_LINK | sed -e 's/\$(CC)//' \
-	    -e 's/\$(PURE)//' \
-	    -e 's#\$(PROG_RPATH)#'$libdir'#' \
-	    -e 's#\$(PROG_LIBPATH)#-L'$libdir'#' \
-	    -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
-	    -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
-	    -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
-	    -e 's#\$(CFLAGS)#'"$CFLAGS"'#'`
-
-    if test $library = 'kdb'; then
-	lib_flags="$lib_flags -lkdb5 $KDB5_DB_LIB"
-	library=krb5
-    fi
-
-    if test $library = 'kadm_server'; then
-	lib_flags="$lib_flags -lkadm5srv -lkdb5 $KDB5_DB_LIB"
-	library=kadm_common
-    fi
-
-    if test $library = 'kadm_client'; then
-	lib_flags="$lib_flags -lkadm5clnt"
-	library=kadm_common
-    fi
-
-    if test $library = 'kadm_common'; then
-	lib_flags="$lib_flags -lgssrpc"
-	library=gssapi
-    fi
+    lib_flags="-L$libdir"
 
     if test $library = 'gssapi'; then
-	lib_flags="$lib_flags -lgssapi_krb5"
-	library=krb5
-    fi
-
-    if test $library = 'krb4'; then
-	lib_flags="$lib_flags $KRB4_LIB $DES425_LIB"
-	library=krb5
+       lib_flags="$lib_flags -lgss"
+       library=krb5
     fi
 
     if test $library = 'krb5'; then
-	lib_flags="$lib_flags -lkrb5  $LIBS $GEN_LIB"
+       lib_flags="$lib_flags -lkrb5"
     fi
 
-    echo $lib_flags
+    echo "$lib_flags"
 fi
 
 exit 0
-- 
2.11.4.GIT