From: neilbrown <neilbrown>
Date: Tue, 20 Dec 2005 00:55:47 +0000 (+0000)
Subject: Set default hostname to '*' rather than leaving it empty
X-Git-Tag: nfs-utils-1-0-8-rc1a~1
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=025a0c58ed9043d231672a22232c438f29511ca0;p=nfs-utils.git

Set default hostname to '*' rather than leaving it empty
---

diff --git a/ChangeLog b/ChangeLog
index b83742c..068b673 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-20 NeilBrown <neilb@suse.de>
+	support/nfs/exports.c(getexportent): is a null host name is given,
+	replace it with '*' so we have a non-empty host name for messages
+	etc.
+
 2005-12-20 Kevin Coffman <kwc@citi.umich.edu>
 	utils/gssd/gssd_proc.c(create_auth_rpc_client): Use service
 	  portion of clp->servicename rather than hard-coding "nfs". 
diff --git a/support/nfs/exports.c b/support/nfs/exports.c
index 1048c80..d0f63b0 100644
--- a/support/nfs/exports.c
+++ b/support/nfs/exports.c
@@ -67,7 +67,7 @@ struct exportent *
 getexportent(int fromkernel, int fromexports)
 {
 	static struct exportent	ee;
-	char		exp[512];
+	char		exp[512], *hostname;
 	char		rpath[MAXPATHLEN+1];
 	char		*opt, *sp;
 	int		ok;
@@ -113,9 +113,13 @@ getexportent(int fromkernel, int fromexports)
 	/* Check for default client */
 	if (ok == 0)
 		exp[0] = '\0';
+
+	hostname = exp;
 	if ((opt = strchr(exp, '(')) != NULL) {
-		if (opt == exp) 
+		if (opt == exp) {
 			xlog(L_WARNING, "No host name given with %s %s, suggest *%s to avoid warning", ee.e_path, exp, exp);
+			hostname = "*";
+		}
 		*opt++ = '\0';
 		if (!(sp = strchr(opt, ')')) || sp[1] != '\0') {
 			syntaxerr("bad option list");
@@ -126,12 +130,12 @@ getexportent(int fromkernel, int fromexports)
 	} else {
 	    xlog(L_WARNING, "No options for %s %s: suggest %s(sync) to avoid warning", ee.e_path, exp, exp);
 	}
-	if (strlen(exp) >= sizeof(ee.e_hostname)) {
+	if (strlen(hostname) >= sizeof(ee.e_hostname)) {
 		syntaxerr("client name too long");
 		export_errno = EINVAL;
 		return NULL;
 	}
-	strncpy(ee.e_hostname, exp, sizeof (ee.e_hostname) - 1);
+	strncpy(ee.e_hostname, hostname, sizeof (ee.e_hostname) - 1);
 	ee.e_hostname[sizeof (ee.e_hostname) - 1] = '\0';
 
 	if (parseopts(opt, &ee, fromexports) < 0)