sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

samba_gpoupdate: Rename the command to samba-gpupdate

Browse Source 
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>
This commit is contained in:
David Mulder 2018-05-07 09:45:32 -06:00 committed by Andrew Bartlett
parent 56d9b1a533
commit c8621948f6
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs-xml/smbdotconf/domain/gpoupdatecommand.xml
View File

@ -5,7 +5,7 @@
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description> <description>
<para>This option sets the command that is called to apply GPO policies. <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, to the KDC. System Access policies set minPwdAge, maxPwdAge,
minPwdLength, and pwdProperties in the samdb. Kerberos Policies set minPwdLength, and pwdProperties in the samdb. Kerberos Policies set
kdc:service ticket lifetime, kdc:user ticket lifetime, and kdc:renewal kdc:service ticket lifetime, kdc:user ticket lifetime, and kdc:renewal
@ -13,6 +13,6 @@
</para> </para>
</description> </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> <value type="example">/usr/local/sbin/gpoupdate</value>
</samba:parameter> </samba:parameter>

2
lib/param/loadparm.c
View File

@ -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, "require strong key", "True");
lpcfg_do_global_parameter(lp_ctx, "winbindd socket directory", dyn_WINBINDD_SOCKET_DIR); 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(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, "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, "dns update command", "%s/samba_dnsupdate", dyn_SCRIPTSBINDIR);
lpcfg_do_global_parameter_var(lp_ctx, "spn update command", "%s/samba_spnupdate", dyn_SCRIPTSBINDIR); lpcfg_do_global_parameter_var(lp_ctx, "spn update command", "%s/samba_spnupdate", dyn_SCRIPTSBINDIR);

2
selftest/target/Samba4.pm
View File

@ -641,7 +641,7 @@ sub provision_raw_step1($$)
rndc command = true rndc command = true
dns update command = $ctx->{samba_dnsupdate} dns update command = $ctx->{samba_dnsupdate}
spn update command = $ENV{SRCDIR_ABS}/source4/scripting/bin/samba_spnupdate -s $ctx->{smb_conf} 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 dreplsrv:periodic_startup_interval = 0
dsdb:schema update allowed = yes dsdb:schema update allowed = yes

2
source3/param/loadparm.c
View File

@ -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); Globals.dns_update_command = str_list_make_v3_const(NULL, s, NULL);
TALLOC_FREE(s); 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) { if (s == NULL) {
smb_panic("init_globals: ENOMEM"); smb_panic("init_globals: ENOMEM");
} }

4
source4/scripting/bin/samba_gpoupdate → source4/scripting/bin/samba-gpupdate
View File

@ -39,7 +39,7 @@ from samba.gp_sec_ext import gp_sec_ext
import logging import logging
if __name__ == "__main__": if __name__ == "__main__":
parser = optparse.OptionParser('samba_gpoupdate [options]') parser = optparse.OptionParser('samba-gpupdate [options]')
sambaopts = options.SambaOptions(parser) sambaopts = options.SambaOptions(parser)
# Get the command line options # Get the command line options
@ -68,7 +68,7 @@ if __name__ == "__main__":
session = system_session() session = system_session()
# Set up logging # Set up logging
logger = logging.getLogger('samba_gpoupdate') logger = logging.getLogger('samba-gpupdate')
logger.addHandler(logging.StreamHandler(sys.stdout)) logger.addHandler(logging.StreamHandler(sys.stdout))
logger.setLevel(logging.CRITICAL) logger.setLevel(logging.CRITICAL)
log_level = lp.log_level() log_level = lp.log_level()

2
source4/scripting/bin/wscript_build
View File

@ -9,4 +9,4 @@ if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
'samba_upgradedns', 'samba_upgradedns',
'gen_output.py']: 'gen_output.py']:
bld.SAMBA_SCRIPT(script, pattern=script, installdir='.') 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='.')

10
source4/scripting/man/samba_gpoupdate.8.xml → source4/scripting/man/samba-gpupdate.8.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?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"> <!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> <refentryinfo><date>2017-07-11</date></refentryinfo>
<refmeta> <refmeta>
@ -12,17 +12,17 @@
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>samba_gpoupdate</refname> <refname>samba-gpupdate</refname>
<refpurpose>apply group policy</refpurpose> <refpurpose>apply group policy</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<cmdsynopsis> <cmdsynopsis>
<command>samba_gpoupdate</command> <command>samba-gpupdate</command>
</cmdsynopsis> </cmdsynopsis>
<cmdsynopsis> <cmdsynopsis>
<command>samba_gpoupdate</command> <command>samba-gpupdate</command>
<arg choice="opt"> <arg choice="opt">
<replaceable>options</replaceable> <replaceable>options</replaceable>
</arg> </arg>
@ -37,7 +37,7 @@
<citerefentry><refentrytitle>samba</refentrytitle> <citerefentry><refentrytitle>samba</refentrytitle>
<manvolnum>1</manvolnum></citerefentry> suite.</para> <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 applying and unapplying Group Policy. Group Policy
application is experimental. Currently this applies application is experimental. Currently this applies
password policies (minimum/maximum password age, password policies (minimum/maximum password age,

4
source4/scripting/wscript_build
View File

@ -5,8 +5,8 @@ from samba_utils import MODE_755
sbin_files = '' sbin_files = ''
if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'): 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_dnsupdate bin/samba_spnupdate bin/samba_upgradedns bin/samba_kcc '
sbin_files += 'bin/samba_gpoupdate' sbin_files += 'bin/samba-gpupdate'
man_files = 'man/samba_gpoupdate.8' man_files = 'man/samba-gpupdate.8'
if sbin_files: if sbin_files:
bld.INSTALL_FILES('${SBINDIR}', bld.INSTALL_FILES('${SBINDIR}',