diff options
Diffstat (limited to 'source3/param/loadparm.c')
| -rw-r--r-- | source3/param/loadparm.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index a7fc416d5b..c9c502d21c 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -146,7 +146,7 @@ static struct loadparm_service sDefault = .usershare = 0, .usershare_last_mod = {0, 0}, .szService = NULL, - .pathname = NULL, + .path = NULL, .username = NULL, .invalid_users = NULL, .valid_users = NULL, @@ -1726,10 +1726,10 @@ bool lp_add_home(const char *pszHomename, int iDefaultService, if (i < 0) return false; - if (!(*(ServicePtrs[iDefaultService]->pathname)) - || strequal(ServicePtrs[iDefaultService]->pathname, + if (!(*(ServicePtrs[iDefaultService]->path)) + || strequal(ServicePtrs[iDefaultService]->path, lp_path(talloc_tos(), GLOBAL_SECTION_SNUM))) { - string_set(&ServicePtrs[i]->pathname, pszHomedir); + string_set(&ServicePtrs[i]->path, pszHomedir); } if (!(*(ServicePtrs[i]->comment))) { @@ -1749,7 +1749,7 @@ bool lp_add_home(const char *pszHomename, int iDefaultService, ServicePtrs[i]->autoloaded = true; DEBUG(3, ("adding home's share [%s] for user '%s' at '%s'\n", pszHomename, - user, ServicePtrs[i]->pathname )); + user, ServicePtrs[i]->path )); return true; } @@ -1784,7 +1784,7 @@ static bool lp_add_ipc(const char *ipc_name, bool guest_ok) return false; } - string_set(&ServicePtrs[i]->pathname, tmpdir()); + string_set(&ServicePtrs[i]->path, tmpdir()); string_set(&ServicePtrs[i]->username, ""); string_set(&ServicePtrs[i]->comment, comment); string_set(&ServicePtrs[i]->fstype, "IPC"); @@ -2370,7 +2370,7 @@ bool service_ok(int iService) ServicePtrs[iService]->browseable = false; } - if (ServicePtrs[iService]->pathname[0] == '\0' && + if (ServicePtrs[iService]->path[0] == '\0' && strwicmp(ServicePtrs[iService]->szService, HOMES_NAME) != 0 && ServicePtrs[iService]->msdfs_proxy[0] == '\0' ) { @@ -4006,7 +4006,7 @@ enum usershare_err parse_usershare_file(TALLOC_CTX *ctx, } } - if (snum != -1 && (strcmp(sharepath, ServicePtrs[snum]->pathname) == 0)) { + if (snum != -1 && (strcmp(sharepath, ServicePtrs[snum]->path) == 0)) { /* Path didn't change, no checks needed. */ *pp_sharepath = sharepath; *pp_comment = comment; @@ -4279,7 +4279,7 @@ static int process_usershare_file(const char *dir_name, const char *file_name, i /* And note when it was loaded. */ ServicePtrs[iService]->usershare_last_mod = sbuf.st_ex_mtime; - string_set(&ServicePtrs[iService]->pathname, sharepath); + string_set(&ServicePtrs[iService]->path, sharepath); string_set(&ServicePtrs[iService]->comment, comment); ret = iService; |