diff options
| author | Tommi Virtanen <tommi.virtanen@dreamhost.com> | 2011-03-26 00:32:57 +0100 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2011-03-29 21:11:16 +0200 |
| commit | 8323c3aa74cd92465350294567142d12ffdcc963 (patch) | |
| tree | 052e7374393994eea8d534f98ee1bc7acea4c2d9 /net/ceph/auth.c | |
| parent | libceph: fix null dereference when unregistering linger requests (diff) | |
| download | linux-8323c3aa74cd92465350294567142d12ffdcc963.tar.xz linux-8323c3aa74cd92465350294567142d12ffdcc963.zip | |
ceph: Move secret key parsing earlier.
This makes the base64 logic be contained in mount option parsing,
and prepares us for replacing the homebew key management with the
kernel key retention service.
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'net/ceph/auth.c')
| -rw-r--r-- | net/ceph/auth.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ceph/auth.c b/net/ceph/auth.c index 549c1f43e1d5..b4bf4ac090f1 100644 --- a/net/ceph/auth.c +++ b/net/ceph/auth.c @@ -35,12 +35,12 @@ static int ceph_auth_init_protocol(struct ceph_auth_client *ac, int protocol) /* * setup, teardown. */ -struct ceph_auth_client *ceph_auth_init(const char *name, const char *secret) +struct ceph_auth_client *ceph_auth_init(const char *name, const struct ceph_crypto_key *key) { struct ceph_auth_client *ac; int ret; - dout("auth_init name '%s' secret '%s'\n", name, secret); + dout("auth_init name '%s'\n", name); ret = -ENOMEM; ac = kzalloc(sizeof(*ac), GFP_NOFS); @@ -52,8 +52,8 @@ struct ceph_auth_client *ceph_auth_init(const char *name, const char *secret) ac->name = name; else ac->name = CEPH_AUTH_NAME_DEFAULT; - dout("auth_init name %s secret %s\n", ac->name, secret); - ac->secret = secret; + dout("auth_init name %s\n", ac->name); + ac->key = key; return ac; out: |