From: David Mulder Date: Mon, 7 May 2018 15:45:32 +0000 (-0600) Subject: samba_gpoupdate: Rename the command to samba-gpupdate X-Git-Tag: tevent-0.9.37~139 X-Git-Url: http://git.samba.org/samba.git/?p=nivanova%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=c8621948f65d09cd3461cfacc4aa00051abb0796;hp=56d9b1a533b8d3ebd4e686145883c7ed62c08ce0 samba_gpoupdate: Rename the command to samba-gpupdate On a Windows client, this command is called 'gpupdate' Signed-off-by: David Mulder Reviewed-by: Andreas Schneider Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett --- diff --git a/docs-xml/smbdotconf/domain/gpoupdatecommand.xml b/docs-xml/smbdotconf/domain/gpoupdatecommand.xml index 3ce26d78287..6bf88f8e68a 100644 --- 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"> 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 @@ -&pathconfig.SCRIPTSBINDIR;/samba_gpoupdate +&pathconfig.SCRIPTSBINDIR;/samba-gpupdate /usr/local/sbin/gpoupdate diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 9684a52952b..75ee6685b72 100644 --- 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 eea84c1d41d..2d887e183bc 100755 --- 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 ecff22eb638..8f2f26a4d76 100644 --- 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 89b3ed77616..1a95d03c8ad 100755 --- 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 043442b3407..72e42584259 100644 --- 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 0c3a0a812a1..23b191c21b9 100644 --- a/source4/scripting/man/samba_gpoupdate.8.xml +++ b/source4/scripting/man/samba-gpupdate.8.xml @@ -1,6 +1,6 @@ - + 2017-07-11 @@ -12,17 +12,17 @@ - samba_gpoupdate + samba-gpupdate apply group policy - samba_gpoupdate + samba-gpupdate - samba_gpoupdate + samba-gpupdate options @@ -37,7 +37,7 @@ samba 1 suite. - samba_gpoupdate a script for + samba-gpupdate 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 2f53cce12b7..df24e921cd9 100644 --- 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}',