From de83893e1ddd280c25142d7afb8d17a18625e7b5 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 24 Dec 2013 16:03:21 +1300 Subject: [PATCH] param: Rename variable used for lp_username szUsername Signed-off-by: Andrew Bartlett Signed-off-by: Garming Sam Reviewed-by: Jeremy Allison --- lib/param/param_functions.c | 2 +- lib/param/param_table.c | 6 +++--- source3/param/loadparm.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 00b4ea9f38e..99e6924a5f5 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -52,7 +52,7 @@ FN_LOCAL_STRING(postexec, postexec) FN_LOCAL_STRING(rootpreexec, rootpreexec) FN_LOCAL_STRING(rootpostexec, rootpostexec) FN_LOCAL_STRING(dontdescend, dontdescend) -FN_LOCAL_STRING(username, szUsername) +FN_LOCAL_STRING(username, username) FN_LOCAL_LIST(invalid_users, szInvalidUsers) FN_LOCAL_LIST(valid_users, szValidUsers) FN_LOCAL_LIST(admin_users, szAdminUsers) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 8d1c0ea27d5..09a32e0fd92 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -746,7 +746,7 @@ static struct parm_struct parm_table[] = { .label = "username", .type = P_STRING, .p_class = P_LOCAL, - .offset = LOCAL_VAR(szUsername), + .offset = LOCAL_VAR(username), .special = NULL, .enum_list = NULL, .flags = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE | FLAG_DEPRECATED, @@ -755,7 +755,7 @@ static struct parm_struct parm_table[] = { .label = "user", .type = P_STRING, .p_class = P_LOCAL, - .offset = LOCAL_VAR(szUsername), + .offset = LOCAL_VAR(username), .special = NULL, .enum_list = NULL, .flags = FLAG_HIDE, @@ -764,7 +764,7 @@ static struct parm_struct parm_table[] = { .label = "users", .type = P_STRING, .p_class = P_LOCAL, - .offset = LOCAL_VAR(szUsername), + .offset = LOCAL_VAR(username), .special = NULL, .enum_list = NULL, .flags = FLAG_HIDE, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index a9f1c59974b..e3b6d71fa8a 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -147,7 +147,7 @@ static struct loadparm_service sDefault = .usershare_last_mod = {0, 0}, .szService = NULL, .pathname = NULL, - .szUsername = NULL, + .username = NULL, .szInvalidUsers = NULL, .szValidUsers = NULL, .szAdminUsers = NULL, @@ -1737,7 +1737,7 @@ static bool lp_add_ipc(const char *ipc_name, bool guest_ok) } string_set(&ServicePtrs[i]->pathname, tmpdir()); - string_set(&ServicePtrs[i]->szUsername, ""); + string_set(&ServicePtrs[i]->username, ""); string_set(&ServicePtrs[i]->comment, comment); string_set(&ServicePtrs[i]->fstype, "IPC"); ServicePtrs[i]->max_connections = 0; -- 2.11.4.GIT