---

yaml --- r: 188694 b: refs/heads/master c: ec0994e h: refs/heads/master v: v3
git-mirror · Feb 11, 2010 · 5849585 · 5849585
1 parent 861582d
commit 5849585
Show file tree

Hide file tree

Showing 6 changed files with 802 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07c8739c521cb029d0f3549556aae2d304513978
+refs/heads/master: ec0994e48ea2aebf62ff08376227f3a9ccf46262
diff --git a/trunk/fs/ceph/Makefile b/trunk/fs/ceph/Makefile
@@ -15,6 +15,7 @@ ceph-objs := super.o inode.o dir.o file.o addr.o ioctl.o \
 	debugfs.o \
 	auth.o auth_none.o \
 	crypto.o armor.o \
+	auth_x.o \
 	ceph_fs.o ceph_strings.o ceph_hash.o ceph_frag.o
 
 else

diff --git a/trunk/fs/ceph/auth.c b/trunk/fs/ceph/auth.c
@@ -5,6 +5,7 @@
 
 #include "types.h"
 #include "auth_none.h"
+#include "auth_x.h"
 #include "decode.h"
 #include "super.h"
 
@@ -14,14 +15,17 @@
  * get protocol handler
  */
 static u32 supported_protocols[] = {
-	CEPH_AUTH_NONE
+	CEPH_AUTH_NONE,
+	CEPH_AUTH_CEPHX
 };
 
 int ceph_auth_init_protocol(struct ceph_auth_client *ac, int protocol)
 {
 	switch (protocol) {
 	case CEPH_AUTH_NONE:
 		return ceph_auth_none_init(ac);
+	case CEPH_AUTH_CEPHX:
+		return ceph_x_init(ac);
 	default:
 		return -ENOENT;
 	}