From: Sage Weil <sage@redhat.com>
Date: Sun, 12 Aug 2018 17:43:26 +0000 (-0500)
Subject: mon/AuthMonitor: drop ancient auth inc encoding compat
X-Git-Tag: v14.0.1~431^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4fe8cef3279f1f3fd7f495cb4cfeba554c4b7bac;p=ceph.git

mon/AuthMonitor: drop ancient auth inc encoding compat

This is for *ancient* mons (I'm guessing bobtail?).

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

diff --git a/src/mon/AuthMonitor.h b/src/mon/AuthMonitor.h
index 4e22da1f782c1..4b6812428b6e5 100644
--- a/src/mon/AuthMonitor.h
+++ b/src/mon/AuthMonitor.h
@@ -48,19 +48,6 @@ public:
 
     void encode(bufferlist& bl, uint64_t features=-1) const {
       using ceph::encode;
-      if ((features & CEPH_FEATURE_MONENC) == 0) {
-	__u8 v = 1;
-	encode(v, bl);
-	__u32 _type = (__u32)inc_type;
-	encode(_type, bl);
-	if (_type == GLOBAL_ID) {
-	  encode(max_global_id, bl);
-	} else {
-	  encode(auth_type, bl);
-	  encode(auth_data, bl);
-	}
-	return;
-      } 
       ENCODE_START(2, 2, bl);
       __u32 _type = (__u32)inc_type;
       encode(_type, bl);