libexport.a: Allow client_init() to fail instead of exit

[nfs-utils.git] / support / export / rmtab.c

diff --git a/support/export/rmtab.c b/support/export/rmtab.c
index 0ce368253736c8cd5d04d7e1698b12222cbd9813..b49e1aaa9c121922d943a4b91cad496b9f9c4924 100644 (file)
--- a/support/export/rmtab.c
+++ b/support/export/rmtab.c
@@ -31,10 +31,10 @@ rmtab_read(void)
                int                     htype;
                
                htype = client_gettype(rep->r_client);
-               if (htype == MCL_FQDN || (htype == MCL_SUBNETWORK
+               if ((htype == MCL_FQDN || htype == MCL_SUBNETWORK)
                    && (hp = gethostbyname (rep->r_client))
                    && (hp = hostent_dup (hp),
-                       (exp = export_allowed (hp, rep->r_path))))) {
+                       exp = export_allowed (hp, rep->r_path))) {
                        /* see if the entry already exists, otherwise this was an instantiated
                         * wild card, and we must add it
                         */
@@ -57,7 +57,7 @@ rmtab_read(void)
                   file. */
                int     lockid;
                FILE    *fp;
-               if ((lockid = xflock(_PATH_RMTAB, "w")) < 0)
+               if ((lockid = xflock(_PATH_RMTABLCK, "w")) < 0)
                        return -1;
                rewindrmtabent();
                if (!(fp = fsetrmtabent(_PATH_RMTABTMP, "w"))) {