From: Steve Dickson <steved@redhat.com>
Date: Tue, 15 Jul 2008 18:43:00 +0000 (-0400)
Subject: It appears that a recent glibc update now enforces the requirement for a mode
X-Git-Tag: nfs-utils-1-1-3~6
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=8e158aa65577b96494eaa94c4983eed1449116dc;p=nfs-utils.git

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>
---

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);