diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-07-23 13:51:18 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-07-24 11:01:17 +0200 |
| commit | 222850bf80dca69c1ee920d95b6b0a1f48fc589b (patch) | |
| tree | edd57007b01d4754090c19db416b740d5340da11 | |
| parent | c1065ff073746290f8f79bdb0bbe8a862530d587 (diff) | |
| download | samba-222850bf80dca69c1ee920d95b6b0a1f48fc589b.tar.gz samba-222850bf80dca69c1ee920d95b6b0a1f48fc589b.tar.bz2 samba-222850bf80dca69c1ee920d95b6b0a1f48fc589b.zip | |
lib/param: Re-arrange TLS parameters into their own section
This makes the merge with the source3 table less disruptive
Based on an earlier patch:
Pair-Programmed-With: Andrew Tridgell <tridge@samba.org>
Andrew Bartlett
| -rw-r--r-- | lib/param/loadparm.c | 99 |
1 files changed, 51 insertions, 48 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 69c1469f16..5203327a04 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -567,54 +567,6 @@ static struct parm_struct parm_table[] = { .enum_list = NULL }, { - .label = "tls enabled", - .type = P_BOOL, - .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(tls_enabled), - .special = NULL, - .enum_list = NULL - }, - { - .label = "tls keyfile", - .type = P_STRING, - .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(tls_keyfile), - .special = NULL, - .enum_list = NULL - }, - { - .label = "tls certfile", - .type = P_STRING, - .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(tls_certfile), - .special = NULL, - .enum_list = NULL - }, - { - .label = "tls cafile", - .type = P_STRING, - .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(tls_cafile), - .special = NULL, - .enum_list = NULL - }, - { - .label = "tls crlfile", - .type = P_STRING, - .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(tls_crlfile), - .special = NULL, - .enum_list = NULL - }, - { - .label = "tls dh params file", - .type = P_STRING, - .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(tls_dhpfile), - .special = NULL, - .enum_list = NULL - }, - { .label = "large readwrite", .type = P_BOOL, .p_class = P_GLOBAL, @@ -1326,6 +1278,57 @@ static struct parm_struct parm_table[] = { .enum_list = NULL }, + {N_("TLS options"), P_SEP, P_SEPARATOR}, + + { + .label = "tls enabled", + .type = P_BOOL, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(tls_enabled), + .special = NULL, + .enum_list = NULL + }, + { + .label = "tls keyfile", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(tls_keyfile), + .special = NULL, + .enum_list = NULL + }, + { + .label = "tls certfile", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(tls_certfile), + .special = NULL, + .enum_list = NULL + }, + { + .label = "tls cafile", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(tls_cafile), + .special = NULL, + .enum_list = NULL + }, + { + .label = "tls crlfile", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(tls_crlfile), + .special = NULL, + .enum_list = NULL + }, + { + .label = "tls dh params file", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(tls_dhpfile), + .special = NULL, + .enum_list = NULL + }, + {NULL, P_BOOL, P_NONE, 0, NULL, NULL, 0} }; |