From: Sage Weil <sage@redhat.com>
Date: Sun, 3 Feb 2019 20:27:49 +0000 (-0600)
Subject: build: disable kerberos for nautilus
X-Git-Tag: v14.1.0~202^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F26258%2Fhead;p=ceph.git

build: disable kerberos for nautilus

We can re-enable after we branch.  For N, though, there is no point in dragging
in the dependencies and implying there is something that works.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2935a36f8d4..df8e6f95090d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -232,7 +232,7 @@ if(WITH_OPENLDAP)
   set(HAVE_OPENLDAP ${OPENLDAP_FOUND})
 endif()
 
-option(WITH_GSSAPI "GSSAPI/KRB5 is here" ON)
+option(WITH_GSSAPI "GSSAPI/KRB5 is here" OFF)
 if(WITH_GSSAPI)
   find_package(GSSApi REQUIRED)
   set(HAVE_GSSAPI ${GSSApi_FOUND})
diff --git a/ceph.spec.in b/ceph.spec.in
index 9647878d1db5..737a1f1f6ad3 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -229,8 +229,8 @@ BuildRequires:	keyutils-devel
 BuildRequires:  libopenssl-devel
 BuildRequires:  lsb-release
 BuildRequires:  openldap2-devel
-BuildRequires:  krb5
-BuildRequires:  krb5-devel
+#BuildRequires:  krb5
+#BuildRequires:  krb5-devel
 BuildRequires:  cunit-devel
 BuildRequires:	python%{_python_buildid}-base
 BuildRequires:	python%{_python_buildid}-Cython
@@ -248,7 +248,7 @@ BuildRequires:	keyutils-libs-devel
 BuildRequires:	libibverbs-devel
 BuildRequires:  librdmacm-devel
 BuildRequires:  openldap-devel
-BuildRequires:  krb5-devel
+#BuildRequires:  krb5-devel
 BuildRequires:  openssl-devel
 BuildRequires:  CUnit-devel
 BuildRequires:  redhat-lsb-core
diff --git a/debian/control b/debian/control
index 0b0cceb03915..392070153082 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,6 @@ Build-Depends: bc,
                librdmacm-dev,
                libkeyutils-dev,
                libldap2-dev,
-               libkrb5-dev,
                libleveldb-dev,
                liblttng-ust-dev,
                liblz4-dev (>= 0.0~r131),