diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-07-26 16:25:29 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-07-26 12:23:20 +0200 |
| commit | 932f0a6af47bf5eec44c80b858598ba9ed69b8e2 (patch) | |
| tree | 018c70837278c33bb0905c2d0ec880113c5d2959 | |
| parent | b727e706c3992a881eef225bdd032a8cb699b8d4 (diff) | |
| download | samba-932f0a6af47bf5eec44c80b858598ba9ed69b8e2.tar.gz samba-932f0a6af47bf5eec44c80b858598ba9ed69b8e2.tar.bz2 samba-932f0a6af47bf5eec44c80b858598ba9ed69b8e2.zip | |
lib/param: Merge "Logon Options" section from source3/param
This will make the merge of the whole table smoother.
Based on an earlier patch
Pair-Programmed-With: Andrew Tridgell <tridge@samba.org>
Andrew Bartlett
| -rw-r--r-- | lib/param/loadparm.c | 194 |
1 files changed, 186 insertions, 8 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 4109fb9e06..f455a707cf 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -144,14 +144,6 @@ static struct parm_struct parm_table[] = { .enum_list = enum_server_role }, { - .label = "domain logons", - .type = P_ENUM, - .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(bDomainLogons), - .special = NULL, - .enum_list = enum_bool_auto - }, - { .label = "dos charset", .type = P_STRING, .p_class = P_GLOBAL, @@ -857,6 +849,192 @@ static struct parm_struct parm_table[] = { .enum_list = NULL }, + {N_("Logon Options"), P_SEP, P_SEPARATOR}, + + { + .label = "add user script", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szAddUserScript), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "rename user script", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szRenameUserScript), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "delete user script", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szDelUserScript), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "add group script", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szAddGroupScript), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "delete group script", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szDelGroupScript), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "add user to group script", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szAddUserToGroupScript), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "delete user from group script", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szDelUserFromGroupScript), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "set primary group script", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szSetPrimaryGroupScript), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "add machine script", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szAddMachineScript), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "shutdown script", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szShutdownScript), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "abort shutdown script", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szAbortShutdownScript), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "username map script", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szUsernameMapScript), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "username map cache time", + .type = P_INTEGER, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(iUsernameMapCacheTime), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "logon script", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szLogonScript), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "logon path", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szLogonPath), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "logon drive", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szLogonDrive), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "logon home", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szLogonHome), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "domain logons", + .type = P_BOOL, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(bDomainLogons), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + + { + .label = "init logon delayed hosts", + .type = P_LIST, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szInitLogonDelayedHosts), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + + { + .label = "init logon delay", + .type = P_INTEGER, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(InitLogonDelay), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + + }, + {N_("Browse Options"), P_SEP, P_SEPARATOR}, { |