diff options
Diffstat (limited to 'support')
| -rw-r--r-- | support/export/export.c | 12 | ||||
| -rw-r--r-- | support/export/nfsctl.c | 4 | ||||
| -rw-r--r-- | support/include/nfslib.h | 5 | ||||
| -rw-r--r-- | support/nfs/exports.c | 6 |
4 files changed, 2 insertions, 25 deletions
diff --git a/support/export/export.c b/support/export/export.c index 93c58b6..14af112 100644 --- a/support/export/export.c +++ b/support/export/export.c @@ -255,15 +255,3 @@ export_freeall(void) } client_freeall(); } - -void -export_reset(nfs_export *exp) -{ - if (!exp) - return; - - /* Restore m_path. */ - strncpy(exp->m_export.m_path, exp->m_export.e_path, - sizeof (exp->m_export.m_path) - 1); - exp->m_export.m_path[sizeof (exp->m_export.m_path) - 1] = '\0'; -} diff --git a/support/export/nfsctl.c b/support/export/nfsctl.c index 32d92bd..e2877b9 100644 --- a/support/export/nfsctl.c +++ b/support/export/nfsctl.c @@ -89,11 +89,11 @@ expsetup(struct nfsctl_export *exparg, nfs_export *exp, int unexport) nfs_client *clp = exp->m_client; struct stat stb; - if (stat(exp->m_export.m_path, &stb) < 0) + if (stat(exp->m_export.e_path, &stb) < 0) return 0; memset(exparg, 0, sizeof(*exparg)); - strncpy(exparg->ex_path, exp->m_export.m_path, + strncpy(exparg->ex_path, exp->m_export.e_path, sizeof (exparg->ex_path) - 1); strncpy(exparg->ex_client, clp->m_hostname, sizeof (exparg->ex_client) - 1); diff --git a/support/include/nfslib.h b/support/include/nfslib.h index 422b012..a51d79d 100644 --- a/support/include/nfslib.h +++ b/support/include/nfslib.h @@ -67,11 +67,6 @@ struct sec_entry { struct exportent { char * e_hostname; char e_path[NFS_MAXPATHLEN+1]; - /* The mount path may be different from the exported path due - to submount. It may change for every mount. The idea is we - set m_path every time when we process a mount. We should not - use it for anything else. */ - char m_path[NFS_MAXPATHLEN+1]; int e_flags; int e_anonuid; int e_anongid; diff --git a/support/nfs/exports.c b/support/nfs/exports.c index 334c08e..1aaebf4 100644 --- a/support/nfs/exports.c +++ b/support/nfs/exports.c @@ -127,8 +127,6 @@ getexportent(int fromkernel, int fromexports) if (ok <= 0) return NULL; - strncpy (def_ee.m_path, def_ee.e_path, sizeof (def_ee.m_path) - 1); - def_ee.m_path [sizeof (def_ee.m_path) - 1] = '\0'; ok = getexport(exp, sizeof(exp)); } if (ok < 0) { @@ -187,8 +185,6 @@ getexportent(int fromkernel, int fromexports) rpath[sizeof (rpath) - 1] = '\0'; strncpy(ee.e_path, rpath, sizeof (ee.e_path) - 1); ee.e_path[sizeof (ee.e_path) - 1] = '\0'; - strncpy (ee.m_path, ee.e_path, sizeof (ee.m_path) - 1); - ee.m_path [sizeof (ee.m_path) - 1] = '\0'; } return ⅇ @@ -360,8 +356,6 @@ mkexportent(char *hname, char *path, char *options) } strncpy(ee.e_path, path, sizeof (ee.e_path)); ee.e_path[sizeof (ee.e_path) - 1] = '\0'; - strncpy (ee.m_path, ee.e_path, sizeof (ee.m_path) - 1); - ee.m_path [sizeof (ee.m_path) - 1] = '\0'; if (parseopts(options, &ee, 0, NULL) < 0) return NULL; return ⅇ |