*
*/
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdlib.h>
#include <string.h>
rmtab_read(void)
{
struct rmtabent *rep;
- nfs_export *exp;
+ nfs_export *exp = NULL;
setrmtabent("r");
- while ((rep = getrmtabent(1)) != NULL) {
- exp = export_lookup(rep->r_client, rep->r_path);
- if (!exp) {
- struct exportent *xp;
- struct hostent *hp;
- int htype;
-
- htype = client_gettype(rep->r_client);
- if (htype == MCL_FQDN
- && (hp = gethostbyname (rep->r_client), hp)
- && (hp = hostent_dup (hp),
- xp = export_allowed (hp, rep->r_path))) {
- strncpy (xp->e_hostname, rep->r_client,
- sizeof (xp->e_hostname) - 1);
- xp->e_hostname[sizeof (xp->e_hostname) -1] = '\0';
- exp = export_create(xp);
- free (hp);
+ while ((rep = getrmtabent(1, NULL)) != NULL) {
+ struct hostent *hp = NULL;
+ int htype;
+
+ htype = client_gettype(rep->r_client);
+ if ((htype == MCL_FQDN || htype == MCL_SUBNETWORK)
+ && (hp = gethostbyname (rep->r_client))
+ && (hp = hostent_dup (hp),
+ 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
+ */
+ nfs_export *exp2 = export_lookup(rep->r_client,
+ exp->m_export.e_path, 0);
+ if (!exp2) {
+ struct exportent ee;
+ dupexportent(&ee, &exp->m_export);
+ ee.e_hostname = rep->r_client;
+ exp2 = export_create(&ee, 0);
+ exp2->m_changed = exp->m_changed;
}
-
- if (!exp)
- continue;
- exp->m_mayexport = 1;
- }
+ free (hp);
+ exp2->m_mayexport = 1;
+ } else if (hp) /* export_allowed failed */
+ free(hp);
}
if (errno == EINVAL) {
/* Something goes wrong. We need to fix the rmtab
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"))) {
xfunlock(lockid);
return -1;
}
- while ((rep = getrmtabent(0)) != NULL) {
- fputrmtabent(fp, rep);
+ while ((rep = getrmtabent(0, NULL)) != NULL) {
+ fputrmtabent(fp, rep, NULL);
}
if (rename(_PATH_RMTABTMP, _PATH_RMTAB) < 0) {
xlog(L_ERROR, "couldn't rename %s to %s",