samba_gpoupdate: Rename the command to samba-gpupdate

On a Windows client, this command is called 'gpupdate'

Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/docs-xml/smbdotconf/domain/gpoupdatecommand.xml b/docs-xml/smbdotconf/domain/gpoupdatecommand.xml
index 3ce26d7828770bdfd0ca13f4169d987cedbe58c2..6bf88f8e68ad8580cb47ddf574a7546e4fe7f9f5 100644 (file)
--- a/docs-xml/smbdotconf/domain/gpoupdatecommand.xml
+++ b/docs-xml/smbdotconf/domain/gpoupdatecommand.xml
@@ -5,7 +5,7 @@
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
        <para>This option sets the command that is called to apply GPO policies.
-        The samba_gpoupdate script applies System Access and Kerberos Policies
+        The samba-gpupdate script applies System Access and Kerberos Policies
        to the KDC. System Access policies set minPwdAge, maxPwdAge,
        minPwdLength, and pwdProperties in the samdb. Kerberos Policies set
        kdc:service ticket lifetime, kdc:user ticket lifetime, and kdc:renewal
@@ -13,6 +13,6 @@
        </para>
 </description>
 
-<value type="default">&pathconfig.SCRIPTSBINDIR;/samba_gpoupdate</value>
+<value type="default">&pathconfig.SCRIPTSBINDIR;/samba-gpupdate</value>
 <value type="example">/usr/local/sbin/gpoupdate</value>
 </samba:parameter>

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 9684a52952b070753b71087bdf24c5570493426b..75ee6685b7208a3c0866af5c80f84bc4ccded713 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -2733,7 +2733,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
        lpcfg_do_global_parameter(lp_ctx, "require strong key", "True");
        lpcfg_do_global_parameter(lp_ctx, "winbindd socket directory", dyn_WINBINDD_SOCKET_DIR);
        lpcfg_do_global_parameter(lp_ctx, "ntp signd socket directory", dyn_NTP_SIGND_SOCKET_DIR);
-       lpcfg_do_global_parameter_var(lp_ctx, "gpo update command", "%s/samba_gpoupdate", dyn_SCRIPTSBINDIR);
+       lpcfg_do_global_parameter_var(lp_ctx, "gpo update command", "%s/samba-gpupdate", dyn_SCRIPTSBINDIR);
        lpcfg_do_global_parameter_var(lp_ctx, "apply group policies", "False");
        lpcfg_do_global_parameter_var(lp_ctx, "dns update command", "%s/samba_dnsupdate", dyn_SCRIPTSBINDIR);
        lpcfg_do_global_parameter_var(lp_ctx, "spn update command", "%s/samba_spnupdate", dyn_SCRIPTSBINDIR);

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index eea84c1d41da7049061dab1eb07ae3d20f1f764f..2d887e183bcb4ddbb43cc14ac644cf4fc9ed183d 100755 (executable)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -641,7 +641,7 @@ sub provision_raw_step1($$)
        rndc command = true
        dns update command = $ctx->{samba_dnsupdate}
        spn update command = $ENV{SRCDIR_ABS}/source4/scripting/bin/samba_spnupdate -s $ctx->{smb_conf}
-       gpo update command = $ENV{SRCDIR_ABS}/source4/scripting/bin/samba_gpoupdate -s $ctx->{smb_conf} -H $ctx->{privatedir}/sam.ldb --machine
+       gpo update command = $ENV{SRCDIR_ABS}/source4/scripting/bin/samba-gpupdate -s $ctx->{smb_conf} -H $ctx->{privatedir}/sam.ldb --machine
        dreplsrv:periodic_startup_interval = 0
        dsdb:schema update allowed = yes
 

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index ecff22eb638f6c7afeed0713c552ea505d309f8f..8f2f26a4d76e6cf3641a669f218e5c63a7edf1dd 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -917,7 +917,7 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
        Globals.dns_update_command = str_list_make_v3_const(NULL, s, NULL);
        TALLOC_FREE(s);
 
-       s = talloc_asprintf(talloc_tos(), "%s/samba_gpoupdate", get_dyn_SCRIPTSBINDIR());
+       s = talloc_asprintf(talloc_tos(), "%s/samba-gpupdate", get_dyn_SCRIPTSBINDIR());
        if (s == NULL) {
                smb_panic("init_globals: ENOMEM");
        }

diff --git a/source4/scripting/bin/samba_gpoupdate b/source4/scripting/bin/samba-gpupdate
similarity index 96%
rename from source4/scripting/bin/samba_gpoupdate
rename to source4/scripting/bin/samba-gpupdate
index 89b3ed776162307593b45c72f829a79d1f837369..1a95d03c8adace893c54481addbf544ae93bf6b2 100755 (executable)
--- a/source4/scripting/bin/samba_gpoupdate
+++ b/source4/scripting/bin/samba-gpupdate
@@ -39,7 +39,7 @@ from samba.gp_sec_ext import gp_sec_ext
 import logging
 
 if __name__ == "__main__":
-    parser = optparse.OptionParser('samba_gpoupdate [options]')
+    parser = optparse.OptionParser('samba-gpupdate [options]')
     sambaopts = options.SambaOptions(parser)
 
     # Get the command line options
@@ -68,7 +68,7 @@ if __name__ == "__main__":
     session = system_session()
 
     # Set up logging
-    logger = logging.getLogger('samba_gpoupdate')
+    logger = logging.getLogger('samba-gpupdate')
     logger.addHandler(logging.StreamHandler(sys.stdout))
     logger.setLevel(logging.CRITICAL)
     log_level = lp.log_level()

diff --git a/source4/scripting/bin/wscript_build b/source4/scripting/bin/wscript_build
index 043442b34070a5841778b71ed407556feffec821..72e42584259d3bebe4cce1bbf86998e88e6ef6d9 100644 (file)
--- a/source4/scripting/bin/wscript_build
+++ b/source4/scripting/bin/wscript_build
@@ -9,4 +9,4 @@ if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
                    'samba_upgradedns',
                    'gen_output.py']:
         bld.SAMBA_SCRIPT(script, pattern=script, installdir='.')
-bld.SAMBA_SCRIPT('samba_gpoupdate', pattern='samba_gpoupdate', installdir='.')
+bld.SAMBA_SCRIPT('samba-gpupdate', pattern='samba-gpupdate', installdir='.')

diff --git a/source4/scripting/man/samba_gpoupdate.8.xml b/source4/scripting/man/samba-gpupdate.8.xml
similarity index 94%
rename from source4/scripting/man/samba_gpoupdate.8.xml
rename to source4/scripting/man/samba-gpupdate.8.xml
index 0c3a0a812a1623b168db961307a06d10e4f83f0a..23b191c21b9f9cee286d7cb85b2952ffa2ed0e39 100644 (file)
--- a/source4/scripting/man/samba_gpoupdate.8.xml
+++ b/source4/scripting/man/samba-gpupdate.8.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<refentry id="samba_gpoupdate.8">
+<refentry id="samba-gpupdate.8">
 <refentryinfo><date>2017-07-11</date></refentryinfo>
 
 <refmeta>
@@ -12,17 +12,17 @@
 </refmeta>
 
 <refnamediv>
-       <refname>samba_gpoupdate</refname>
+       <refname>samba-gpupdate</refname>
        <refpurpose>apply group policy</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
        <cmdsynopsis>
-               <command>samba_gpoupdate</command>
+               <command>samba-gpupdate</command>
        </cmdsynopsis>
 
        <cmdsynopsis>
-               <command>samba_gpoupdate</command>
+               <command>samba-gpupdate</command>
                <arg choice="opt">
                <replaceable>options</replaceable>
                </arg>
@@ -37,7 +37,7 @@
        <citerefentry><refentrytitle>samba</refentrytitle>
        <manvolnum>1</manvolnum></citerefentry> suite.</para>
 
-       <para><command>samba_gpoupdate</command> a script for
+       <para><command>samba-gpupdate</command> a script for
        applying and unapplying Group Policy. Group Policy
        application is experimental. Currently this applies
        password policies (minimum/maximum password age,

diff --git a/source4/scripting/wscript_build b/source4/scripting/wscript_build
index 2f53cce12b7861b8f157f8ea7caa416a20f040d6..df24e921cd99285b29ecfd00d127e4c44e35acdf 100644 (file)
--- a/source4/scripting/wscript_build
+++ b/source4/scripting/wscript_build
@@ -5,8 +5,8 @@ from samba_utils import MODE_755
 sbin_files = ''
 if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
     sbin_files = 'bin/samba_dnsupdate bin/samba_spnupdate bin/samba_upgradedns bin/samba_kcc '
-sbin_files += 'bin/samba_gpoupdate'
-man_files = 'man/samba_gpoupdate.8'
+sbin_files += 'bin/samba-gpupdate'
+man_files = 'man/samba-gpupdate.8'
 
 if sbin_files:
     bld.INSTALL_FILES('${SBINDIR}',