branch: HEAD

[fs/lustre-release.git] / lustre / ptlrpc / sec_null.c

diff --git a/lustre/ptlrpc/sec_null.c b/lustre/ptlrpc/sec_null.c
index ea7d5ae..7b4368d 100644 (file)
--- a/lustre/ptlrpc/sec_null.c
+++ b/lustre/ptlrpc/sec_null.c
@@ -96,7 +96,7 @@ int null_ctx_sign(struct ptlrpc_cli_ctx *ctx, struct ptlrpc_request *req)
         if (!req->rq_import->imp_dlm_fake) {
                 struct obd_device *obd = req->rq_import->imp_obd;
                 null_encode_sec_part(req->rq_reqbuf,
-                                     obd->u.cli.cl_sec_part);
+                                     obd->u.cli.cl_sp_me);
         }
         req->rq_reqdata_len = req->rq_reqlen;
         return 0;
@@ -371,7 +371,10 @@ int null_authorize(struct ptlrpc_request *req)
         rs->rs_repdata_len = req->rq_replen;
 
         if (likely(req->rq_packed_final)) {
-                req->rq_reply_off = lustre_msg_early_size();
+                if (lustre_msghdr_get_flags(req->rq_reqmsg) & MSGHDR_AT_SUPPORT)
+                        req->rq_reply_off = lustre_msg_early_size();
+                else
+                        req->rq_reply_off = 0;
         } else {
                 rs->rs_repbuf->lm_cksum =
                                 crc32_le(!(__u32) 0,