LU-9430 utils: fix logic errors and putchar in sk_name2hmac()

[fs/lustre-release.git] / lustre / utils / gss / Makefile.am

diff --git a/lustre/utils/gss/Makefile.am b/lustre/utils/gss/Makefile.am
index 5807f0e..5bac807 100644 (file)
--- a/lustre/utils/gss/Makefile.am
+++ b/lustre/utils/gss/Makefile.am
@@ -1,14 +1,18 @@
 # GSS daemons & tools Makefile
 
 AM_CFLAGS := -fPIC \
-            -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DLUSTRE_UTILS=1
+            -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DLUSTRE_UTILS=1 \
+            -D_GNU_SOURCE
 
 LIBCFS := $(top_builddir)/libcfs/libcfs/libcfs.a
 
 sbin_PROGRAMS = lsvcgssd l_idmap
 
 if GSS_KEYRING
-sbin_PROGRAMS += lgss_keyring lgss_sk
+sbin_PROGRAMS += lgss_keyring
+if GSS_SSK
+sbin_PROGRAMS += lgss_sk
+endif
 endif
 
 if GSS_PIPEFS
@@ -22,7 +26,6 @@ COMMON_SRCS = \
         context_heimdal.c \
         context_spkm3.c \
         gss_util.c \
-        sk_utils.c \
         gss_oids.c \
         err_util.c \
         lsupport.c \
@@ -34,6 +37,10 @@ COMMON_SRCS = \
         sk_utils.h \
         lsupport.h
 
+if GSS_SSK
+COMMON_SRCS += sk_utils.c
+endif
+
 lgssd_SOURCES = \
         $(COMMON_SRCS) \
         gssd.c \
@@ -82,14 +89,11 @@ lgss_keyring_SOURCES = \
        context_heimdal.c \
        lgss_krb5_utils.c \
        lgss_null_utils.c \
-       lgss_sk_utils.c \
        lgss_utils.c \
        lsupport.c \
        err_util.c \
-       sk_utils.c \
        lgss_krb5_utils.h \
        lgss_utils.h \
-       sk_utils.h \
        err_util.h \
        lsupport.h
 
@@ -98,6 +102,9 @@ lgss_keyring_LDADD = $(LIBCFS) $(GSSAPI_LIBS) $(KRBLIBS) -lcrypto -lssl -lm -lke
 lgss_keyring_LDFLAGS = $(KRBLDFLAGS)
 lgss_keyring_DEPENDENCIES = $(LIBCFS)
 
+if GSS_SSK
+lgss_keyring_SOURCES += sk_utils.c sk_utils.h lgss_sk_utils.c
+
 lgss_sk_SOURCES = \
        lgss_sk.c \
        err_util.c \
@@ -108,5 +115,6 @@ lgss_sk_CFLAGS = $(AM_CFLAGS) $(CFLAGS) $(KRBCFLAGS)
 lgss_sk_LDADD = $(LIBCFS) $(GSSAPI_LIBS) $(KRBLIBS) -lcrypto -lssl -lm -lkeyutils
 lgss_sk_LDFLAGS = $(KRBLDFLAGS)
 lgss_sk_DEPENDENCIES = $(LIBCFS)
+endif
 
 EXTRA_DIST =