docs-xml/smbdotconf: also allow 2012[_R2] for 'ad dc functional level'

We may not jump to 2016 directly...

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/docs-xml/smbdotconf/protocol/addcfunctionallevel.xml b/docs-xml/smbdotconf/protocol/addcfunctionallevel.xml
index 1bec654bfe32a40ee5ba1586d0433cf20faeef2f..ed2b76bf5d0567bacf55889cd69a10b441a04cde 100644 (file)
--- a/docs-xml/smbdotconf/protocol/addcfunctionallevel.xml
+++ b/docs-xml/smbdotconf/protocol/addcfunctionallevel.xml
@@ -15,6 +15,14 @@
            <para><constant>2008_R2</constant>: Similar to Windows
            2008 R2 Functional Level</para>
        </listitem>
+       <listitem>
+           <para><constant>2012</constant>: Similar to Windows
+           2012 Functional Level</para>
+       </listitem>
+       <listitem>
+           <para><constant>2012_R2</constant>: Similar to Windows
+           2012 R2 Functional Level</para>
+       </listitem>
        <listitem>
            <para><constant>2016</constant>: Similar to Windows
            2016 Functional Level</para>

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 820c8abae16c2d840650e45505b68a9d463db53b..948550e6171cee55ea4f8a8d075db6ba5c1bce00 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -433,6 +433,8 @@ static const struct enum_list enum_debug_syslog_format[] = {
 
 static const struct enum_list enum_ad_functional_level[] = {
        {DS_DOMAIN_FUNCTION_2008_R2, "2008_R2"},
+       {DS_DOMAIN_FUNCTION_2012, "2012"},
+       {DS_DOMAIN_FUNCTION_2012_R2, "2012_R2"},
        {DS_DOMAIN_FUNCTION_2016, "2016"},
        {-1, NULL}
 };