summaryrefslogtreecommitdiffstats
path: root/support/nfs
diff options
context:
space:
mode:
authorSteve Dickson <steved@redhat.com>2008-07-15 14:43:00 -0400
committerSteve Dickson <steved@redhat.com>2008-07-15 14:43:00 -0400
commit8e158aa65577b96494eaa94c4983eed1449116dc (patch)
treec2134cc8cf8dd6078a46221d33d8825f5d34aeeb /support/nfs
parent8dfb9661a132a206c10067f40e274cf797dab1b2 (diff)
downloadnfs-utils-8e158aa65577b96494eaa94c4983eed1449116dc.tar.gz
nfs-utils-8e158aa65577b96494eaa94c4983eed1449116dc.tar.xz
nfs-utils-8e158aa65577b96494eaa94c4983eed1449116dc.zip
It appears that a recent glibc update now enforces the requirement for a mode
parameter for open calls with the O_CREAT flag set. nfs-utils support code defines a function xflock used by exportfs and mountd that calls open with O_CREAT but no mode parameter. This causes exportfs and mountd to dump core, with the error message: *** invalid open64 call: O_CREAT without mode ***:rpc.mountd terminated Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'support/nfs')
-rw-r--r--support/nfs/xio.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/support/nfs/xio.c b/support/nfs/xio.c
index 0453ca7..f21f5f0 100644
--- a/support/nfs/xio.c
+++ b/support/nfs/xio.c
@@ -54,13 +54,19 @@ xflock(char *fname, char *type)
{
struct sigaction sa, oldsa;
int readonly = !strcmp(type, "r");
+ mode_t mode = (S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
struct flock fl = { readonly? F_RDLCK : F_WRLCK, SEEK_SET, 0, 0, 0 };
int fd;
- if ((fd = open(fname, readonly? O_RDONLY : (O_RDWR|O_CREAT), 0644)) < 0) {
+ if (readonly)
+ fd = open(fname, O_RDONLY);
+ else
+ fd = open(fname, (O_RDWR|O_CREAT), mode);
+ if (fd < 0) {
xlog(L_WARNING, "could not open %s for locking", fname);
return -1;
}
+
sa.sa_handler = doalarm;
sa.sa_flags = 0;
sigemptyset(&sa.sa_mask);