- 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;