You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
52 lines
1.7 KiB
52 lines
1.7 KiB
7 years ago
|
autofs-5.0.7 - fix a couple of compiler warnings
|
||
|
|
|
||
|
|
From: Ian Kent <ikent@redhat.com>
|
||
|
|
|
||
|
|
Quiet a couple of ompiler warnings by making intention explicit using brackets.
|
||
|
|
---
|
||
|
|
CHANGELOG | 1 +
|
||
|
|
modules/mount_bind.c | 2 +-
|
||
|
|
modules/mount_nfs.c | 4 ++--
|
||
|
|
3 files changed, 4 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/CHANGELOG b/CHANGELOG
|
||
|
|
index 37eac72..7749f01 100644
|
||
|
|
--- a/CHANGELOG
|
||
|
|
+++ b/CHANGELOG
|
||
|
|
@@ -54,6 +54,7 @@
|
||
|
|
- misc man page fixes.
|
||
|
|
- fix add null check in parse_server_string().
|
||
|
|
- don't override LDFLAGS in make rules.
|
||
|
|
+- fix a couple of compiler warnings.
|
||
|
|
|
||
|
|
25/07/2012 autofs-5.0.7
|
||
|
|
=======================
|
||
|
|
diff --git a/modules/mount_bind.c b/modules/mount_bind.c
|
||
|
|
index 61a773c..2b70104 100644
|
||
|
|
--- a/modules/mount_bind.c
|
||
|
|
+++ b/modules/mount_bind.c
|
||
|
|
@@ -208,7 +208,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int
|
||
|
|
MODPREFIX
|
||
|
|
"failed to create local mount %s -> %s",
|
||
|
|
fullpath, what);
|
||
|
|
- if (ap->flags & MOUNT_FLAG_GHOST && !status)
|
||
|
|
+ if ((ap->flags & MOUNT_FLAG_GHOST) && !status)
|
||
|
|
if (mkdir_path(fullpath, 0555) && errno != EEXIST) {
|
||
|
|
char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
|
||
|
|
error(ap->logopt,
|
||
|
|
diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c
|
||
|
|
index 3d2ccea..adf2002 100644
|
||
|
|
--- a/modules/mount_nfs.c
|
||
|
|
+++ b/modules/mount_nfs.c
|
||
|
|
@@ -202,8 +202,8 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int
|
||
|
|
*/
|
||
|
|
if ((hosts && !hosts->next) &&
|
||
|
|
mount_default_proto == 4 &&
|
||
|
|
- vers & NFS_VERS_MASK != 0 &&
|
||
|
|
- vers & NFS4_VERS_MASK != 0) {
|
||
|
|
+ (vers & NFS_VERS_MASK) != 0 &&
|
||
|
|
+ (vers & NFS4_VERS_MASK) != 0) {
|
||
|
|
unsigned int v4_probe_ok = 0;
|
||
|
|
struct host *tmp = new_host(hosts->name,
|
||
|
|
hosts->addr, hosts->addr_len,
|