Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 46087
b: refs/heads/master
c: 8885cb3
h: refs/heads/master
i:
  46085: 5ddab46
  46083: 8cb1aab
  46079: a05d720
v: v3
  • Loading branch information
Chuck Lever authored and Trond Myklebust committed Feb 3, 2007
1 parent 1579dc3 commit 9c3797a
Show file tree
Hide file tree
Showing 14 changed files with 74 additions and 64 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a3f565b1e530a756472401835107d08fd291f242
refs/heads/master: 8885cb367f86ce02bed3bf18192d74a53ac3b81f
52 changes: 27 additions & 25 deletions trunk/net/sunrpc/auth_gss/auth_gss.c
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ gss_fill_context(const void *p, const void *end, struct gss_cl_ctx *ctx, struct
}
return q;
err:
dprintk("RPC: gss_fill_context returning %ld\n", -PTR_ERR(p));
dprintk("RPC: gss_fill_context returning %ld\n", -PTR_ERR(p));
return p;
}

Expand Down Expand Up @@ -276,10 +276,10 @@ __gss_find_upcall(struct gss_auth *gss_auth, uid_t uid)
if (pos->uid != uid)
continue;
atomic_inc(&pos->count);
dprintk("RPC: gss_find_upcall found msg %p\n", pos);
dprintk("RPC: gss_find_upcall found msg %p\n", pos);
return pos;
}
dprintk("RPC: gss_find_upcall found nothing\n");
dprintk("RPC: gss_find_upcall found nothing\n");
return NULL;
}

Expand Down Expand Up @@ -393,7 +393,8 @@ gss_refresh_upcall(struct rpc_task *task)
struct gss_upcall_msg *gss_msg;
int err = 0;

dprintk("RPC: %4u gss_refresh_upcall for uid %u\n", task->tk_pid, cred->cr_uid);
dprintk("RPC: %5u gss_refresh_upcall for uid %u\n", task->tk_pid,
cred->cr_uid);
gss_msg = gss_setup_upcall(task->tk_client, gss_auth, cred);
if (IS_ERR(gss_msg)) {
err = PTR_ERR(gss_msg);
Expand All @@ -413,8 +414,8 @@ gss_refresh_upcall(struct rpc_task *task)
spin_unlock(&gss_auth->lock);
gss_release_msg(gss_msg);
out:
dprintk("RPC: %4u gss_refresh_upcall for uid %u result %d\n", task->tk_pid,
cred->cr_uid, err);
dprintk("RPC: %5u gss_refresh_upcall for uid %u result %d\n",
task->tk_pid, cred->cr_uid, err);
return err;
}

Expand All @@ -426,7 +427,7 @@ gss_create_upcall(struct gss_auth *gss_auth, struct gss_cred *gss_cred)
DEFINE_WAIT(wait);
int err = 0;

dprintk("RPC: gss_upcall for uid %u\n", cred->cr_uid);
dprintk("RPC: gss_upcall for uid %u\n", cred->cr_uid);
gss_msg = gss_setup_upcall(gss_auth->client, gss_auth, cred);
if (IS_ERR(gss_msg)) {
err = PTR_ERR(gss_msg);
Expand Down Expand Up @@ -454,7 +455,8 @@ gss_create_upcall(struct gss_auth *gss_auth, struct gss_cred *gss_cred)
finish_wait(&gss_msg->waitqueue, &wait);
gss_release_msg(gss_msg);
out:
dprintk("RPC: gss_create_upcall for uid %u result %d\n", cred->cr_uid, err);
dprintk("RPC: gss_create_upcall for uid %u result %d\n",
cred->cr_uid, err);
return err;
}

Expand Down Expand Up @@ -546,14 +548,14 @@ gss_pipe_downcall(struct file *filp, const char __user *src, size_t mlen)
}
gss_put_ctx(ctx);
kfree(buf);
dprintk("RPC: gss_pipe_downcall returning length %Zu\n", mlen);
dprintk("RPC: gss_pipe_downcall returning length %Zu\n", mlen);
return mlen;
err_put_ctx:
gss_put_ctx(ctx);
err:
kfree(buf);
out:
dprintk("RPC: gss_pipe_downcall returning %d\n", err);
dprintk("RPC: gss_pipe_downcall returning %d\n", err);
return err;
}

Expand Down Expand Up @@ -591,7 +593,7 @@ gss_pipe_destroy_msg(struct rpc_pipe_msg *msg)
static unsigned long ratelimit;

if (msg->errno < 0) {
dprintk("RPC: gss_pipe_destroy_msg releasing msg %p\n",
dprintk("RPC: gss_pipe_destroy_msg releasing msg %p\n",
gss_msg);
atomic_inc(&gss_msg->count);
gss_unhash_msg(gss_msg);
Expand All @@ -618,7 +620,7 @@ gss_create(struct rpc_clnt *clnt, rpc_authflavor_t flavor)
struct rpc_auth * auth;
int err = -ENOMEM; /* XXX? */

dprintk("RPC: creating GSS authenticator for client %p\n",clnt);
dprintk("RPC: creating GSS authenticator for client %p\n", clnt);

if (!try_module_get(THIS_MODULE))
return ERR_PTR(err);
Expand Down Expand Up @@ -670,8 +672,8 @@ gss_destroy(struct rpc_auth *auth)
{
struct gss_auth *gss_auth;

dprintk("RPC: destroying GSS authenticator %p flavor %d\n",
auth, auth->au_flavor);
dprintk("RPC: destroying GSS authenticator %p flavor %d\n",
auth, auth->au_flavor);

gss_auth = container_of(auth, struct gss_auth, rpc_auth);
rpc_unlink(gss_auth->dentry);
Expand All @@ -689,7 +691,7 @@ gss_destroy(struct rpc_auth *auth)
static void
gss_destroy_ctx(struct gss_cl_ctx *ctx)
{
dprintk("RPC: gss_destroy_ctx\n");
dprintk("RPC: gss_destroy_ctx\n");

if (ctx->gc_gss_ctx)
gss_delete_sec_context(&ctx->gc_gss_ctx);
Expand All @@ -703,7 +705,7 @@ gss_destroy_cred(struct rpc_cred *rc)
{
struct gss_cred *cred = container_of(rc, struct gss_cred, gc_base);

dprintk("RPC: gss_destroy_cred \n");
dprintk("RPC: gss_destroy_cred \n");

if (cred->gc_ctx)
gss_put_ctx(cred->gc_ctx);
Expand All @@ -726,7 +728,7 @@ gss_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags)
struct gss_cred *cred = NULL;
int err = -ENOMEM;

dprintk("RPC: gss_create_cred for uid %d, flavor %d\n",
dprintk("RPC: gss_create_cred for uid %d, flavor %d\n",
acred->uid, auth->au_flavor);

if (!(cred = kzalloc(sizeof(*cred), GFP_KERNEL)))
Expand All @@ -745,7 +747,7 @@ gss_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags)
return &cred->gc_base;

out_err:
dprintk("RPC: gss_create_cred failed with error %d\n", err);
dprintk("RPC: gss_create_cred failed with error %d\n", err);
return ERR_PTR(err);
}

Expand Down Expand Up @@ -799,7 +801,7 @@ gss_marshal(struct rpc_task *task, __be32 *p)
struct kvec iov;
struct xdr_buf verf_buf;

dprintk("RPC: %4u gss_marshal\n", task->tk_pid);
dprintk("RPC: %5u gss_marshal\n", task->tk_pid);

*p++ = htonl(RPC_AUTH_GSS);
cred_len = p++;
Expand Down Expand Up @@ -865,7 +867,7 @@ gss_validate(struct rpc_task *task, __be32 *p)
u32 flav,len;
u32 maj_stat;

dprintk("RPC: %4u gss_validate\n", task->tk_pid);
dprintk("RPC: %5u gss_validate\n", task->tk_pid);

flav = ntohl(*p++);
if ((len = ntohl(*p++)) > RPC_MAX_AUTH_SIZE)
Expand All @@ -888,12 +890,12 @@ gss_validate(struct rpc_task *task, __be32 *p)
* calculate the length of the verifier: */
task->tk_auth->au_verfsize = XDR_QUADLEN(len) + 2;
gss_put_ctx(ctx);
dprintk("RPC: %4u GSS gss_validate: gss_verify_mic succeeded.\n",
dprintk("RPC: %5u gss_validate: gss_verify_mic succeeded.\n",
task->tk_pid);
return p + XDR_QUADLEN(len);
out_bad:
gss_put_ctx(ctx);
dprintk("RPC: %4u gss_validate failed.\n", task->tk_pid);
dprintk("RPC: %5u gss_validate failed.\n", task->tk_pid);
return NULL;
}

Expand Down Expand Up @@ -1063,7 +1065,7 @@ gss_wrap_req(struct rpc_task *task,
struct gss_cl_ctx *ctx = gss_cred_get_ctx(cred);
int status = -EIO;

dprintk("RPC: %4u gss_wrap_req\n", task->tk_pid);
dprintk("RPC: %5u gss_wrap_req\n", task->tk_pid);
if (ctx->gc_proc != RPC_GSS_PROC_DATA) {
/* The spec seems a little ambiguous here, but I think that not
* wrapping context destruction requests makes the most sense.
Expand All @@ -1086,7 +1088,7 @@ gss_wrap_req(struct rpc_task *task,
}
out:
gss_put_ctx(ctx);
dprintk("RPC: %4u gss_wrap_req returning %d\n", task->tk_pid, status);
dprintk("RPC: %5u gss_wrap_req returning %d\n", task->tk_pid, status);
return status;
}

Expand Down Expand Up @@ -1192,7 +1194,7 @@ gss_unwrap_resp(struct rpc_task *task,
status = decode(rqstp, p, obj);
out:
gss_put_ctx(ctx);
dprintk("RPC: %4u gss_unwrap_resp returning %d\n", task->tk_pid,
dprintk("RPC: %5u gss_unwrap_resp returning %d\n", task->tk_pid,
status);
return status;
}
Expand Down
8 changes: 4 additions & 4 deletions trunk/net/sunrpc/auth_gss/gss_krb5_crypto.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ krb5_encrypt(
goto out;

if (crypto_blkcipher_ivsize(tfm) > 16) {
dprintk("RPC: gss_k5encrypt: tfm iv size to large %d\n",
dprintk("RPC: gss_k5encrypt: tfm iv size to large %d\n",
crypto_blkcipher_ivsize(tfm));
goto out;
}
Expand All @@ -79,7 +79,7 @@ krb5_encrypt(

ret = crypto_blkcipher_encrypt_iv(&desc, sg, sg, length);
out:
dprintk("RPC: krb5_encrypt returns %d\n",ret);
dprintk("RPC: krb5_encrypt returns %d\n", ret);
return ret;
}

Expand All @@ -102,7 +102,7 @@ krb5_decrypt(
goto out;

if (crypto_blkcipher_ivsize(tfm) > 16) {
dprintk("RPC: gss_k5decrypt: tfm iv size to large %d\n",
dprintk("RPC: gss_k5decrypt: tfm iv size to large %d\n",
crypto_blkcipher_ivsize(tfm));
goto out;
}
Expand All @@ -114,7 +114,7 @@ krb5_decrypt(

ret = crypto_blkcipher_decrypt_iv(&desc, sg, sg, length);
out:
dprintk("RPC: gss_k5decrypt returns %d\n",ret);
dprintk("RPC: gss_k5decrypt returns %d\n",ret);
return ret;
}

Expand Down
3 changes: 2 additions & 1 deletion trunk/net/sunrpc/auth_gss/gss_krb5_mech.c
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,8 @@ gss_import_sec_context_kerberos(const void *p,
}

ctx_id->internal_ctx_id = ctx;
dprintk("RPC: Successfully imported new context.\n");

dprintk("RPC: Successfully imported new context.\n");
return 0;

out_err_free_key2:
Expand Down
2 changes: 1 addition & 1 deletion trunk/net/sunrpc/auth_gss/gss_krb5_seal.c
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ gss_get_mic_kerberos(struct gss_ctx *gss_ctx, struct xdr_buf *text,
s32 now;
u32 seq_send;

dprintk("RPC: gss_krb5_seal\n");
dprintk("RPC: gss_krb5_seal\n");

now = get_seconds();

Expand Down
2 changes: 1 addition & 1 deletion trunk/net/sunrpc/auth_gss/gss_krb5_seqnum.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ krb5_get_seq_num(struct crypto_blkcipher *key,
s32 code;
unsigned char plain[8];

dprintk("RPC: krb5_get_seq_num:\n");
dprintk("RPC: krb5_get_seq_num:\n");

if ((code = krb5_decrypt(key, cksum, buf, plain, 8)))
return code;
Expand Down
2 changes: 1 addition & 1 deletion trunk/net/sunrpc/auth_gss/gss_krb5_unseal.c
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ gss_verify_mic_kerberos(struct gss_ctx *gss_ctx,
unsigned char *ptr = (unsigned char *)read_token->data;
int bodysize;

dprintk("RPC: krb5_read_token\n");
dprintk("RPC: krb5_read_token\n");

if (g_verify_token_header(&ctx->mech_used, &bodysize, &ptr,
read_token->len))
Expand Down
4 changes: 2 additions & 2 deletions trunk/net/sunrpc/auth_gss/gss_krb5_wrap.c
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ gss_wrap_kerberos(struct gss_ctx *ctx, int offset,
struct page **tmp_pages;
u32 seq_send;

dprintk("RPC: gss_wrap_kerberos\n");
dprintk("RPC: gss_wrap_kerberos\n");

now = get_seconds();

Expand Down Expand Up @@ -215,7 +215,7 @@ gss_unwrap_kerberos(struct gss_ctx *ctx, int offset, struct xdr_buf *buf)
int data_len;
int blocksize;

dprintk("RPC: gss_unwrap_kerberos\n");
dprintk("RPC: gss_unwrap_kerberos\n");

ptr = (u8 *)buf->head[0].iov_base + offset;
if (g_verify_token_header(&kctx->mech_used, &bodysize, &ptr,
Expand Down
6 changes: 3 additions & 3 deletions trunk/net/sunrpc/auth_gss/gss_mech_switch.c
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ gss_mech_register(struct gss_api_mech *gm)
spin_lock(&registered_mechs_lock);
list_add(&gm->gm_list, &registered_mechs);
spin_unlock(&registered_mechs_lock);
dprintk("RPC: registered gss mechanism %s\n", gm->gm_name);
dprintk("RPC: registered gss mechanism %s\n", gm->gm_name);
return 0;
}

Expand All @@ -125,7 +125,7 @@ gss_mech_unregister(struct gss_api_mech *gm)
spin_lock(&registered_mechs_lock);
list_del(&gm->gm_list);
spin_unlock(&registered_mechs_lock);
dprintk("RPC: unregistered gss mechanism %s\n", gm->gm_name);
dprintk("RPC: unregistered gss mechanism %s\n", gm->gm_name);
gss_mech_free(gm);
}

Expand Down Expand Up @@ -298,7 +298,7 @@ gss_unwrap(struct gss_ctx *ctx_id,
u32
gss_delete_sec_context(struct gss_ctx **context_handle)
{
dprintk("RPC: gss_delete_sec_context deleting %p\n",
dprintk("RPC: gss_delete_sec_context deleting %p\n",
*context_handle);

if (!*context_handle)
Expand Down
9 changes: 5 additions & 4 deletions trunk/net/sunrpc/auth_gss/gss_spkm3_mech.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ gss_import_sec_context_spkm3(const void *p, size_t len,
if (IS_ERR(p))
goto out_err_free_ctx;
if (version != 1) {
dprintk("RPC: unknown spkm3 token format: obsolete nfs-utils?\n");
dprintk("RPC: unknown spkm3 token format: "
"obsolete nfs-utils?\n");
goto out_err_free_ctx;
}

Expand Down Expand Up @@ -138,7 +139,7 @@ gss_import_sec_context_spkm3(const void *p, size_t len,

ctx_id->internal_ctx_id = ctx;

dprintk("Successfully imported new spkm context.\n");
dprintk("RPC: Successfully imported new spkm context.\n");
return 0;

out_err_free_intg_key:
Expand Down Expand Up @@ -183,7 +184,7 @@ gss_verify_mic_spkm3(struct gss_ctx *ctx,

maj_stat = spkm3_read_token(sctx, checksum, signbuf, SPKM_MIC_TOK);

dprintk("RPC: gss_verify_mic_spkm3 returning %d\n", maj_stat);
dprintk("RPC: gss_verify_mic_spkm3 returning %d\n", maj_stat);
return maj_stat;
}

Expand All @@ -197,7 +198,7 @@ gss_get_mic_spkm3(struct gss_ctx *ctx,

err = spkm3_make_token(sctx, message_buffer,
message_token, SPKM_MIC_TOK);
dprintk("RPC: gss_get_mic_spkm3 returning %d\n", err);
dprintk("RPC: gss_get_mic_spkm3 returning %d\n", err);
return err;
}

Expand Down
Loading

0 comments on commit 9c3797a

Please sign in to comment.