[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Wed Jul 4 11:24:03 UTC 2018
The branch, master has been updated
via a958dc3 samba-gpupdate: Change machine option to target
via c862194 samba_gpoupdate: Rename the command to samba-gpupdate
from 56d9b1a MAN: Adding entry for net ads lookup
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a958dc35bbeea61fa1344a10602e7d40c8339764
Author: David Mulder <dmulder at suse.com>
Date: Mon May 7 09:48:32 2018 -0600
samba-gpupdate: Change machine option to target
On a Windows client, you designate machine/user
apply with a 'target' parameter. This change
makes gpupdate work more like that command.
Signed-off-by: David Mulder <dmulder at suse.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Wed Jul 4 13:23:09 CEST 2018 on sn-devel-144
commit c8621948f65d09cd3461cfacc4aa00051abb0796
Author: David Mulder <dmulder at suse.com>
Date: Mon May 7 09:45:32 2018 -0600
samba_gpoupdate: Rename the command to samba-gpupdate
On a Windows client, this command is called 'gpupdate'
Signed-off-by: David Mulder <dmulder at suse.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/smbdotconf/domain/gpoupdatecommand.xml | 4 ++--
lib/param/loadparm.c | 2 +-
selftest/target/Samba4.pm | 2 +-
source3/param/loadparm.c | 2 +-
source3/winbindd/winbindd_gpupdate.c | 2 +-
source4/scripting/bin/{samba_gpoupdate => samba-gpupdate} | 12 ++++++------
source4/scripting/bin/wscript_build | 2 +-
.../man/{samba_gpoupdate.8.xml => samba-gpupdate.8.xml} | 13 ++++++++-----
source4/scripting/wscript_build | 4 ++--
9 files changed, 23 insertions(+), 20 deletions(-)
rename source4/scripting/bin/{samba_gpoupdate => samba-gpupdate} (91%)
rename source4/scripting/man/{samba_gpoupdate.8.xml => samba-gpupdate.8.xml} (93%)
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/domain/gpoupdatecommand.xml b/docs-xml/smbdotconf/domain/gpoupdatecommand.xml
index 3ce26d7..6bf88f8 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">
<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 9684a52..75ee668 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 eea84c1..58fbe27 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 --target=Computer
dreplsrv:periodic_startup_interval = 0
dsdb:schema update allowed = yes
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index ecff22e..8f2f26a 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/source3/winbindd/winbindd_gpupdate.c b/source3/winbindd/winbindd_gpupdate.c
index c86c007..75772ea 100644
--- a/source3/winbindd/winbindd_gpupdate.c
+++ b/source3/winbindd/winbindd_gpupdate.c
@@ -62,7 +62,7 @@ static void gpupdate_callback(struct tevent_context *ev,
gpupdate_cmd,
"-s",
smbconf,
- "--machine",
+ "--target=Computer",
"--machine-pass",
NULL);
if (req == NULL) {
diff --git a/source4/scripting/bin/samba_gpoupdate b/source4/scripting/bin/samba-gpupdate
similarity index 91%
rename from source4/scripting/bin/samba_gpoupdate
rename to source4/scripting/bin/samba-gpupdate
index 89b3ed7..647acd9 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
@@ -49,8 +49,8 @@ if __name__ == "__main__":
parser.add_option('-H', '--url', dest='url', help='URL for the samdb')
parser.add_option('-X', '--unapply', help='Unapply Group Policy',
action='store_true')
- parser.add_option('-M', '--machine', help='Apply machine policy',
- action='store_true', default=False)
+ parser.add_option('--target', default='Computer', help='{Computer | User}',
+ choices=['Computer', 'User'])
parser.add_option_group(credopts)
# Set the options and the arguments
@@ -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()
@@ -85,10 +85,10 @@ if __name__ == "__main__":
store = GPOStorage(os.path.join(cache_dir, 'gpo.tdb'))
gp_extensions = []
- if opts.machine:
+ if opts.target == 'Computer':
if lp.get('server role') == 'active directory domain controller':
gp_extensions.append(gp_sec_ext(logger))
- else:
+ elif opts.target == 'User':
pass # User extensions
# Get a live instance of Samba
diff --git a/source4/scripting/bin/wscript_build b/source4/scripting/bin/wscript_build
index 043442b..72e4258 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 93%
rename from source4/scripting/man/samba_gpoupdate.8.xml
rename to source4/scripting/man/samba-gpupdate.8.xml
index 0c3a0a8..95f17bd 100644
--- 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,
@@ -59,6 +59,9 @@
<para><option>-X</option>, <option>--unapply</option>
Unapply Group Policy</para>
+<para><option>--target</option>
+ {Computer | User}</para>
+
<para>Samba Common Options:</para>
<para><option>-s </option>FILE, <option>--configfile</option>=<emphasis remap="I">FILE</emphasis>
diff --git a/source4/scripting/wscript_build b/source4/scripting/wscript_build
index 2f53cce..df24e92 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}',
--
Samba Shared Repository
More information about the samba-cvs
mailing list