diff options
| author | Michael Adam <obnox@samba.org> | 2014-02-02 14:05:39 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-02-03 13:26:34 +1300 |
| commit | 3e8d02be8ef9b4c0e3cacf20f2c103dc07c1b531 (patch) | |
| tree | fea462acd10945c9103e2959e4349bc77e315f04 /lib | |
| parent | d85bab275aa3794cefd838bbf1516ea63ed668fc (diff) | |
| download | samba-3e8d02be8ef9b4c0e3cacf20f2c103dc07c1b531.tar.gz samba-3e8d02be8ef9b4c0e3cacf20f2c103dc07c1b531.tar.xz samba-3e8d02be8ef9b4c0e3cacf20f2c103dc07c1b531.zip | |
loadparm: rename the variable for "path" from pathname to path
for consistency docs/variable/function.
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/param/loadparm.c | 10 | ||||
| -rw-r--r-- | lib/param/param_functions.c | 2 | ||||
| -rw-r--r-- | lib/param/param_table.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index d7306eafaf..58712a5248 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -743,11 +743,11 @@ bool lpcfg_add_home(struct loadparm_context *lp_ctx, if (service == NULL) return false; - if (!(*(default_service->pathname)) - || strequal(default_service->pathname, lp_ctx->sDefault->pathname)) { - service->pathname = talloc_strdup(service, pszHomedir); + if (!(*(default_service->path)) + || strequal(default_service->path, lp_ctx->sDefault->path)) { + service->path = talloc_strdup(service, pszHomedir); } else { - service->pathname = string_sub_talloc(service, lpcfg_path(default_service, lp_ctx->sDefault), "%H", pszHomedir); + service->path = string_sub_talloc(service, lpcfg_path(default_service, lp_ctx->sDefault), "%H", pszHomedir); } if (!(*(service->comment))) { @@ -757,7 +757,7 @@ bool lpcfg_add_home(struct loadparm_context *lp_ctx, service->browseable = default_service->browseable; DEBUG(3, ("adding home's share [%s] for user '%s' at '%s'\n", - pszHomename, user, service->pathname)); + pszHomename, user, service->path)); return true; } diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 868bef3e2b..4596eed02c 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -FN_LOCAL_STRING(path, pathname) +FN_LOCAL_STRING(path, path) FN_LOCAL_LIST(hostsallow, hostsallow) FN_LOCAL_LIST(hostsdeny, hostsdeny) FN_LOCAL_STRING(fstype, fstype) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index f7738143ee..2328e7583a 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -310,7 +310,7 @@ static struct parm_struct parm_table[] = { .label = "path", .type = P_STRING, .p_class = P_LOCAL, - .offset = LOCAL_VAR(pathname), + .offset = LOCAL_VAR(path), .special = NULL, .enum_list = NULL, .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT, @@ -319,7 +319,7 @@ static struct parm_struct parm_table[] = { .label = "directory", .type = P_STRING, .p_class = P_LOCAL, - .offset = LOCAL_VAR(pathname), + .offset = LOCAL_VAR(path), .special = NULL, .enum_list = NULL, .flags = FLAG_HIDE, |