LU-12349 llite: console message for disabled flock call

[fs/lustre-release.git] / lustre / utils / libiam.c

diff --git a/lustre/utils/libiam.c b/lustre/utils/libiam.c
index 2298e3c..39a05bb 100644 (file)
--- a/lustre/utils/libiam.c
+++ b/lustre/utils/libiam.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -49,7 +45,6 @@
 #include <string.h>
 #include <endian.h>
 #include <errno.h>
-#include <assert.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 
@@ -333,11 +328,11 @@ static char *iam_convert(int size, int need_convert, char *source)
         if (source == NULL)
                 return NULL;
 
-        ptr = calloc(size + 1, sizeof(char));
-        if (ptr == NULL)
-                return NULL;
+       if (need_convert) {
+               ptr = calloc(size + 1, sizeof(char));
+               if (ptr == NULL)
+                       return NULL;
 
-        if (need_convert) {
                 opt = packdigit((unsigned char*)source);
                 if (opt == NULL) {
                         free(ptr);
@@ -347,7 +342,7 @@ static char *iam_convert(int size, int need_convert, char *source)
                         free(opt);
                 }
         } else {
-               strlcpy(ptr, source, size + 1);
+               ptr = strdup(source);
         }
 
         return ptr;