---

yaml --- r: 188693 b: refs/heads/master c: 07c8739 h: refs/heads/master i: 188691: 7e22f60 v: v3
git-mirror · Feb 10, 2010 · 861582d · 861582d
1 parent d05379e
commit 861582d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9bd2e6f8ba71facf1cadb7154a7e0e4d345a6aba
+refs/heads/master: 07c8739c521cb029d0f3549556aae2d304513978
diff --git a/trunk/fs/ceph/auth.c b/trunk/fs/ceph/auth.c
@@ -107,8 +107,11 @@ int ceph_auth_build_hello(struct ceph_auth_client *ac, void *buf, size_t len)
 	lenp = p;
 	p += sizeof(u32);
 
+	ceph_decode_need(&p, end, 1 + sizeof(u32), bad);
+	ceph_encode_8(&p, 1);
 	num = ARRAY_SIZE(supported_protocols);
 	ceph_encode_32(&p, num);
+	ceph_decode_need(&p, end, num * sizeof(u32), bad);
 	for (i = 0; i < num; i++)
 		ceph_encode_32(&p, supported_protocols[i]);
 

diff --git a/trunk/fs/ceph/auth_none.c b/trunk/fs/ceph/auth_none.c
@@ -62,6 +62,7 @@ static int ceph_auth_none_create_authorizer(
 	if (!ai->built_authorizer) {
 		p = au->buf;
 		end = p + sizeof(au->buf);
+		ceph_encode_8(&p, 1);
 		ret = ceph_entity_name_encode(ac->name, &p, end - 8);
 		if (ret < 0)
 			goto bad;