LU-6068 misc: update Intel copyright messages 2014

[fs/lustre-release.git] / lustre / utils / gss / lgss_keyring.c

diff --git a/lustre/utils/gss/lgss_keyring.c b/lustre/utils/gss/lgss_keyring.c
index 5414694..cf252aa 100644 (file)
--- a/lustre/utils/gss/lgss_keyring.c
+++ b/lustre/utils/gss/lgss_keyring.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,6 +26,8 @@
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -195,9 +195,9 @@ int do_nego_rpc(struct lgss_nego_data *lnd,
         memcpy(gr->gr_token.value, p, gr->gr_token.length);
         p += (((gr->gr_token.length + 3) & ~3) / 4);
 
-        logmsg(LL_DEBUG, "do_nego_rpc: receive handle len %d, token len %d\n",
-               gr->gr_ctx.length, gr->gr_token.length);
-        return 0;
+       logmsg(LL_DEBUG, "do_nego_rpc: receive handle len %d, token len %d, " \
+              "res %d\n", gr->gr_ctx.length, gr->gr_token.length, res);
+       return 0;
 }
 
 /*
@@ -576,7 +576,7 @@ static int parse_callout_info(const char *coinfo,
                data[6], data[7]);
 
         uparam->kup_secid = strtol(data[0], NULL, 0);
-        strncpy(uparam->kup_mech, data[1], sizeof(uparam->kup_mech));
+       strlcpy(uparam->kup_mech, data[1], sizeof(uparam->kup_mech));
         uparam->kup_uid = strtol(data[2], NULL, 0);
         uparam->kup_gid = strtol(data[3], NULL, 0);
         if (strchr(data[4], 'r'))
@@ -587,7 +587,7 @@ static int parse_callout_info(const char *coinfo,
                 uparam->kup_is_ost = 1;
         uparam->kup_svc = strtol(data[5], NULL, 0);
         uparam->kup_nid = strtoll(data[6], NULL, 0);
-        strncpy(uparam->kup_tgt, data[7], sizeof(uparam->kup_tgt));
+       strlcpy(uparam->kup_tgt, data[7], sizeof(uparam->kup_tgt));
 
         logmsg(LL_DEBUG, "parse call out info: secid %d, mech %s, ugid %u:%u "
                "is_root %d, is_mdt %d, is_ost %d, svc %d, nid 0x%llx, tgt %s\n",