Merge PR #23550 into master

* refs/pull/23550/head:
	auth: Kerberos authentication

diff --cc ceph.spec.in
index c4ad3496c65c9e4b194c10b1bae8c8d5898ca648,f5eb7bc59b5a315ee50915f5b7ab28060210c379..4929d08341c981d8d05f6385b1acec886900cbde
--- 1/ceph.spec.in
--- 2/ceph.spec.in
+++ b/ceph.spec.in
@@@ -228,9 -221,11 +228,11 @@@ BuildRequires:   keyutils-deve
  BuildRequires:  libopenssl-devel
  BuildRequires:  lsb-release
  BuildRequires:  openldap2-devel
+ BuildRequires:  krb5
+ BuildRequires:  krb5-devel
  BuildRequires:  cunit-devel
  BuildRequires:        python%{_python_buildid}-base
 -BuildRequires:        python%{_python_buildid}-Cython
 +BuildRequires:        python%{_python_buildid}-Cython < 0.29
  BuildRequires:        python%{_python_buildid}-PrettyTable
  BuildRequires:        python%{_python_buildid}-Sphinx
  BuildRequires:  rdma-core-devel

diff --cc debian/control
Simple merge

diff --cc src/CMakeLists.txt
Simple merge

diff --cc src/auth/AuthSessionHandler.cc
Simple merge

diff --cc src/mds/MDSDaemon.h
Simple merge

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osd/OSD.h
Simple merge

diff --cc src/test/CMakeLists.txt
Simple merge

diff --cc src/vstart.sh
Simple merge