* conf/checkmount/checkmount_osf.c (fixmount_check_mount): add

extra parentheses around assignments as "if" expressions (gcc
complains).

* conf/nfs_prot/nfs_prot_osf4.h: add missing extern definitions
for plock, hstrerror, getmntinfo, alloca, xdr_exportnode, and
xdr_groups.

diff --git a/ChangeLog b/ChangeLog
index 1c458d70f1b7f4086fb0ea89ce8e156c5061786d..9d0c45622abaf22964daf9a970821992c15d4c85 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,14 @@
 
 2005-05-27  Erez Zadok  <ezk@cs.sunysb.edu>
 
+       * conf/checkmount/checkmount_osf.c (fixmount_check_mount): add
+       extra parentheses around assignments as "if" expressions (gcc
+       complains).
+
+       * conf/nfs_prot/nfs_prot_osf4.h: add missing extern definitions
+       for plock, hstrerror, getmntinfo, alloca, xdr_exportnode, and
+       xdr_groups.
+
        * configure.in: check for <linux/socket.h>, which, if found,
        appears to be preferable to <sys/socket.h>.  Use it to find
        <linux/nfs_mount.h>.  On some Linux systems

diff --git a/conf/checkmount/checkmount_osf.c b/conf/checkmount/checkmount_osf.c
index f97d6c8cc12c6d6f05baa72d9d3fb6ea0aabe9df..9117f2686cfefa2ee0a847dd374fd5ee95a313cd 100644 (file)
--- a/conf/checkmount/checkmount_osf.c
+++ b/conf/checkmount/checkmount_osf.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: checkmount_osf.c,v 1.9 2005/01/03 20:56:45 ezk Exp $
+ * $Id: checkmount_osf.c,v 1.10 2005/05/28 17:34:10 ezk Exp $
  *
  */
 
@@ -69,14 +69,14 @@ fixmount_check_mount(char *host, struct in_addr hostaddr, char *path)
      * Apparently two forms of nfs mount syntax are
      * accepted: host:/path or /path@host
      */
-    if (delim = strchr(fslist[i].f_mntfromname, ':')) {
+    if ((delim = strchr(fslist[i].f_mntfromname, ':'))) {
       *delim = '\0';
       if ((STREQ(delim + 1, path) ||
           STREQ(fslist[i].f_mntonname, path)) &&
          is_same_host(fslist[i].f_mntfromname,
                       host, hostaddr))
          found = 1;
-    } else if (delim = strchr(fslist[i].f_mntfromname, '@')) {
+    } else if ((delim = strchr(fslist[i].f_mntfromname, '@'))) {
       *delim = '\0';
       if ((STREQ(fslist[i].f_mntfromname, path) ||
           STREQ(fslist[i].f_mntonname, path)) &&

diff --git a/conf/nfs_prot/nfs_prot_osf4.h b/conf/nfs_prot/nfs_prot_osf4.h
index 9e211e34b2824f14717dee40071d0b1ffb65c43f..09789930c2c9ac5f07acfe43ce87042dd9a334f6 100644 (file)
--- a/conf/nfs_prot/nfs_prot_osf4.h
+++ b/conf/nfs_prot/nfs_prot_osf4.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: nfs_prot_osf4.h,v 1.10 2005/01/03 20:56:45 ezk Exp $
+ * $Id: nfs_prot_osf4.h,v 1.11 2005/05/28 17:34:10 ezk Exp $
  *
  */
 
@@ -188,7 +188,7 @@ typedef struct nfswriteargs nfswriteargs;
 
 
 /*
- * EXTERNALS:
+ * EXTERNALS: (some are missing from system headers)
  */
 
 extern void *nfsproc_null_2_svc(void *, struct svc_req *);
@@ -209,6 +209,9 @@ extern nfsdiropres *nfsproc_mkdir_2_svc(nfscreateargs *, struct svc_req *);
 extern nfsstat *nfsproc_rmdir_2_svc(nfsdiropargs *, struct svc_req *);
 extern nfsreaddirres *nfsproc_readdir_2_svc(nfsreaddirargs *, struct svc_req *);
 extern nfsstatfsres *nfsproc_statfs_2_svc(struct nfssvcfh *, struct svc_req *);
+extern int plock(int op);
+extern const char *hstrerror(int err);
+extern int getmntinfo(struct statfs **mntbufp, int flags);
 
 extern bool_t xdr_nfsstat(XDR *, nfsstat*);
 extern bool_t xdr_ftype(XDR *, nfsftype*);
@@ -239,6 +242,9 @@ extern bool_t xdr_dirlist(XDR *, nfsdirlist*);
 extern bool_t xdr_readdirres(XDR *, nfsreaddirres*);
 extern bool_t xdr_statfsokres(XDR *, nfsstatfsokres*);
 extern bool_t xdr_statfsres(XDR *, nfsstatfsres*);
+extern bool_t xdr_exportnode (XDR *, exportnode*);
+extern bool_t xdr_groups (XDR *, groups*);
+
 
 
 /*