X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fgss%2Flsupport.c;h=f27ba4ad2d1a327da6400a81689e1901aaa44e5a;hb=70e9d4ecc9130aeed1260d78cd8b33a5cde6edd7;hp=87ff943467db0cad40775d79755351d7de2c1152;hpb=0f8dca08a4f68cba82c2c822998ecc309d3b7aaf;p=fs%2Flustre-release.git

diff --git a/lustre/utils/gss/lsupport.c b/lustre/utils/gss/lsupport.c
index 87ff943..f27ba4a 100644
--- a/lustre/utils/gss/lsupport.c
+++ b/lustre/utils/gss/lsupport.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.
@@ -17,17 +15,15 @@
  *
  * 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
  */
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -47,6 +43,7 @@
 #include <sys/ipc.h>
 #include <sys/sem.h>
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <pwd.h>
@@ -59,10 +56,10 @@
 #include <unistd.h>
 #include <errno.h>
 #include <assert.h>
-#ifdef HAVE_GETHOSTBYNAME
+#ifdef HAVE_NETDB_H
 # include <netdb.h>
 #endif
-
+#include <lnet/nidstr.h>
 #ifdef _NEW_BUILD_
 # include "lgss_utils.h"
 #else
@@ -260,7 +257,7 @@ int external_nid2hostname(char *lnd, uint32_t net, uint32_t addr,
                 head++;
 
         tail = head + strlen(head);
-        if (tail <= head) {
+	if (tail <= head) {
                 printerr(0, "no output from %s\n", gethostname_ex);
                 return -1;
         }
@@ -295,19 +292,11 @@ struct convert_struct {
 };
 
 static struct convert_struct converter[] = {
-        [0]             = { "UNUSED0",  NULL},
-        [QSWLND]        = { "QSWLND",   external_nid2hostname},
-        [SOCKLND]       = { "SOCKLND",  ipv4_nid2hostname },
-        [GMLND]         = { "GMLND",    external_nid2hostname},
-        [PTLLND]        = { "PTLLND",   external_nid2hostname },
-        [O2IBLND]       = { "O2IBLND",  ipv4_nid2hostname },
-        [CIBLND]        = { "CIBLND",   external_nid2hostname },
-        [OPENIBLND]     = { "OPENIBLND",external_nid2hostname },
-        [IIBLND]        = { "IIBLND",   external_nid2hostname },
-        [LOLND]         = { "LOLND",    lolnd_nid2hostname },
-        [RALND]         = { "RALND",    external_nid2hostname },
-        [VIBLND]        = { "VIBLND",   external_nid2hostname },
-        [MXLND]         = { "MXLND",    external_nid2hostname },
+	[0]	  = { .name = "UNUSED0" },
+	[SOCKLND] = { .name = "SOCKLND", .nid2name = ipv4_nid2hostname },
+	[O2IBLND] = { .name = "O2IBLND", .nid2name = ipv4_nid2hostname },
+	[LOLND]	  = { .name = "LOLND",	 .nid2name = lolnd_nid2hostname },
+	[PTL4LND] = { .name = "PTL4LND", .nid2name = external_nid2hostname }
 };
 
 #define LND_MAX         (sizeof(converter) / sizeof(converter[0]))
@@ -355,7 +344,7 @@ struct user_mapping {
         struct user_map_item *items;
 };
 
-static struct user_mapping mapping = {0, NULL};
+static struct user_mapping mapping;
 /* FIXME to be finished: monitor change of mapping database */
 static int mapping_mtime = 0;
 
@@ -440,12 +429,6 @@ static int read_mapping_db(void)
         while ((line = fgets(linebuf, MAX_LINE_LEN, f)) != NULL) {
                 char *name;
 
-                if (strlen(line) >= MAX_LINE_LEN) {
-                        printerr(0, "invalid mapping db: line too long (%d)\n",
-                                 strlen(line));
-                        continue;
-                }
-
                 if (sscanf(line, "%s %s %s", princ, nid_str, dest) != 3) {
                         printerr(0, "mapping db: syntax error\n");
                         continue;