X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=support%2Fnfs%2Fxio.c;h=5e2e1e95e7228d42ef81ed8b1f44bc7cc2db2d13;hp=221cce6ef2babdf35d96330e6399dd5d35679a3f;hb=f0ed8401e854e1cbd23b2fb5dca5e88dec2df7c4;hpb=ff42180930a444cea7f19e55e2cd2bfe6d3f108b

diff --git a/support/nfs/xio.c b/support/nfs/xio.c
index 221cce6..5e2e1e9 100644
--- a/support/nfs/xio.c
+++ b/support/nfs/xio.c
@@ -17,6 +17,7 @@
 #include <ctype.h>
 #include <signal.h>
 #include <unistd.h>
+#include <errno.h>
 #include "xmalloc.h"
 #include "xlog.h"
 #include "xio.h"
@@ -57,10 +58,16 @@ xflock(char *fname, char *type)
 	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))) < 0) {
-		xlog(L_WARNING, "could not open %s for locking", fname);
+	if (readonly)
+		fd = open(fname, (O_RDONLY|O_CREAT), 0600);
+	else
+		fd = open(fname, (O_RDWR|O_CREAT), 0600);
+	if (fd < 0) {
+		xlog(L_WARNING, "could not open %s for locking: errno %d (%s)",
+				fname, errno, strerror(errno));
 		return -1;
 	}
+
 	sa.sa_handler = doalarm;
 	sa.sa_flags = 0;
 	sigemptyset(&sa.sa_mask);
@@ -68,7 +75,8 @@ xflock(char *fname, char *type)
 	alarm(10);
 	if (fcntl(fd, F_SETLKW, &fl) < 0) {
 		alarm(0);
-		xlog(L_WARNING, "failed to lock %s", fname);
+		xlog(L_WARNING, "failed to lock %s: errno %d (%s)",
+				fname, errno, strerror(errno));
 		close(fd);
 		fd = 0;
 	} else {