From a452d0707be53767f7c802b6b455f4885d4975a0 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 12 Apr 2019 16:22:04 -0500 Subject: [PATCH] auth: kill AuthUnknownSessionHandler The only user is ProtocolV1, which passes in an in-use auth_method... which must be either AUTH_NONE or AUTH_CEPHX since we successfully authenticated at this point. Signed-off-by: Sage Weil --- src/auth/AuthSessionHandler.cc | 3 --- src/auth/CMakeLists.txt | 3 +-- src/auth/unknown/AuthUnknownSessionHandler.h | 19 ------------------- 3 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 src/auth/unknown/AuthUnknownSessionHandler.h diff --git a/src/auth/AuthSessionHandler.cc b/src/auth/AuthSessionHandler.cc index 5835396075b..9a03138ca2e 100644 --- a/src/auth/AuthSessionHandler.cc +++ b/src/auth/AuthSessionHandler.cc @@ -19,7 +19,6 @@ #include "krb/KrbSessionHandler.hpp" #endif #include "none/AuthNoneSessionHandler.h" -#include "unknown/AuthUnknownSessionHandler.h" #include "common/ceph_crypto.h" #define dout_subsys ceph_subsys_auth @@ -44,8 +43,6 @@ AuthSessionHandler *get_auth_session_handler( return new CephxSessionHandler(cct, key, features); case CEPH_AUTH_NONE: return new AuthNoneSessionHandler(); - case CEPH_AUTH_UNKNOWN: - return new AuthUnknownSessionHandler(); #ifdef HAVE_GSSAPI case CEPH_AUTH_GSS: return new KrbSessionHandler(); diff --git a/src/auth/CMakeLists.txt b/src/auth/CMakeLists.txt index d4bfa1a52fa..c977acd8b3d 100644 --- a/src/auth/CMakeLists.txt +++ b/src/auth/CMakeLists.txt @@ -10,8 +10,7 @@ set(auth_srcs cephx/CephxClientHandler.cc cephx/CephxProtocol.cc cephx/CephxSessionHandler.cc - none/AuthNoneAuthorizeHandler.cc - unknown/AuthUnknownAuthorizeHandler.cc) + none/AuthNoneAuthorizeHandler.cc) if(HAVE_GSSAPI) list(APPEND auth_srcs diff --git a/src/auth/unknown/AuthUnknownSessionHandler.h b/src/auth/unknown/AuthUnknownSessionHandler.h deleted file mode 100644 index 7230663da29..00000000000 --- a/src/auth/unknown/AuthUnknownSessionHandler.h +++ /dev/null @@ -1,19 +0,0 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- -// vim: ts=8 sw=2 smarttab -/* - * Ceph - scalable distributed file system - * - * Copyright (C) 2004-2009 Sage Weil - * - * This is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software - * Foundation. See file COPYING. - * - */ - -#include "auth/AuthSessionHandler.h" - -struct AuthUnknownSessionHandler : DummyAuthSessionHandler { -}; - -- 2.39.5