|
|
2e682e7 |
diff -up nfs-utils-1.3.0/support/export/client.c.orig nfs-utils-1.3.0/support/export/client.c
|
|
|
2e682e7 |
--- nfs-utils-1.3.0/support/export/client.c.orig 2014-11-04 15:30:01.255646000 -0500
|
|
|
2e682e7 |
+++ nfs-utils-1.3.0/support/export/client.c 2014-11-04 15:30:28.070441000 -0500
|
|
|
2e682e7 |
@@ -277,7 +277,7 @@ client_lookup(char *hname, int canonical
|
|
|
2e682e7 |
if (htype == MCL_FQDN && !canonical) {
|
|
|
2e682e7 |
ai = host_addrinfo(hname);
|
|
|
2e682e7 |
if (!ai) {
|
|
|
2e682e7 |
- xlog(L_ERROR, "Failed to resolve %s", hname);
|
|
|
2e682e7 |
+ xlog(L_WARNING, "Failed to resolve %s", hname);
|
|
|
2e682e7 |
goto out;
|
|
|
2e682e7 |
}
|
|
|
2e682e7 |
hname = ai->ai_canonname;
|
|
|
2e682e7 |
diff -up nfs-utils-1.3.0/support/export/export.c.orig nfs-utils-1.3.0/support/export/export.c
|
|
|
2e682e7 |
--- nfs-utils-1.3.0/support/export/export.c.orig 2014-03-25 11:12:07.000000000 -0400
|
|
|
2e682e7 |
+++ nfs-utils-1.3.0/support/export/export.c 2014-11-04 15:30:28.076440000 -0500
|
|
|
2e682e7 |
@@ -76,15 +76,22 @@ export_read(char *fname)
|
|
|
2e682e7 |
struct exportent *eep;
|
|
|
2e682e7 |
nfs_export *exp;
|
|
|
2e682e7 |
|
|
|
2e682e7 |
+ int volumes = 0;
|
|
|
2e682e7 |
+
|
|
|
2e682e7 |
setexportent(fname, "r");
|
|
|
2e682e7 |
while ((eep = getexportent(0,1)) != NULL) {
|
|
|
2e682e7 |
exp = export_lookup(eep->e_hostname, eep->e_path, 0);
|
|
|
2e682e7 |
- if (!exp)
|
|
|
2e682e7 |
- export_create(eep, 0);
|
|
|
2e682e7 |
+ if (!exp) {
|
|
|
2e682e7 |
+ exp = export_create(eep, 0);
|
|
|
2e682e7 |
+ if (exp)
|
|
|
2e682e7 |
+ volumes++;
|
|
|
2e682e7 |
+ }
|
|
|
2e682e7 |
else
|
|
|
2e682e7 |
warn_duplicated_exports(exp, eep);
|
|
|
2e682e7 |
}
|
|
|
2e682e7 |
endexportent();
|
|
|
2e682e7 |
+ if (volumes == 0)
|
|
|
2e682e7 |
+ xlog(L_ERROR, "No file systems exported!");
|
|
|
2e682e7 |
}
|
|
|
2e682e7 |
|
|
|
2e682e7 |
/**
|
|
|
2e682e7 |
diff -up nfs-utils-1.3.0/support/export/hostname.c.orig nfs-utils-1.3.0/support/export/hostname.c
|
|
|
2e682e7 |
--- nfs-utils-1.3.0/support/export/hostname.c.orig 2014-03-25 11:12:07.000000000 -0400
|
|
|
2e682e7 |
+++ nfs-utils-1.3.0/support/export/hostname.c 2014-11-04 15:30:28.081441000 -0500
|
|
|
2e682e7 |
@@ -175,11 +175,11 @@ host_addrinfo(const char *hostname)
|
|
|
2e682e7 |
case 0:
|
|
|
2e682e7 |
return ai;
|
|
|
2e682e7 |
case EAI_SYSTEM:
|
|
|
2e682e7 |
- xlog(D_GENERAL, "%s: failed to resolve %s: (%d) %m",
|
|
|
2e682e7 |
+ xlog(D_PARSE, "%s: failed to resolve %s: (%d) %m",
|
|
|
2e682e7 |
__func__, hostname, errno);
|
|
|
2e682e7 |
break;
|
|
|
2e682e7 |
default:
|
|
|
2e682e7 |
- xlog(D_GENERAL, "%s: failed to resolve %s: %s",
|
|
|
2e682e7 |
+ xlog(D_PARSE, "%s: failed to resolve %s: %s",
|
|
|
2e682e7 |
__func__, hostname, gai_strerror(error));
|
|
|
2e682e7 |
break;
|
|
|
2e682e7 |
}
|