0ee893353b
patches from git. This adds a new binary nfsidmap, with man page. Also: build with libmount enabled to correctly handle /etc/mtab being linked to /proc/self/mounts. (bnc#681106) OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=54
56 lines
1.6 KiB
Diff
56 lines
1.6 KiB
Diff
From 1ce0374d445d8a3dbdfb3e9da4c76be9df44666b Mon Sep 17 00:00:00 2001
|
|
From: NeilBrown <neilb@suse.de>
|
|
Date: Thu, 21 Jul 2011 14:23:00 -0400
|
|
Subject: [PATCH] Statd should always 'chdir' to its state directory.
|
|
|
|
s statd can be started by 'mount' which can sometimes be run by a
|
|
normal user, the current-working-directory could be anything. In
|
|
partcular it could be in a mounted filesystem. As 'statd' continues
|
|
running as a daemon it could keep prevent that filesystem from being
|
|
unmounted.
|
|
|
|
statd does currently 'chdir' to the state directory, but only if the
|
|
state directory is not owned by root. This is wrong - it should check
|
|
for root after the chdir, not before.
|
|
|
|
So swap the two if statements around.
|
|
|
|
Signed-off-by: NeilBrown <neilb@suse.de>
|
|
Signed-off-by: Steve Dickson <steved@redhat.com>
|
|
---
|
|
support/nsm/file.c | 12 ++++++------
|
|
1 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/support/nsm/file.c b/support/nsm/file.c
|
|
index 98b47bf..a12c753 100644
|
|
--- a/support/nsm/file.c
|
|
+++ b/support/nsm/file.c
|
|
@@ -395,18 +395,18 @@ nsm_drop_privileges(const int pidfd)
|
|
return false;
|
|
}
|
|
|
|
- if (st.st_uid == 0) {
|
|
- xlog_warn("Running as root. "
|
|
- "chown %s to choose different user", nsm_base_dirname);
|
|
- return true;
|
|
- }
|
|
-
|
|
if (chdir(nsm_base_dirname) == -1) {
|
|
xlog(L_ERROR, "Failed to change working directory to %s: %m",
|
|
nsm_base_dirname);
|
|
return false;
|
|
}
|
|
|
|
+ if (st.st_uid == 0) {
|
|
+ xlog_warn("Running as root. "
|
|
+ "chown %s to choose different user", nsm_base_dirname);
|
|
+ return true;
|
|
+ }
|
|
+
|
|
/*
|
|
* If the pidfile happens to reside on NFS, dropping privileges
|
|
* will probably cause us to lose access, even though we are
|
|
--
|
|
1.7.3.4
|
|
|