The branch, master has been updated
via 11634e6 smb.conf(5): Remove documentation for removed 'lock spin
count' parameter.
via e809abf smb.conf(5): Remove 'idmap config' documentation - the
parameter has been removed.
via 30c0c75 Remove unused neatquotes script.
via be56402 smb.conf.5: Document 'cldap port'.
via 718317e undocumented: Drop extension from helper scripts.
via 05ba1fe Remove obsolete land-remote.py and land.py scripts.
via c5e83ee samba-tool: Hide 'samba-tool domain samba3upgrade'.
from 98d117a selftest/knownfail: samba*.smb2.oplock.stream1 doesn't work
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 11634e6cd72bb6883923369731825b81758fbf68
Author: Jelmer Vernooij <jel...@samba.org>
Date: Wed Sep 26 02:59:35 2012 +0200
smb.conf(5): Remove documentation for removed 'lock spin count'
parameter.
Autobuild-User(master): Jelmer Vernooij <jel...@samba.org>
Autobuild-Date(master): Wed Sep 26 09:41:09 CEST 2012 on sn-devel-104
commit e809abf55f6a2e6d93bcb5678142f56c49aea397
Author: Jelmer Vernooij <jel...@samba.org>
Date: Wed Sep 26 02:58:28 2012 +0200
smb.conf(5): Remove 'idmap config' documentation - the parameter has
been removed.
commit 30c0c751c2a61b530099ac35663ec8cd8cb66527
Author: Jelmer Vernooij <jel...@samba.org>
Date: Wed Sep 26 01:28:17 2012 +0200
Remove unused neatquotes script.
commit be564022cbb394667ec3fed1f811b4628b8423bd
Author: Jelmer Vernooij <jel...@samba.org>
Date: Wed Sep 26 01:31:26 2012 +0200
smb.conf.5: Document 'cldap port'.
commit 718317ecef54d90070b29657f613e39892e38d10
Author: Jelmer Vernooij <jel...@samba.org>
Date: Wed Sep 26 01:31:37 2012 +0200
undocumented: Drop extension from helper scripts.
commit 05ba1fe418035e44c131fc76b5e62268b433eadc
Author: Jelmer Vernooij <jel...@samba.org>
Date: Wed Sep 26 00:47:02 2012 +0200
Remove obsolete land-remote.py and land.py scripts.
commit c5e83ee9a57d2d6648941e064f7c1156e52419a9
Author: Jelmer Vernooij <jel...@samba.org>
Date: Tue Sep 25 22:34:36 2012 +0200
samba-tool: Hide 'samba-tool domain samba3upgrade'.
This subcommand is provided for backwards compatibility only; new use of
it should be discouraged. Its new name is 'samba-tool domain
classicupgrade'.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=9047
-----------------------------------------------------------------------
Summary of changes:
docs-xml/Makefile | 6 +-
.../{find_missing_doc.pl => find_missing_doc} | 0
...d_missing_manpages.pl => find_missing_manpages} | 0
docs-xml/scripts/neatquotes.pl | 12 -
docs-xml/smbdotconf/locking/lockspincount.xml | 12 -
.../ldaptimeout.xml => protocol/cldapport.xml} | 13 +-
docs-xml/smbdotconf/winbind/idmapconfig.xml | 124 ----
script/land-remote.py | 113 ---
script/land.py | 741 --------------------
source4/scripting/python/samba/netcmd/__init__.py | 13 +-
source4/scripting/python/samba/netcmd/domain.py | 24 +-
11 files changed, 35 insertions(+), 1023 deletions(-)
rename docs-xml/scripts/{find_missing_doc.pl => find_missing_doc} (100%)
rename docs-xml/scripts/{find_missing_manpages.pl => find_missing_manpages}
(100%)
delete mode 100755 docs-xml/scripts/neatquotes.pl
delete mode 100644 docs-xml/smbdotconf/locking/lockspincount.xml
copy docs-xml/smbdotconf/{ldap/ldaptimeout.xml => protocol/cldapport.xml} (53%)
delete mode 100644 docs-xml/smbdotconf/winbind/idmapconfig.xml
delete mode 100755 script/land-remote.py
delete mode 100755 script/land.py
Changeset truncated at 500 lines:
diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 0feab24..0b4e880 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -260,9 +260,9 @@ $(PEARSONDIR)/%.report.html: $(PEARSONDIR)/%.xml
cd $(<D) && $(XMLLINT) --xinclude --noent --postvalid --noout $(<F)
# Find undocumented parameters
-undocumented: $(SMBDOTCONFDOC)/parameters.all.xml scripts/find_missing_doc.pl
scripts/find_missing_manpages.pl
- $(PERL) scripts/find_missing_doc.pl $(SRCDIR)
- $(PERL) scripts/find_missing_manpages.pl $(SRCDIR)/source3
+undocumented: $(SMBDOTCONFDOC)/parameters.all.xml scripts/find_missing_doc
scripts/find_missing_manpages
+ $(PERL) scripts/find_missing_doc $(SRCDIR)
+ $(PERL) scripts/find_missing_manpages $(SRCDIR)/source3
samples: $(DOCBOOKDIR)/Samba3-HOWTO.xml xslt/extract-examples.xsl
scripts/indent-smb.conf.pl
@mkdir -p examples
diff --git a/docs-xml/scripts/find_missing_doc.pl
b/docs-xml/scripts/find_missing_doc
similarity index 100%
rename from docs-xml/scripts/find_missing_doc.pl
rename to docs-xml/scripts/find_missing_doc
diff --git a/docs-xml/scripts/find_missing_manpages.pl
b/docs-xml/scripts/find_missing_manpages
similarity index 100%
rename from docs-xml/scripts/find_missing_manpages.pl
rename to docs-xml/scripts/find_missing_manpages
diff --git a/docs-xml/scripts/neatquotes.pl b/docs-xml/scripts/neatquotes.pl
deleted file mode 100755
index 9d5aa6e..0000000
--- a/docs-xml/scripts/neatquotes.pl
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/perl
-
-my $inprog = 0;
-
-while(<STDIN>) {
- if(/<(programlisting|screen)>/) { $inprog = 1; }
- if(/<\/(programlisting|screen)>/) { $inprog = 0; }
- if(not /="(.*)"/ and not $inprog) {
- s/"(.*?)"/<quote>\1<\/quote>/g;
- }
- print $_;
-}
diff --git a/docs-xml/smbdotconf/locking/lockspincount.xml
b/docs-xml/smbdotconf/locking/lockspincount.xml
deleted file mode 100644
index da2582d..0000000
--- a/docs-xml/smbdotconf/locking/lockspincount.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<samba:parameter name="lock spin count"
- context="G"
- type="integer"
- xmlns:samba="http://www.samba.org/samba/DTD/samba-doc";>
-<description>
- <para>This parameter has been made inoperative in Samba 3.0.24.
- The functionality it controlled is now controlled by the parameter
- <smbconfoption name="lock spin time"/>.
- </para>
-</description>
-<value type="default">0</value>
-</samba:parameter>
diff --git a/docs-xml/smbdotconf/ldap/ldaptimeout.xml
b/docs-xml/smbdotconf/protocol/cldapport.xml
similarity index 53%
copy from docs-xml/smbdotconf/ldap/ldaptimeout.xml
copy to docs-xml/smbdotconf/protocol/cldapport.xml
index 5bc2699..c5f7606 100644
--- a/docs-xml/smbdotconf/ldap/ldaptimeout.xml
+++ b/docs-xml/smbdotconf/protocol/cldapport.xml
@@ -1,12 +1,13 @@
-<samba:parameter name="ldap timeout"
+<samba:parameter name="cldap port"
context="G"
- advanced="1" developer="1"
type="integer"
+ advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc";>
<description>
- <para>
- This parameter defines the number of seconds that Samba should use as
timeout for LDAP operations.
- </para>
+ <para>This option controls the port used by the CLDAP protocol.
+</para>
</description>
-<value type="default">15</value>
+
+<value type="default">389</value>
+<value type="example">3389</value>
</samba:parameter>
diff --git a/docs-xml/smbdotconf/winbind/idmapconfig.xml
b/docs-xml/smbdotconf/winbind/idmapconfig.xml
deleted file mode 100644
index 53af31f..0000000
--- a/docs-xml/smbdotconf/winbind/idmapconfig.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<samba:parameter name="idmap config"
- context="G"
- type="string"
- advanced="1" developer="1" hide="1"
- xmlns:samba="http://www.samba.org/samba/DTD/samba-doc";>
-<description>
-
- <para>
- ID mapping in Samba is the mapping between Windows SIDs and Unix user
- and group IDs. This is performed by Winbindd with a configurable plugin
- interface. Samba's ID mapping is configured by options starting with the
- <smbconfoption name="idmap config"/> prefix.
- An idmap option consists of the <smbconfoption name="idmap config"/>
- prefix, followed by a domain name or the asterisk character (*),
- a colon, and the name of an idmap setting for the chosen domain.
- </para>
-
- <para>
- The idmap configuration is hence divided into groups, one group
- for each domain to be configured, and one group with the the
- asterisk instead of a proper domain name, which specifies the
- default configuration that is used to catch all domains that do
- not have an explicit idmap configuration of their own.
- </para>
-
- <para>
- There are three general options available:
- </para>
-
- <variablelist>
- <varlistentry>
- <term>backend = backend_name</term>
- <listitem><para>
- This specifies the name of the idmap plugin to use as the
- SID/uid/gid backend for this domain. The standard backends are
- tdb
- (<citerefentry><refentrytitle>idmap_tdb</refentrytitle>
<manvolnum>8</manvolnum> </citerefentry>),
- tdb2
- (<citerefentry><refentrytitle>idmap_tdb2</refentrytitle>
<manvolnum>8</manvolnum></citerefentry>),
- ldap
- (<citerefentry><refentrytitle>idmap_ldap</refentrytitle>
<manvolnum>8</manvolnum></citerefentry>),
- ,
- rid
- (<citerefentry><refentrytitle>idmap_rid</refentrytitle>
<manvolnum>8</manvolnum></citerefentry>),
- ,
- hash
- (<citerefentry><refentrytitle>idmap_hash</refentrytitle>
<manvolnum>8</manvolnum></citerefentry>),
- ,
- autorid
- (<citerefentry><refentrytitle>idmap_autorid</refentrytitle>
<manvolnum>8</manvolnum></citerefentry>),
- ,
- ad
- (<citerefentry><refentrytitle>idmap_ad</refentrytitle>
<manvolnum>8</manvolnum></citerefentry>),
- ,
- and nss.
- (<citerefentry><refentrytitle>idmap_nss</refentrytitle>
<manvolnum>8</manvolnum></citerefentry>),
- The corresponding manual pages contain the details, but
- here is a summary.
- </para>
- <para>
- The first three of these create mappings of their own using
- internal unixid counters and store the mappings in a database.
- These are suitable for use in the default idmap configuration.
- The rid and hash backends use a pure algorithmic calculation
- to determine the unixid for a SID. The autorid module is a
- mixture of the tdb and rid backend. It creates ranges for
- each domain encountered and then uses the rid algorithm for each
- of these automatically configured domains individually.
- The ad backend usees unix IDs stored in Active Directory via
- the standard schema extensions. The nss backend reverses
- the standard winbindd setup and gets the unixids via names
- from nsswitch which can be useful in an ldap setup.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>range = low - high</term>
- <listitem><para>
- Defines the available matching uid and gid range for which the
- backend is authoritative. For allocating backends, this also
- defines the start and the end of the range for allocating
- new unique IDs.
- </para>
- <para>
- winbind uses this parameter to find the backend that is
- authoritative for a unix ID to SID mapping, so it must be set
- for each individually configured domain and for the default
- configuration. The configured ranges must be mutually disjoint.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>read only = yes|no</term>
- <listitem><para>
- This option can be used to turn the writing backends
- tdb, tdb2, and ldap into read only mode. This can be useful
- e.g. in cases where a pre-filled database exists that should
- not be extended automatically.
- </para></listitem>
- </varlistentry>
- </variablelist>
-
- <para>
- The following example illustrates how to configure the <citerefentry>
- <refentrytitle>idmap_ad</refentrytitle> <manvolnum>8</manvolnum>
- </citerefentry> backend for the CORP domain and the
- <citerefentry><refentrytitle>idmap_tdb</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> backend for all other
- domains. This configuration assumes that the admin of CORP assigns
- unix ids below 1000000 via the SFU extensions, and winbind is supposed
- to use the next million entries for its own mappings from trusted
- domains and for local groups for example.
- </para>
-
- <programlisting>
- idmap config * : backend = tdb
- idmap config * : range = 1000000-1999999
-
- idmap config CORP : backend = ad
- idmap config CORP : range = 1000-999999
- </programlisting>
-
-</description>
-</samba:parameter>
diff --git a/script/land-remote.py b/script/land-remote.py
deleted file mode 100755
index 1009e6b..0000000
--- a/script/land-remote.py
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/usr/bin/python
-# Ship a local branch to a remote host (sn-104?) over ssh and run autobuild in
it.
-# Copyright (C) 2010 Jelmer Vernooij <jel...@samba.org>
-# Published under the GPL, v3 or later
-
-import optparse
-import os
-import subprocess
-import sys
-
-samba_master = os.getenv('SAMBA_MASTER', 'git://git.samba.org/samba.git')
-
-parser = optparse.OptionParser("autoland-remote [options] [trees...]")
-parser.add_option("--remote-repo", help="Location of remote repository
(default: temporary repository)", type=str, default=None)
-parser.add_option("--host", help="Host to land on (SSH connection string)",
type=str, default="sn-devel-104.sn.samba.org")
-parser.add_option("--foreground", help="Don't daemonize", action="store_true",
default=False)
-parser.add_option("--email", help="Email address to send build/test output
to", type=str, default=None, metavar="EMAIL")
-parser.add_option("--always-email", help="always send email, even on success",
action="store_true")
-parser.add_option("--rebase-master", help="rebase on master before testing",
default=False, action='store_true')
-parser.add_option("--push-master", help="push to samba.org master on success",
- default=False, action='store_true')
-parser.add_option("--pushto", help="push to a git url on success",
- default=None, type='str')
-parser.add_option("--rebase", help="rebase on the given tree before testing",
default=None, type='str')
-parser.add_option("--passcmd", help="command to run on success", default=None)
-parser.add_option("--tail", help="show output while running", default=False,
action="store_true")
-parser.add_option("--keeplogs", help="keep logs", default=False,
action="store_true")
-parser.add_option("--nocleanup", help="don't remove test tree", default=False,
action="store_true")
-parser.add_option("--revision", help="revision to compile if not HEAD",
default=None, type=str)
-parser.add_option("--fix-whitespace", help="fix whitespace on rebase",
- default=False, action="store_true")
-parser.add_option("--fail-slowly", help="continue running tests even after one
has already failed",
- action="store_true")
-
-(opts, extra_args) = parser.parse_args()
-
-if opts.email is None and os.getenv("EMAIL") is not None:
- opts.email = os.getenv("EMAIL")
-
-if opts.email:
- print "Sending email to %s" % opts.email
-
-if not opts.foreground and not opts.email:
- print "Not running in foreground and --email not specified."
- sys.exit(1)
-
-if not opts.foreground and opts.push_master:
- print "Pushing to master, forcing run in foreground."
- opts.foreground = True
-
-if not opts.remote_repo:
- print "%s$ mktemp -d" % opts.host
- f = subprocess.Popen(["ssh", opts.host, "mktemp", "-d"],
stdout=subprocess.PIPE)
- (stdout, stderr) = f.communicate()
- if f.returncode != 0:
- sys.exit(1)
- remote_repo = stdout.rstrip()
- print "Remote tempdir: %s" % remote_repo
- # Bootstrap, git.samba.org is usually more easily accessible.
- #remote_args = ["git", "clone", samba_master, remote_repo]
- remote_args = ["if [ -d /data/git/samba.git ]; then git clone --shared
/data/git/samba.git %s; else git clone --shared %s %s; fi" % (remote_repo,
samba_master, remote_repo)]
- #remote_args = ["git", "init", remote_repo]
- print "%s$ %s" % (opts.host, " ".join(remote_args))
- subprocess.check_call(["ssh", opts.host] + remote_args)
-else:
- remote_repo = opts.remote_repo
-
-print "Pushing local branch"
-
-if opts.revision is not None:
- revision = opts.revision
-else:
- revision = "HEAD"
-args = ["git", "push", "--force", "git+ssh://%s/%s" % (opts.host,
remote_repo), "%s:land" % revision]
-print "$ " + " ".join(args)
-subprocess.check_call(args)
-remote_args = ["cd", remote_repo, ";", "git", "checkout", "land", ";",
"python", "-u", "./script/land.py", "--repository=%s" % remote_repo]
-
-if (opts.email and not (opts.foreground or opts.pushto or opts.push_master)):
- # Force always emailing if there's nothing else to do
- opts.always_email = True
-
-if opts.email:
- remote_args.append("--email=%s" % opts.email)
-if opts.always_email:
- remote_args.append("--always-email")
-if not opts.foreground:
- remote_args.append("--daemon")
-if opts.nocleanup:
- remote_args.append("--nocleanup")
-if opts.fix_whitespace:
- remote_args.append("--fix-whitespace")
-if opts.tail:
- remote_args.append("--tail")
-if opts.keeplogs:
- remote_args.append("--keeplogs")
-if opts.rebase_master:
- remote_args.append("--rebase-master")
-if opts.rebase:
- remote_args.append("--rebase=%s" % opts.rebase)
-if opts.passcmd:
- remote_args.append("--passcmd=%s" % opts.passcmd)
-if opts.pushto:
- remote_args.append("--pushto=%s" % opts.pushto)
-if opts.push_master:
- remote_args.append("--push-master")
-if opts.fail_slowly:
- remote_args.append("--fail-slowly")
-
-remote_args += extra_args
-print "%s$ %s" % (opts.host, " ".join(remote_args))
-args = ["ssh", "-A", opts.host] + remote_args
-sys.exit(subprocess.call(args))
diff --git a/script/land.py b/script/land.py
deleted file mode 100755
index 72bdd4b..0000000
--- a/script/land.py
+++ /dev/null
@@ -1,741 +0,0 @@
-#!/usr/bin/env python
-# run tests on all Samba subprojects and push to a git tree on success
-# Copyright Andrew Tridgell 2010
-# Copyright Jelmer Vernooij 2010
-# released under GNU GPL v3 or later
-
-from cStringIO import StringIO
-import fcntl
-from subprocess import call, check_call, Popen, PIPE
-import os, tarfile, sys, time
-from optparse import OptionParser
-import smtplib
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../selftest"))
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../lib/testtools"))
-sys.path.insert(0, os.path.join(os.path.dirname(__file__),
"../lib/subunit/python"))
-import subunit
-import testtools
-import subunithelper
-import tempfile
-from email.mime.application import MIMEApplication
-from email.mime.text import MIMEText
-from email.mime.multipart import MIMEMultipart
-
-samba_master = os.getenv('SAMBA_MASTER', 'git://git.samba.org/samba.git')
-samba_master_ssh = os.getenv('SAMBA_MASTER_SSH',
'git+ssh://git.samba.org/data/git/samba.git')
-
-cleanup_list = []
-
-os.environ['CC'] = "ccache gcc"
-
-tasks = {
- "source3" : [ ("autogen", "./autogen.sh", "text/plain"),
- ("configure", "./configure.developer ${PREFIX}",
"text/plain"),
- ("make basics", "make basics", "text/plain"),
- ("make", "make -j 4 everything", "text/plain"), # don't use
too many processes
- ("install", "make install", "text/plain"),
- ("test", "TDB_NO_FSYNC=1 make subunit-test",
"text/x-subunit") ],
-
- "source4" : [ ("configure", "./configure.developer ${PREFIX}",
"text/plain"),
- ("make", "make -j", "text/plain"),
- ("install", "make install", "text/plain"),
- ("test", "TDB_NO_FSYNC=1 make subunit-test",
"text/x-subunit") ],
-
- "lib/ldb" : [ ("configure", "./configure --enable-developer -C ${PREFIX}",
"text/plain"),
- ("make", "make -j", "text/plain"),
- ("install", "make install", "text/plain"),
- ("test", "make test", "text/plain") ],
-
- "lib/tdb" : [ ("autogen", "./autogen-waf.sh", "text/plain"),
- ("configure", "./configure --enable-developer -C ${PREFIX}",
"text/plain"),
- ("make", "make -j", "text/plain"),
- ("install", "make install", "text/plain"),
- ("test", "make test", "text/plain") ],
-
- "lib/talloc" : [ ("autogen", "./autogen-waf.sh", "text/plain"),
- ("configure", "./configure --enable-developer -C
${PREFIX}", "text/plain"),
- ("make", "make -j", "text/plain"),
- ("install", "make install", "text/plain"),
- ("test", "make test", "text/x-subunit"), ],
-
- "lib/replace" : [ ("autogen", "./autogen-waf.sh", "text/plain"),
- ("configure", "./configure --enable-developer -C
${PREFIX}", "text/plain"),
- ("make", "make -j", "text/plain"),
- ("install", "make install", "text/plain"),
- ("test", "make test", "text/plain"), ],
-
- "lib/tevent" : [ ("configure", "./configure --enable-developer -C
${PREFIX}", "text/plain"),
- ("make", "make -j", "text/plain"),
- ("install", "make install", "text/plain"),
- ("test", "make test", "text/plain"), ],
-}
-
-
-def run_cmd(cmd, dir=None, show=None, output=False, checkfail=True,
shell=False):
- if show is None:
- show = options.verbose
- if show:
- print("Running: '%s' in '%s'" % (cmd, dir))
- if output:
- return Popen(cmd, stdout=PIPE, cwd=dir, shell=shell).communicate()[0]
- elif checkfail:
- return check_call(cmd, cwd=dir, shell=shell)
- else:
- return call(cmd, cwd=dir, shell=shell)
-
-
-def clone_gitroot(test_master, revision="HEAD"):
- run_cmd(["git", "clone", "--shared", gitroot, test_master])
- if revision != "HEAD":
- run_cmd(["git", "checkout", revision])
-
-
-class RetryChecker(object):
- """Check whether it is necessary to retry."""
-
- def __init__(self, dir):
- run_cmd(["git", "remote", "add", "-t", "master", "master",
samba_master])
- run_cmd(["git", "fetch", "master"])
- cmd = '''set -e
- while :; do
- sleep 60
- git describe master/master > old_master.desc
- git fetch master
- git describe master/master > master.desc
- diff old_master.desc master.desc
- done
- '''
- self.proc = Popen(cmd, shell=True, cwd=self.dir)
-
- def poll(self):
- return self.proc.poll()
-
- def kill(self):
- self.proc.terminate()
- self.proc.wait()
- self.retry.proc = None
-
-
-class TreeStageBuilder(object):
- """Handle building of a particular stage for a tree.
- """
-
- def __init__(self, tree, name, command, fail_quickly=False):
- self.tree = tree
- self.name = name
- self.command = command
- self.fail_quickly = fail_quickly
- self.exitcode = None
- self.stdin = open(os.devnull, 'r')
-
- def start(self):
- raise NotImplementedError(self.start)
-
- def poll(self):
- self.exitcode = self.proc.poll()
- return self.exitcode
-
- def kill(self):
- if self.proc is not None:
- try:
- run_cmd(["killbysubdir", self.tree.sdir], checkfail=False)
- except OSError:
- # killbysubdir doesn't exist ?
- pass
- self.proc.terminate()
- self.proc.wait()
- self.proc = None
-
- @property
- def failure_reason(self):
- raise NotImplementedError(self.failure_reason)
-
- @property
- def failed(self):
- return (self.exitcode != 0)
-
-
--
Samba Shared Repository
