auth: Add a uid field to EntityAuth; make it a required feature

diff --git a/src/auth/Auth.h b/src/auth/Auth.h
index 8ed17cc133f562a9f1fe91dd6cd9cd6981682193..0c43e4ccbe35d87b7467c938faae964c64231a64 100644 (file)
--- a/src/auth/Auth.h
+++ b/src/auth/Auth.h
@@ -106,18 +106,23 @@ static inline ostream& operator<<(ostream& out, const EntityName& n) {
 
 struct EntityAuth {
   CryptoKey key;
+  __le64 uid;
   map<string, bufferlist> caps;
 
   void encode(bufferlist& bl) const {
-    __u8 struct_v = 1;
+    __u8 struct_v = 2;
     ::encode(struct_v, bl);
     ::encode(key, bl);
+    ::encode(uid, bl);
     ::encode(caps, bl);
   }
   void decode(bufferlist::iterator& bl) {
     __u8 struct_v;
     ::decode(struct_v, bl);
     ::decode(key, bl);
+    if (struct_v >= 2)
+      ::decode(uid, bl);
+    else uid = -1;
     ::decode(caps, bl);
   }
 };

diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h
index 0c2241ef3653242657fc56a8c9cd7c49ea89af7b..291c405ce0ba71526c2279f30118a15db17f5f38 100644 (file)
--- a/src/include/ceph_fs.h
+++ b/src/include/ceph_fs.h
@@ -53,8 +53,9 @@
 /*
  * feature bits
  */
-#define CEPH_FEATURE_SUPPORTED  0
-#define CEPH_FEATURE_REQUIRED   0
+#define CEPH_FEATURE_UID        1
+#define CEPH_FEATURE_SUPPORTED  CEPH_FEATURE_UID
+#define CEPH_FEATURE_REQUIRED   CEPH_FEATURE_UID
 
 
 /*