nfs-utils/exportfs-report-failure-if-asked-to-unexport-somethi.patch
Neil Brown bf13c25ec9 - nfs-utils.spec: add various systemd macros to make
sure init scripts are registered properly
  bnc#845475
- nfs.int, nfsserver.init: run gssd on server as well
  as on client.  This is needed for NFSv4.0 callbacks.
  bnc#845269
- exportfs-exit-with-error-code-if-there-was-any-error.patch
- exportfs-report-failure-if-asked-to-unexport-somethi.patch
  Return good error code from exportfs.
  bnc#846064

OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=99
2013-11-06 02:21:12 +00:00

41 lines
1.1 KiB
Diff

From 609bce0c7efde1875d1477d96fe1f359b6403005 Mon Sep 17 00:00:00 2001
From: Neil Brown <neilb@suse.de>
Date: Mon, 28 Oct 2013 14:40:15 +1100
Subject: [PATCH] exportfs: report failure if asked to unexport something not
exported.
Reference: bnc#846064
Currently if exportfs is asked to unexport something that is not
exported it silently succeeds. This is not ideal, particularly for
scripting situations.
So report an error unless the unexport was successful.
Reported-by: Tony Asleson <tasleson@redhat.com>
Signed-off-by: NeilBrown <neilb@suse.de>
---
utils/exportfs/exportfs.c | 4 ++++
1 file changed, 4 insertions(+)
--- nfs-utils-1.2.8.orig/utils/exportfs/exportfs.c
+++ nfs-utils-1.2.8/utils/exportfs/exportfs.c
@@ -345,6 +345,7 @@ unexportfs(char *arg, int verbose)
char *path;
char *hname = arg;
int htype;
+ int success = 0;
if ((path = strchr(arg, ':')) != NULL)
*path++ = '\0';
@@ -391,7 +392,10 @@ unexportfs(char *arg, int verbose)
#endif
exp->m_xtabent = 0;
exp->m_mayexport = 0;
+ success = 1;
}
+ if (!success)
+ xlog(L_ERROR, "Could not find %s to unexport.\n", arg);
freeaddrinfo(ai);
}