[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
   via  a6ed907 dsdb: Handle the case when extended rights string is NULL
   via  c8ac367 s4-drepl: Search for application partitions in addition to 
main ones
   via  4a6410d s4-dnsserver: Check the raised exception with assertRaises
   via  8dca18a s4-dnsserver: Handle the case when the dns name is NULL
   via  6e800bf s4-dnsserver: Build a dns name tree for correct enumeration
   via  0d3aff7 s4-dnsserver: List dns zones matching the search filter
   via  c1b45af s4-dnsserver: Compare two dns names using last uncommon 
name components
   via  c651b4e s4-dnsserver: Set DNS_DP_AUTOCREATED flag for the zone 
information
   via  9abfaa3 samba-tool: Improve the description of dns subcommands.
   via  66121dc samba-tool: Enable comparison of DNS naming contexts in 
ldapcmp
  from  cde73e2 Remove opendir() VFS code from ACL modules.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit a6ed9071b9aa75ff6f3ca2c3b24e6060c4d3f389
Author: Amitay Isaacs ami...@gmail.com
Date:   Wed Nov 2 14:34:41 2011 +1100

dsdb: Handle the case when extended rights string is NULL

Pair-Programmed-With: Andrew Tridgell tri...@samba.org

Signed-off-by: Andrew Tridgell tri...@samba.org

Autobuild-User: Andrew Tridgell tri...@samba.org
Autobuild-Date: Wed Nov  2 07:03:40 CET 2011 on sn-devel-104

commit c8ac3678ad98bc27cf08f3d14bae2aa52318c48d
Author: Amitay Isaacs ami...@gmail.com
Date:   Tue Oct 25 15:06:07 2011 +1100

s4-drepl: Search for application partitions in addition to main ones

To replicate application partitions (e.g. DNS partitions) consult
msDs-hasMasterNCs attribute as well. Also, make sure we don't add
same partition twice in the list. hasMasterNCs and msDs-hasMasterNCs
have domain, configuration and schema partitions common.

Signed-off-by: Andrew Tridgell tri...@samba.org

commit 4a6410df54fdbc8fb08b104c47010db507443def
Author: Amitay Isaacs ami...@gmail.com
Date:   Mon Oct 24 17:37:24 2011 +1100

s4-dnsserver: Check the raised exception with assertRaises

Signed-off-by: Andrew Tridgell tri...@samba.org

commit 8dca18a71a813719e1c20b1ff909ed3aae32cf40
Author: Amitay Isaacs ami...@gmail.com
Date:   Mon Oct 24 17:22:21 2011 +1100

s4-dnsserver: Handle the case when the dns name is NULL

Signed-off-by: Andrew Tridgell tri...@samba.org

commit 6e800bfba708124077defab3c9379db201f4c43c
Author: Amitay Isaacs ami...@gmail.com
Date:   Mon Oct 24 17:20:46 2011 +1100

s4-dnsserver: Build a dns name tree for correct enumeration

The result of EnumRecords/EnumRecords2 RPC calls, is a list of
dns records that are one level below in the name hierarchy starting
from the search name. This patch builds a tree of names to get
the list of records one level below the search names and correctly
count the number of child records for each of those.

Signed-off-by: Andrew Tridgell tri...@samba.org

commit 0d3aff732483cf1a48cb9ea6af16537fc11be547
Author: Amitay Isaacs ami...@gmail.com
Date:   Mon Oct 24 17:15:27 2011 +1100

s4-dnsserver: List dns zones matching the search filter

Signed-off-by: Andrew Tridgell tri...@samba.org

commit c1b45afcf254ed0bbb36b125e440a2731c253e63
Author: Amitay Isaacs ami...@gmail.com
Date:   Mon Oct 24 17:07:45 2011 +1100

s4-dnsserver: Compare two dns names using last uncommon name components

When search_name is not NULL, use the second last component of name
instead of the last name.

e.g. To compare following two names,
   _ldap._tcp.gc, and
   _ldap._tcp.Default-First-Site-Name._sites.gc

with search_name=NULL, it is gc and gc
with search_name=gc, it is _tcp and _sites

Signed-off-by: Andrew Tridgell tri...@samba.org

commit c651b4e99b8bd70eb3be7b3d416c329b4d506f76
Author: Amitay Isaacs ami...@gmail.com
Date:   Mon Oct 24 16:54:16 2011 +1100

s4-dnsserver: Set DNS_DP_AUTOCREATED flag for the zone information

This make the zone information similar to windows (W2K8r2).

Signed-off-by: Andrew Tridgell tri...@samba.org

commit 9abfaa3bbb45f5217b326d41aca1b68a49ca12ea
Author: Amitay Isaacs ami...@gmail.com
Date:   Fri Oct 21 11:27:28 2011 +1100

samba-tool: Improve the description of dns subcommands.

Signed-off-by: Andrew Tridgell tri...@samba.org

commit 66121dc89677b4b6e91f8b4cac893d709ab63544
Author: Amitay Isaacs ami...@gmail.com
Date:   Tue Sep 20 17:31:24 2011 +1000

samba-tool: Enable comparison of DNS naming contexts in ldapcmp

Signed-off-by: Andrew Tridgell tri...@samba.org

---

Summary of changes:
 source4/dsdb/common/dsdb_access.c  |   11 +-
 source4/dsdb/repl/drepl_partitions.c   |   19 +-
 

autobuild: intermittent test failure detected

[autobuild]

The autobuild test system has detected an intermittent failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey/2011-11-02-0729/flakey.log

The samba3 build logs are available here:

   http://git.samba.org/autobuild.flakey/2011-11-02-0729/samba3.stderr
   http://git.samba.org/autobuild.flakey/2011-11-02-0729/samba3.stdout

The source4 build logs are available here:

   http://git.samba.org/autobuild.flakey/2011-11-02-0729/samba4.stderr
   http://git.samba.org/autobuild.flakey/2011-11-02-0729/samba4.stdout
  
The top commit at the time of the failure was:

commit cde73e2ecec75f0b068555203962b43a4438d349
Author: Jeremy Allison j...@samba.org
Date:   Mon Oct 31 12:38:36 2011 -0700

Remove opendir() VFS code from ACL modules.

Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Wed Nov  2 02:13:51 CET 2011 on sn-devel-104

[SCM] Samba Shared Repository - branch master updated

[Rusty Russell]

The branch, master has been updated
   via  6b11c91 tdb2: don't be fascist when TDB_VERSION1 is specified.
  from  a6ed907 dsdb: Handle the case when extended rights string is NULL

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 6b11c9119fa3e2ea401f86873273533d673e04fa
Author: Rusty Russell ru...@rustcorp.com.au
Date:   Wed Nov 2 10:08:32 2011 +1030

tdb2: don't be fascist when TDB_VERSION1 is specified.

We currently insist that a tdb file be a version1 file if tdb_open() is
passed the TDB_VERSION1 flag; we fail if it's actually a tdb2.

But that makes generic wrappers harder, and is unlikely to be what the
user wants: if they do, they can check tdb_get_flags()  TDB_VERSION1
after opening.

Signed-off-by: Rusty Russell ru...@rustcorp.com.au
(Imported from CCAN commit 9691464a16ef22d6acadfef209666381dfe22b2f)

Autobuild-User: Rusty Russell ru...@rustcorp.com.au
Autobuild-Date: Wed Nov  2 08:38:38 CET 2011 on sn-devel-104

---

Summary of changes:
 lib/tdb2/open.c   |7 +
 lib/tdb2/test/api-tdb1-flag-removal.c |   38 +
 2 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 lib/tdb2/test/api-tdb1-flag-removal.c


Changeset truncated at 500 lines:

diff --git a/lib/tdb2/open.c b/lib/tdb2/open.c
index 18e4cd8..b76bd24 100644
--- a/lib/tdb2/open.c
+++ b/lib/tdb2/open.c
@@ -647,12 +647,9 @@ struct tdb_context *tdb_open(const char *name, int 
tdb_flags,
goto fail;
}
 
+   /* This is a version2 tdb. */
if (tdb-flags  TDB_VERSION1) {
-   ecode = tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
-  tdb_open:
-   %s does not need TDB_VERSION1,
-  name);
-   goto fail;
+   tdb-flags = ~TDB_VERSION1;
}
 
tdb2_context_init(tdb);
diff --git a/lib/tdb2/test/api-tdb1-flag-removal.c 
b/lib/tdb2/test/api-tdb1-flag-removal.c
new file mode 100644
index 000..28f24e6
--- /dev/null
+++ b/lib/tdb2/test/api-tdb1-flag-removal.c
@@ -0,0 +1,38 @@
+#include ccan/tdb2/tdb2.h
+#include ccan/tap/tap.h
+#include ccan/hash/hash.h
+#include sys/types.h
+#include sys/stat.h
+#include fcntl.h
+
+#include logging.h
+
+int main(int argc, char *argv[])
+{
+   unsigned int i;
+   struct tdb_context *tdb;
+   int flags[] = { TDB_DEFAULT, TDB_NOMMAP,
+   TDB_CONVERT, TDB_NOMMAP|TDB_CONVERT };
+
+   plan_tests(sizeof(flags) / sizeof(flags[0]) * 3 + 1);
+   for (i = 0; i  sizeof(flags) / sizeof(flags[0]); i++) {
+   tdb = tdb_open(run-12-store.tdb, flags[i],
+  O_RDWR|O_CREAT|O_TRUNC, 0600, tap_log_attr);
+   if (!ok1(tdb))
+   continue;
+
+   tdb_close(tdb);
+
+   tdb = tdb_open(run-12-store.tdb, flags[i] | TDB_VERSION1,
+  O_RDWR, 0600, tap_log_attr);
+   if (!ok1(tdb))
+   continue;
+   /* It's not a version1 */
+   ok1(!(tdb_get_flags(tdb)  TDB_VERSION1));
+
+   tdb_close(tdb);
+   }
+
+   ok1(tap_log_messages == 0);
+   return exit_status();
+}


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

[Matthieu Patou]

The branch, master has been updated
   via  251209b s4-resolver: make it work back with ipv4 only DNS records
  from  6b11c91 tdb2: don't be fascist when TDB_VERSION1 is specified.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 251209bd6f6e66ca9bcf28cd652d85d1cd729fdc
Author: Matthieu Patou m...@matws.net
Date:   Wed Nov 2 09:39:23 2011 +0100

s4-resolver: make it work back with ipv4 only DNS records

It turns out that if there is no  record the dns server (bind and MS
windows at least) do not return the A record when just asked for .

Autobuild-User: Matthieu Patou m...@samba.org
Autobuild-Date: Wed Nov  2 11:15:34 CET 2011 on sn-devel-104

---

Summary of changes:
 source4/libcli/resolve/dns_ex.c |   41 +++---
 1 files changed, 25 insertions(+), 16 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/libcli/resolve/dns_ex.c b/source4/libcli/resolve/dns_ex.c
index 60e9afd..993ef43 100644
--- a/source4/libcli/resolve/dns_ex.c
+++ b/source4/libcli/resolve/dns_ex.c
@@ -178,29 +178,38 @@ static struct dns_records_container 
get_a__records(TALLOC_CTX *mem_ctx,
   to avoid them in the parent */
reply = rk_dns_lookup(name, );
 
-   if (!reply) {
-   return ret;
-   }
+   count = count2 = 0;
+
+   if (reply) {
+
+   count = count_dns_rr(reply-head, rk_ns_t_);
+   count2 = count_dns_rr(reply-head, rk_ns_t_a);
+
+   if (!count2) {
+   /*
+   * DNS server didn't returned A when asked for  
records.
+   * Most of the server do it, let's ask for A specificaly.
+   */
+   reply2 = rk_dns_lookup(name, A);
 
-   count = count_dns_rr(reply-head, rk_ns_t_);
-   count2 = count_dns_rr(reply-head, rk_ns_t_a);
+   if (!reply2) {
+   return ret;
+   }
 
-   if (!count2) {
-   /*
-* DNS server didn't returned A when asked for  records.
-* Most of the server do it, let's ask for A specificaly.
-*/
-   reply2 = rk_dns_lookup(name, A);
+   count2 = count_dns_rr(reply2-head, rk_ns_t_a);
+   } else {
+   reply2 = NULL;
+   }
+   } else {
 
-   if (!reply2) {
+   reply = rk_dns_lookup(name, A);
+   if (!reply) {
return ret;
}
 
-   count2 = count_dns_rr(reply2-head, rk_ns_t_a);
-   } else {
reply2 = NULL;
+   count = count_dns_rr(reply-head, rk_ns_t_a);
}
-
count += count2;
 
if (count == 0) {
@@ -322,7 +331,7 @@ static struct dns_records_container 
get_srv_records(TALLOC_CTX *mem_ctx,
 
addrs = talloc_realloc(mem_ctx, addrs, char*, total);
for (j=0; j  c.count; j++) {
-   addrs[total - j] = talloc_steal(addrs, 
c.list[j]);
+   addrs[total - j - 1] = talloc_steal(addrs, 
c.list[j]);
}
}
}


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

[Matthieu Patou]

The branch, master has been updated
   via  dfd341a samba-tool: add subcommand for sites manipulation
   via  3770389 s4-selftest: add unit tests for sites's function in python
   via  66a34d8 s4-python: add function to manipulate sites in python
  from  251209b s4-resolver: make it work back with ipv4 only DNS records

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit dfd341a2fdd017a0e3248327a129a2a5c41e2636
Author: Matthieu Patou m...@matws.net
Date:   Wed Nov 2 13:32:33 2011 +0100

samba-tool: add subcommand for sites manipulation

Autobuild-User: Matthieu Patou m...@samba.org
Autobuild-Date: Wed Nov  2 15:14:32 CET 2011 on sn-devel-104

commit 37703892bd59637db129bf1342e34be83c77cebe
Author: Matthieu Patou m...@matws.net
Date:   Wed Nov 2 13:31:40 2011 +0100

s4-selftest: add unit tests for sites's function in python

commit 66a34d86de6237272c7bc99176dbcfad856345f3
Author: Matthieu Patou m...@matws.net
Date:   Wed Nov 2 13:30:59 2011 +0100

s4-python: add function to manipulate sites in python

---

Summary of changes:
 source4/dsdb/tests/python/sites.py |  125 
 source4/scripting/python/samba/netcmd/main.py  |2 +
 source4/scripting/python/samba/netcmd/sites.py |   96 ++
 source4/scripting/python/samba/sites.py|   63 
 source4/selftest/tests.py  |1 +
 5 files changed, 287 insertions(+), 0 deletions(-)
 create mode 100644 source4/dsdb/tests/python/sites.py
 create mode 100644 source4/scripting/python/samba/netcmd/sites.py
 create mode 100644 source4/scripting/python/samba/sites.py


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/tests/python/sites.py 
b/source4/dsdb/tests/python/sites.py
new file mode 100644
index 000..d3f5c57
--- /dev/null
+++ b/source4/dsdb/tests/python/sites.py
@@ -0,0 +1,125 @@
+#!/usr/bin/env python
+#
+# Unit tests for sites manipulation in samba
+# Copyright (C) Matthieu Patou m...@matws.net 2011
+#
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see http://www.gnu.org/licenses/.
+
+
+import optparse
+import sys
+sys.path.insert(0, bin/python)
+import samba
+samba.ensure_external_module(testtools, testtools)
+samba.ensure_external_module(subunit, subunit/python)
+
+import samba.getopt as options
+from samba import sites
+from samba.auth import system_session
+from samba.samdb import SamDB
+import samba.tests
+from samba.dcerpc import security
+from subunit.run import SubunitTestRunner
+import unittest
+
+parser = optparse.OptionParser(dirsync.py [options] host)
+sambaopts = options.SambaOptions(parser)
+parser.add_option_group(sambaopts)
+parser.add_option_group(options.VersionOptions(parser))
+
+# use command line creds if available
+credopts = options.CredentialsOptions(parser)
+parser.add_option_group(credopts)
+opts, args = parser.parse_args()
+
+if len(args)  1:
+parser.print_usage()
+sys.exit(1)
+
+host = args[0]
+if not :// in host:
+ldaphost = ldap://%s; % host
+ldapshost = ldaps://%s % host
+else:
+ldaphost = host
+start = host.rindex(://)
+host = host.lstrip(start+3)
+
+lp = sambaopts.get_loadparm()
+creds = credopts.get_credentials(lp)
+
+#
+# Tests start here
+#
+
+class SitesBaseTests(samba.tests.TestCase):
+
+def setUp(self):
+super(SitesBaseTests, self).setUp()
+self.ldb_admin = ldb
+self.base_dn = ldb.domain_dn()
+self.domain_sid = security.dom_sid(ldb.get_domain_sid())
+self.configuration_dn = 
self.ldb_admin.get_config_basedn().get_linearized()
+
+def get_user_dn(self, name):
+return CN=%s,CN=Users,%s % (name, self.base_dn)
+
+
+#tests on sites
+class SimpleSitesTests(SitesBaseTests):
+
+
+def test_create(self):
+test creation of 1 site
+
+self.ldb_admin.transaction_start()
+ok = sites.create_site(self.ldb_admin, 
self.ldb_admin.get_config_basedn(),
+testsamba)
+self.ldb_admin.transaction_commit()
+self.assertTrue(ok)
+ok = False
+try:
+ok = sites.create_site(self.ldb_admin, 
self.ldb_admin.get_config_basedn(),
+testsamba)
+self.assertFalse(ok)
+except:
+   

Re: [SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hi Matthieu,

On 02/11/11 15:15, Matthieu Patou wrote:

 +#tests on sites
 +class SimpleSitesTests(SitesBaseTests):
 +
 +
 + def test_create(self):
 + test creation of 1 site
 +
 + self.ldb_admin.transaction_start()
 + ok = sites.create_site(self.ldb_admin,
self.ldb_admin.get_config_basedn(),
 + testsamba)
 + self.ldb_admin.transaction_commit()
 + self.assertTrue(ok)
 + ok = False
 + try:
 + ok = sites.create_site(self.ldb_admin,
self.ldb_admin.get_config_basedn(),
 + testsamba)
 + self.assertFalse(ok)
 + except:
 + self.assertFalse(ok)
This looks dodgy. If sites.create_site raises *any* exception (even a
SyntaxError!), then this test still passes since ok is False by default.

It's almost never right to use except: - and if you do use it, please
use raise to re-raise the exception. except: catches every kind of
exception, including KeyboardInterrupt and SyntaxError.

 diff --git a/source4/scripting/python/samba/netcmd/sites.py
b/source4/scripting/python/samba/netcmd/sites.py
 new file mode 100644
 index 000..a63b524
 --- /dev/null
 +++ b/source4/scripting/python/samba/netcmd/sites.py
 @@ -0,0 +1,96 @@
 +
 +#!/usr/bin/env python
 +#
 +# sites management
 +#
 +# Copyright Matthieu Patou m...@matws.net 2011
 +#
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 3 of the License, or
 +# (at your option) any later version.
 +#
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 +# GNU General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program. If not, see http://www.gnu.org/licenses/.
 +#
 +
 +
 +
 +import os
 +from samba import sites
 +from samba import Ldb
 +from samba.auth import system_session
 +from samba.netcmd import (
 + Command,
 + CommandError,
 + SuperCommand
 + )
 +
 +
 +class cmd_sites_create(Command):
 + Create a new site
 +
 + synopsis = %prog site [options]
 +
 + takes_args = [sitename]
 +
 + def run(self, sitename, sambaopts=None, credopts=None, versionopts=None):
 + lp = sambaopts.get_loadparm()
 + creds = credopts.get_credentials(lp, fallback_machine=True)
 + name = sam.ldb
 + path = lp.get(private dir)
 + url = os.path.join(path, name)
It should be shorter to use lp.private_path(sam.ldb).


 + if not os.path.exists(url):
 + raise CommandError(secret database not found at %s  % url)
This says secrets database, but it looks like it's actually about the sam ?


 + samdb = Ldb(url=url, session_info=system_session(),
 + credentials=creds, lp=lp)
You probably want to use SamDB rather than Ldb here.

 +
 + samdb.transaction_start()
 + ok = sites.create_site(samdb, samdb.get_config_basedn(), sitename)
 + samdb.transaction_commit()
This needs a try/except/finally otherwise we'll get a nasty warning
about transactions that weren't closed.

 +class cmd_sites_delete(Command):
 + Delete a new site
 +
The same comments as mentioned above apply to cmd_sites_delete.


 diff --git a/source4/scripting/python/samba/sites.py
b/source4/scripting/python/samba/sites.py
 new file mode 100644
 index 000..d1d0e75
 --- /dev/null
 +++ b/source4/scripting/python/samba/sites.py
 @@ -0,0 +1,63 @@
 +#!/usr/bin/env python
 +#
 +# python site manipulation code
 +# Copyright Matthieu Patou m...@matws.net 2011
 +#
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 3 of the License, or
 +# (at your option) any later version.
 +#
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 +# GNU General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program. If not, see http://www.gnu.org/licenses/.
 +#
 +
 +Manipulating sites.
 +
 +import ldb
 +from ldb import FLAG_MOD_ADD
 +
 +def create_site(samdb, configDn, siteName):
It would be nice to have a docstring on this method. It seems to always
return True, but what does that actually indicate? It might be nicer to
not return anything specific but just raise exceptions in case problems
occur.

Cheers,

Jelmer
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJOsVKTAAoJEACAbyvXKaRXewoP/inmGReeG3tiz8pt9kXcrLNh
dyFQEJf/8ckiGpgqZRT8wbqUgnq83VdXdg+6k0x8aPH4aNR+kvZ3v9iBSMtM9Uwa
dl5Z7yl7mglNqU8xawB7QiPWvhElJYrkrKSR8fqgTGbAsbsRNYU7joBH+NiWo2iK
MZNcq7oVr5+H02wHyzh+jY7x0Iadfids3MxO7mh5cvIX4auUlTjklQ+kEKwHEENN

[SCM] Samba Shared Repository - branch master updated

[David Disseldorp]

The branch, master has been updated
   via  2107ba5 ldb: fix compiler warning
   via  8fb9e08 s3:smb2_server: remove unused outhdr variables
  from  dfd341a samba-tool: add subcommand for sites manipulation

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 2107ba5be87d6a9f7691cfcbe5411fa7174120b7
Author: David Disseldorp dd...@suse.de
Date:   Wed Nov 2 14:53:20 2011 +0100

ldb: fix compiler warning

Mixed declarations and code.

Autobuild-User: David Disseldorp dd...@samba.org
Autobuild-Date: Wed Nov  2 16:51:24 CET 2011 on sn-devel-104

commit 8fb9e087e3fc082cd5a8b835b8301f31204792d9
Author: David Disseldorp dd...@suse.de
Date:   Wed Nov 2 14:51:51 2011 +0100

s3:smb2_server: remove unused outhdr variables

---

Summary of changes:
 lib/ldb/common/ldb_parse.c |2 +-
 source3/smbd/smb2_server.c |2 --
 2 files changed, 1 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/ldb/common/ldb_parse.c b/lib/ldb/common/ldb_parse.c
index 407af9f..47145a2 100644
--- a/lib/ldb/common/ldb_parse.c
+++ b/lib/ldb/common/ldb_parse.c
@@ -535,12 +535,12 @@ static struct ldb_parse_tree 
*ldb_parse_filterlist(TALLOC_CTX *mem_ctx, const ch
while (isspace((unsigned char)*p)) p++;
 
while (*p) {
+   struct ldb_parse_tree **e;
if (*p == ')') {
break;
}
 
next = ldb_parse_filter(ret-u.list.elements, p);
-   struct ldb_parse_tree **e;
if (next == NULL) {
/* an invalid filter element */
talloc_free(ret);
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 5b41c3b..5977e98 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -1142,7 +1142,6 @@ static NTSTATUS smbd_smb2_request_process_cancel(struct 
smbd_smb2_request *req)
 static NTSTATUS smbd_smb2_request_check_tcon(struct smbd_smb2_request *req)
 {
const uint8_t *inhdr;
-   const uint8_t *outhdr;
int i = req-current_idx;
uint32_t in_flags;
uint32_t in_tid;
@@ -1189,7 +1188,6 @@ static NTSTATUS smbd_smb2_request_check_tcon(struct 
smbd_smb2_request *req)
 static NTSTATUS smbd_smb2_request_check_session(struct smbd_smb2_request *req)
 {
const uint8_t *inhdr;
-   const uint8_t *outhdr;
int i = req-current_idx;
uint32_t in_flags;
uint64_t in_session_id;


-- 
Samba Shared Repository

[SCM] CTDB repository - branch master updated - ctdb-1.11-97-gf24e943

[Michael Adam]

The branch, master has been updated
   via  f24e943eb7d8b86ce6b32ae37e3884ec4af0f7df (commit)
  from  6dbbc86f36a1fd07d90ca947a35ad7b1f8554636 (commit)

http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master


- Log -
commit f24e943eb7d8b86ce6b32ae37e3884ec4af0f7df
Author: Volker Lendecke v...@samba.org
Date:   Tue Nov 1 14:34:35 2011 +0100

Fix some typos

Signed-off-by: Michael Adam ob...@samba.org

---

Summary of changes:
 server/ctdb_call.c |4 ++--
 server/ctdb_traverse.c |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/server/ctdb_call.c b/server/ctdb_call.c
index 23d10b9..ddeaae6 100644
--- a/server/ctdb_call.c
+++ b/server/ctdb_call.c
@@ -112,13 +112,13 @@ static void ctdb_send_error(struct ctdb_context *ctdb,
  * on the wire (or in the local queue). So in case the record has
  * migrated off the new destinaton of the call packet, instead of
  * going back to the LMASTER to get the new DMASTER, we try to
- * reduce rountrips by fist chasing the record a couple of times
+ * reduce rountrips by first chasing the record a couple of times
  * before giving up the direct chase and finally going back to the
  * LMASTER (again). Note that this works because auf this: When
  * a record is migrated off a node, then the new DMASTER is stored
  * in the record's copy on the former DMASTER.
  *
- * The maxiumum number of attempts for direct chase to make before
+ * The maximum number of attempts for direct chase to make before
  * going back to the LMASTER is configurable by the tunable
  * MaxRedirectCount.
  */
diff --git a/server/ctdb_traverse.c b/server/ctdb_traverse.c
index 5ad374f..59ec9b2 100644
--- a/server/ctdb_traverse.c
+++ b/server/ctdb_traverse.c
@@ -130,7 +130,7 @@ struct traverse_all_state {
 /*
   setup a non-blocking traverse of a local ltdb. The callback function
   will be called on every record in the local ltdb. To stop the
-  travserse, talloc_free() the travserse_handle.
+  traverse, talloc_free() the traverse_handle.
 
   The traverse is finished when the callback is called with tdb_null for key 
and data
  */


-- 
CTDB repository

[SCM] Samba Shared Repository - branch v3-5-stable updated

[Karolin Seeger]

The branch, v3-5-stable has been updated
   via  8a9c863 WHATSNEW: Update changes since 3.5.11.
   via  3ae4f66 Fix bug #8542 - smbclient posix_open command fails to 
return correct info on open file. (cherry picked from commit 
d27f5a277ef47c5ff94e402930680b37e8f4d592) (cherry picked from commit 
a7224ca5e77aa3e7d3a460515b07aa5b6cb099ae)
   via  8ece6f4 Third part of fix for bug #8541 - readlink() on Linux 
clients fails if the symlink target is outside of the share.
   via  e095988 Second part of fix for bug #8541 - readlink() on Linux 
clients fails if the symlink target is outside of the share.
   via  1041387 Fix bug #8541 - readlink() on Linux clients fails if the 
symlink target is outside of the share.
   via  df08d03 Use existing ISDOT and ISDOTDOT macros.
   via  5ba5025 s3-netapi: remove pointless use_memory_krb5_ccache.
   via  09d2c99 WHATSNEW: Add changes since 3.5.11.
   via  fcc73f8 s3:Makefile: make DSO_EXPORTS_CMD more portable (#8531)
   via  3a3d354 Add new contributing FAQ announcing acceptance of corporate 
(C).
   via  32979e8 s3-docs: Adapt version...
   via  a29d30b s3/doc: add man page for aio_fork vfs module
   via  1ee3254 Fix bug #8515 - Empty CIFS share can be blocked for other 
clients by deleting it via empty path (DELETE_PENDING until the last client)
   via  cf083f6 Bug 7551: Return error of cli_push when 'put - /some/file' 
is used
   via  d5e92b8 Bug 7551: Return error of cli_push when 'put - /some/file' 
is used. (cherry picked from commit ff5b58d3038bed5a20511bc76405d8ebdae75a87)
   via  a9fc6bd Fix bug #8507 - smbd doesn't correctly honor the force 
create mode bits from a cifsfs create.
   via  8ffc3f4 Second part of fix for bug #8443 - Default user entry is 
set to minimal permissions on incoming ACL change with no user specified.
   via  9fcee67 First part of fix for bug #8443 - Default user entry is set 
to minimal permissions on incoming ACL change with no user specified.
   via  353f107 Part 3 of bugfix for bug #7509 - smb_acl_to_posix: ACL is 
invalid for set (Invalid argument)
   via  7af614e Part 2 of bugfix for bug #7509 - smb_acl_to_posix: ACL is 
invalid for set (Invalid argument)
   via  77ecca5 Part 1 of bugfix for bug #7509 - smb_acl_to_posix: ACL is 
invalid for set (Invalid argument)
   via  29a438c Fix bug #8458 - IE9 on Windows 7 cannot download files to 
samba 3.5.11 share
   via  5679f81 Fix bug #8493 - DFS breaks zip file extracting unless 
follow symlinks = no set
   via  7cba110 s3-docs: Remove experimental label on VFS ACL modules
   via  d14dc20 Patch for bug #8156 - net ads join fails to use the user's 
kerberos ticket.
   via  c32c791 Allows changing the maximum number of simultaneous clients 
in winbindd through an smb.conf option.
   via  6d85cc6 s3-winbind: Fix bug 7888 -- deal with buggy 3.0 based PDCs.
   via  8dbbb54 s3-nmbd: fix memleak in create_listen_fdset().
   via  8ea73ce libcli/auth: let spnego_write_mech_types() check the 
asn1_load() return
   via  d01176c Fix bug 8480 - acl_xattr can free an invalid pointer if no 
blob is loaded. (cherry picked from commit 
62b9ad45e27bb6a2af22aa9ee133ed6075abc62b)
   via  504b817 s3-netapi: allow to use default krb5 credential cache for 
libnetapi users.
   via  a911587 s3-libnet: allow to use default krb5 ccache in 
libnet_Join/libnet_Unjoin.
   via  3ff0dc4 s3: Fix bug 7844: Race in winbind
   via  a1ea933 s3:libsmb: check the wct of the incoming SMBnegprot 
responses
   via  3479f1f v3-5-test: Fix getent group if trusted domains are not 
reachable
   via  b5c3fa1 Fix bug Bug 8422 - Infinite loop in ACL module code.
   via  d43d24d s3-vfs: Fix vfs_chown_fsp.
   via  1cf18bd s3: Fix bug 8360
   via  c484e1a s3: Add a fallback for missing openx support in OS/X Lion
   via  5e876f6 s3: Make map_open_params_to_ntcreate() available in lib/ 
(cherry picked from commit aa0c6eb76a6e16652a2ef46560eaffb881792cf6)
   via  cefea3b s3: Make is_executable() available in lib/ (cherry picked 
from commit 612361bdcaf4256eb54913423e127d0628b35356)
   via  f9af343 s3: We only need base_name in map_open_params_to_ntcreate 
(cherry picked from commit 1fa4b369d2fabbf34cda576d91d8aa9baa4e8b68)
   via  a7cac5f s3/swat: use strlcat instead of strncat to fix build on old 
Linux distros
   via  f226e03 s3:web/swat: use strtoll() instead of atoi/atol/atoll
   via  a994e19 WHATSNEW: Fix typo.
  from  3683bdf WHATSNEW: Remove wrong entry.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-stable


- Log -
commit 8a9c863ba0acb9ece202e68eca269b5f6ad4570e
Author: Karolin Seeger ksee...@samba.org
Date:   Tue Nov 1 19:51:08 2011 +0100

WHATSNEW: Update changes since 3.5.11.

Karolin
(cherry picked from commit bcf1198b1c03b3f0dd8032df93ff1b30074d37f2)

[SCM] Samba Shared Repository - annotated tag samba-3.5.12 created

[Karolin Seeger]

The annotated tag, samba-3.5.12 has been created
at  d71470798f91fdc61ac065c8feefe56e6a2a9711 (tag)
   tagging  8a9c863ba0acb9ece202e68eca269b5f6ad4570e (commit)
  replaces  samba-3.5.11
 tagged by  Karolin Seeger
on  Tue Nov 1 19:54:17 2011 +0100

- Log -
tag samba-3.5.12
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.15 (GNU/Linux)

iD8DBQBOsECJbzORW2Vot+oRAq5UAJ4o8IBCfEw34qViVp6EQfDr7papwACfXTwC
sDh72KNvmQ6qgOducP1da/A=
=ltA3
-END PGP SIGNATURE-

Björn Jacke (3):
  s3/swat: use strlcat instead of strncat to fix build on old Linux distros
  s3/doc: add man page for aio_fork vfs module
  s3:Makefile: make DSO_EXPORTS_CMD more portable (#8531)

Bram (1):
  Bug 7551: Return error of cli_push when 'put - /some/file' is used

David Disseldorp (1):
  Fix bug 8480 - acl_xattr can free an invalid pointer if no blob is loaded.

Günther Deschner (5):
  s3-libnet: allow to use default krb5 ccache in libnet_Join/libnet_Unjoin.
  s3-netapi: allow to use default krb5 credential cache for libnetapi users.
  s3-nmbd: fix memleak in create_listen_fdset().
  s3-winbind: Fix bug 7888 -- deal with buggy 3.0 based PDCs.
  s3-netapi: remove pointless use_memory_krb5_ccache.

Jeremy Allison (18):
  s3-vfs: Fix vfs_chown_fsp.
  Fix bug Bug 8422 - Infinite loop in ACL module code.
  Patch for bug #8156 - net ads join fails to use the user's kerberos 
ticket.
  Fix bug #8493 - DFS breaks zip file extracting unless follow symlinks = 
no set
  Fix bug #8458 - IE9 on Windows 7 cannot download files to samba 3.5.11 
share
  Part 1 of bugfix for bug #7509 - smb_acl_to_posix: ACL is invalid for set 
(Invalid argument)
  Part 2 of bugfix for bug #7509 - smb_acl_to_posix: ACL is invalid for set 
(Invalid argument)
  Part 3 of bugfix for bug #7509 - smb_acl_to_posix: ACL is invalid for set 
(Invalid argument)
  First part of fix for bug #8443 - Default user entry is set to minimal 
permissions on incoming ACL change with no user specified.
  Second part of fix for bug #8443 - Default user entry is set to minimal 
permissions on incoming ACL change with no user specified.
  Fix bug #8507 - smbd doesn't correctly honor the force create mode bits 
from a cifsfs create.
  Bug 7551: Return error of cli_push when 'put - /some/file' is used.
  Add new contributing FAQ announcing acceptance of corporate (C).
  Use existing ISDOT and ISDOTDOT macros.
  Fix bug #8541 - readlink() on Linux clients fails if the symlink target 
is outside of the share.
  Second part of fix for bug #8541 - readlink() on Linux clients fails if 
the symlink target is outside of the share.
  Third part of fix for bug #8541 - readlink() on Linux clients fails if 
the symlink target is outside of the share.
  Fix bug #8542 - smbclient posix_open command fails to return correct info 
on open file.

Karolin Seeger (8):
  VERSION: Bump version up to 3.5.12.
  WHATSNEW: Start release notes for 3.5.12.
  WHATSNEW: Remove wrong entry.
  WHATSNEW: Fix typo.
  s3-docs: Remove experimental label on VFS ACL modules
  s3-docs: Adapt version...
  WHATSNEW: Add changes since 3.5.11.
  WHATSNEW: Update changes since 3.5.11.

Pierre Carrier (1):
  Allows changing the maximum number of simultaneous clients in winbindd 
through an smb.conf option.

Stefan Metzmacher (3):
  s3:web/swat: use strtoll() instead of atoi/atol/atoll
  s3:libsmb: check the wct of the incoming SMBnegprot responses
  libcli/auth: let spnego_write_mech_types() check the asn1_load() return

Volker Lendecke (7):
  s3: We only need base_name in map_open_params_to_ntcreate
  s3: Make is_executable() available in lib/
  s3: Make map_open_params_to_ntcreate() available in lib/
  s3: Add a fallback for missing openx support in OS/X Lion
  s3: Fix bug 8360
  v3-5-test: Fix getent group if trusted domains are not reachable
  s3: Fix bug 7844: Race in winbind

Volodymyr Khomenko (1):
  Fix bug #8515 - Empty CIFS share can be blocked for other clients by 
deleting it via empty path (DELETE_PENDING until the last client)

---


-- 
Samba Shared Repository

[SCM] Samba Website Repository - branch master updated

[Karolin Seeger]

The branch, master has been updated
   via  ae5ce4e WHATSNEW: Update release notes.
   via  db84f05 Announce Samba 3.5.12.
  from  71b64ad Announce Samba 3.6.1.

http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master


- Log -
commit ae5ce4e375b74d1aa132e7748b90ab9e879ccd5e
Author: Karolin Seeger ksee...@samba.org
Date:   Tue Nov 1 20:59:02 2011 +0100

WHATSNEW: Update release notes.

Karolin

commit db84f051b7e774da4f4033c965e868f7c8f737e0
Author: Karolin Seeger ksee...@samba.org
Date:   Tue Oct 25 21:05:59 2011 +0200

Announce Samba 3.5.12.

Karolin

---

Summary of changes:
 generated_news/latest_10_bodies.html|   25 +++--
 generated_news/latest_10_headlines.html |4 +-
 generated_news/latest_2_bodies.html |   19 +++
 history/header_history.html |1 +
 history/samba-3.5.12.html   |   91 +++
 5 files changed, 112 insertions(+), 28 deletions(-)
 create mode 100755 history/samba-3.5.12.html


Changeset truncated at 500 lines:

diff --git a/generated_news/latest_10_bodies.html 
b/generated_news/latest_10_bodies.html
index 4f8a8a8..ff23529 100644
--- a/generated_news/latest_10_bodies.html
+++ b/generated_news/latest_10_bodies.html
@@ -1,3 +1,12 @@
+   h5a name=3.5.1226 October 2011/a/h5
+   p class=headlineSamba 3.5.12 Available for Download/p
+   pThis is the latest stable release of the Samba 3.5 series./p
+
+pThe uncompressed tarballs and patch files have been signed
+using GnuPG (ID 6568B7EA).  The source code can be
+a href=http://samba.org/samba/ftp/stable/samba-3.5.12.tar.gz;downloaded
+now/a. A a 
href=http://samba.org/samba/ftp/patches/patch-3.5.11-3.5.12.diffs.gz;patch 
against Samba 3.5.11/a is also available. See a 
href=http://samba.org/samba/history/samba-3.5.12.html;the release notes for 
more info/a./p
+
h5a name=3.6.120 October 2011/a/h5
p class=headlineSamba 3.6.1 Available for Download/p
pThis is the latest stable release of the Samba 3.6 series./p
@@ -109,19 +118,3 @@ using GnuPG (ID 6568B7EA).  The source code can be
 a href=http://samba.org/samba/ftp/stable/samba-3.4.14.tar.gz;downloaded
 now/a. See a href=http://samba.org/samba/history/samba-3.4.14.html;
 the release notes for more info/a./p
-
-
-   h5a name=3.3.1626 July 2011/a/h5
-   p class=headlineSamba 3.3.16 Available for Download/p
-
-pThis is a security release in order to address
-a href=http://www.samba.org/samba/security/CVE-2011-2522;CVE-2011-2522/a
-(Cross-Site Request Forgery in SWAT) and
-a href=http://www.samba.org/samba/security/CVE-2011-2694;CVE-2011-2694/a
-(Cross-Site Scripting vulnerability in SWAT)./p
-
-pThe uncompressed tarballs and patch files have been signed
-using GnuPG (ID 6568B7EA).  The source code can be
-a href=http://samba.org/samba/ftp/stable/samba-3.3.16.tar.gz;downloaded
-now/a. See a href=http://samba.org/samba/history/samba-3.3.16.html;
-the release notes for more info/a./p
diff --git a/generated_news/latest_10_headlines.html 
b/generated_news/latest_10_headlines.html
index 3ac5a40..0b24236 100644
--- a/generated_news/latest_10_headlines.html
+++ b/generated_news/latest_10_headlines.html
@@ -1,4 +1,6 @@
 ul
+   li 26 October 2011 a href=#3.5.12Samba 3.5.12 Available for 
Download/a/li
+
li 20 October 2011 a href=#3.6.1Samba 3.6.1 Available for 
Download/a/li
 
li 26 September 2011 a 
href=/samba/news/developers/2011-snia-sdc-report.html2011 SNIA SDC 
Report/a/li
@@ -16,6 +18,4 @@
li 26 July 2011 a href=#3.5.10Samba 3.5.10 Available for 
Download/a/li
 
li 26 July 2011 a href=#3.4.14Samba 3.4.14 Available for 
Download/a/li
-
-   li 26 July 2011 a href=#3.3.16Samba 3.3.16 Available for 
Download/a/li
 /ul
diff --git a/generated_news/latest_2_bodies.html 
b/generated_news/latest_2_bodies.html
index cc16316..005b7bd 100644
--- a/generated_news/latest_2_bodies.html
+++ b/generated_news/latest_2_bodies.html
@@ -1,3 +1,12 @@
+   h5a name=3.5.1226 October 2011/a/h5
+   p class=headlineSamba 3.5.12 Available for Download/p
+   pThis is the latest stable release of the Samba 3.5 series./p
+
+pThe uncompressed tarballs and patch files have been signed
+using GnuPG (ID 6568B7EA).  The source code can be
+a href=http://samba.org/samba/ftp/stable/samba-3.5.12.tar.gz;downloaded
+now/a. A a 
href=http://samba.org/samba/ftp/patches/patch-3.5.11-3.5.12.diffs.gz;patch 
against Samba 3.5.11/a is also available. See a 
href=http://samba.org/samba/history/samba-3.5.12.html;the release notes for 
more info/a./p
+
h5a name=3.6.120 October 2011/a/h5
p class=headlineSamba 3.6.1 Available for Download/p
pThis is the latest stable release of the Samba 3.6 series./p
@@ -7,13 +16,3 @@ using GnuPG (ID 6568B7EA).  The source code can be
 a 

[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
   via  23d3880 samba.netcmd: Pass in outf/errf.
   via  21be155 pyldb: Remove duplicate definition of SYNTAX_DN.
   via  3ce126f s4-python: samba.provision: Require schema to be passed in 
- code path which handles schema not being specified is broken anyway.
   via  aa882d3 samba.common: Fix formatting of docstring (trips up 
pydoctor).
  from  1c72d3b s3-waf: convert libcli_netlogon3 into a private library.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 23d3880725da4cb92062b5945b7c93202f4ea504
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Nov 2 16:39:47 2011 +0100

samba.netcmd: Pass in outf/errf.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Wed Nov  2 20:09:40 CET 2011 on sn-devel-104

commit 21be155af839f72375051cf74de76f4487bdc3ea
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Nov 2 16:33:56 2011 +0100

pyldb: Remove duplicate definition of SYNTAX_DN.

commit 3ce126f352288fc4ebbd0ac12b54c77f7b79c063
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Nov 2 16:23:06 2011 +0100

s4-python: samba.provision: Require schema to be passed in - code path 
which handles schema not being specified is broken anyway.

commit aa882d33232745607b305aff0bf2000fc5d449ee
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Nov 2 16:22:16 2011 +0100

samba.common: Fix formatting of docstring (trips up pydoctor).

---

Summary of changes:
 lib/ldb/pyldb.c|1 -
 source4/scripting/python/samba/common.py   |7 ---
 source4/scripting/python/samba/netcmd/__init__.py  |7 ---
 .../scripting/python/samba/provision/__init__.py   |6 +-
 source4/scripting/python/samba/tests/netcmd.py |4 +---
 5 files changed, 10 insertions(+), 15 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/ldb/pyldb.c b/lib/ldb/pyldb.c
index 673cee2..b46bdcd 100644
--- a/lib/ldb/pyldb.c
+++ b/lib/ldb/pyldb.c
@@ -3372,7 +3372,6 @@ void initldb(void)
 #define ADD_LDB_STRING(val)  PyModule_AddObject(m, #val, 
PyString_FromString(LDB_## val))
 
ADD_LDB_STRING(SYNTAX_DN);
-   ADD_LDB_STRING(SYNTAX_DN);
ADD_LDB_STRING(SYNTAX_DIRECTORY_STRING);
ADD_LDB_STRING(SYNTAX_INTEGER);
ADD_LDB_STRING(SYNTAX_BOOLEAN);
diff --git a/source4/scripting/python/samba/common.py 
b/source4/scripting/python/samba/common.py
index 9738966..b67036c 100644
--- a/source4/scripting/python/samba/common.py
+++ b/source4/scripting/python/samba/common.py
@@ -20,10 +20,11 @@
 
 import ldb, dsdb
 
-def confirm(msg, forced = False, allow_all=False):
+def confirm(msg, forced=False, allow_all=False):
 confirm an action with the user
-:param msg: A string to print to the user
-:param forced: Are the answer forced
+
+:param msg: A string to print to the user
+:param forced: Are the answer forced
 
 if forced:
 print(%s [YES] % msg)
diff --git a/source4/scripting/python/samba/netcmd/__init__.py 
b/source4/scripting/python/samba/netcmd/__init__.py
index bf08457..58353a0 100644
--- a/source4/scripting/python/samba/netcmd/__init__.py
+++ b/source4/scripting/python/samba/netcmd/__init__.py
@@ -30,7 +30,6 @@ class Option(optparse.Option):
 pass
 
 
-
 class Command(object):
 A samba-tool command.
 
@@ -63,8 +62,10 @@ class Command(object):
 credopts: options.CredentialsOptions,
 versionopts: options.VersionOptions,
 }
-outf = sys.stdout
-errf = sys.stderr
+
+def __init__(self, outf=sys.stdout, errf=sys.stderr):
+self.outf = outf
+self.errf = errf
 
 def usage(self, prog, *args):
 parser, _ = self._create_parser(prog)
diff --git a/source4/scripting/python/samba/provision/__init__.py 
b/source4/scripting/python/samba/provision/__init__.py
index 5e7e374..a44bb8e 100644
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -1200,8 +1200,7 @@ def create_default_gpo(sysvolpath, dnsdomain, policyguid, 
policyguid_dc):
 
 
 def setup_samdb(path, session_info, provision_backend, lp, names,
-logger, fill, serverrole,
-am_rodc=False, schema=None):
+logger, fill, serverrole, schema, am_rodc=False):
 Setup a complete SAM Database.
 
 :note: This will wipe the main SAM database file!
@@ -1212,9 +1211,6 @@ def setup_samdb(path, session_info, provision_backend, 
lp, names,
 provision_backend=provision_backend, session_info=session_info,
 names=names, serverrole=serverrole, schema=schema)
 
-if schema is None:
-schema = Schema(domainsid, schemadn=names.schemadn)
-
 # Load the database, but don's load the global schema and don't connect
 # quite yet
 samdb = 

[SCM] Samba Website Repository - branch master updated

[Karolin Seeger]

The branch, master has been updated
   via  f8a79de Announce MS patches.
  from  ae5ce4e WHATSNEW: Update release notes.

http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master


- Log -
commit f8a79de987432f465dc2196fbf6d25f12ca50844
Author: Karolin Seeger ksee...@samba.org
Date:   Wed Nov 2 20:30:44 2011 +0100

Announce MS patches.

Karolin

---

Summary of changes:
 generated_news/latest_10_bodies.html |   23 -
 generated_news/latest_2_bodies.html  |   17 --
 news/developers/ms-patch.html|   58 ++
 3 files changed, 72 insertions(+), 26 deletions(-)
 create mode 100644 news/developers/ms-patch.html


Changeset truncated at 500 lines:

diff --git a/generated_news/latest_10_bodies.html 
b/generated_news/latest_10_bodies.html
index ff23529..67672c0 100644
--- a/generated_news/latest_10_bodies.html
+++ b/generated_news/latest_10_bodies.html
@@ -1,3 +1,10 @@
+   h5a name=ms-patch02 November 2011/a/h5
+   p class=headlineSamba Notes Passing a Milestone/p
+   pMicrosoft developers commited Samba patches!/p
+
+   pThe whole story can be found
+   a href=/samba/news/developers/ms-commit.htmlhere/a./p
+
h5a name=3.5.1226 October 2011/a/h5
p class=headlineSamba 3.5.12 Available for Download/p
pThis is the latest stable release of the Samba 3.5 series./p
@@ -102,19 +109,3 @@ using GnuPG (ID 6568B7EA).  The source code can be
 a href=http://samba.org/samba/ftp/stable/samba-3.5.10.tar.gz;downloaded
 now/a. See a href=http://samba.org/samba/history/samba-3.5.10.html;
 the release notes for more info/a./p
-
-
-   h5a name=3.4.1426 July 2011/a/h5
-   p class=headlineSamba 3.4.14 Available for Download/p
-
-pThis is a security release in order to address
-a href=http://www.samba.org/samba/security/CVE-2011-2522;CVE-2011-2522/a
-(Cross-Site Request Forgery in SWAT) and
-a href=http://www.samba.org/samba/security/CVE-2011-2694;CVE-2011-2694/a
-(Cross-Site Scripting vulnerability in SWAT)./p
-
-pThe uncompressed tarballs and patch files have been signed
-using GnuPG (ID 6568B7EA).  The source code can be
-a href=http://samba.org/samba/ftp/stable/samba-3.4.14.tar.gz;downloaded
-now/a. See a href=http://samba.org/samba/history/samba-3.4.14.html;
-the release notes for more info/a./p
diff --git a/generated_news/latest_2_bodies.html 
b/generated_news/latest_2_bodies.html
index 005b7bd..62afdfe 100644
--- a/generated_news/latest_2_bodies.html
+++ b/generated_news/latest_2_bodies.html
@@ -1,3 +1,10 @@
+   h5a name=ms-patch02 November 2011/a/h5
+   p class=headlineSamba Notes Passing a Milestone/p
+   pMicrosoft developers commited Samba patches!/p
+
+   pThe whole story can be found
+   a href=/samba/news/developers/ms-commit.htmlhere/a./p
+
h5a name=3.5.1226 October 2011/a/h5
p class=headlineSamba 3.5.12 Available for Download/p
pThis is the latest stable release of the Samba 3.5 series./p
@@ -6,13 +13,3 @@
 using GnuPG (ID 6568B7EA).  The source code can be
 a href=http://samba.org/samba/ftp/stable/samba-3.5.12.tar.gz;downloaded
 now/a. A a 
href=http://samba.org/samba/ftp/patches/patch-3.5.11-3.5.12.diffs.gz;patch 
against Samba 3.5.11/a is also available. See a 
href=http://samba.org/samba/history/samba-3.5.12.html;the release notes for 
more info/a./p
-
-   h5a name=3.6.120 October 2011/a/h5
-   p class=headlineSamba 3.6.1 Available for Download/p
-   pThis is the latest stable release of the Samba 3.6 series./p
-
-pThe uncompressed tarballs and patch files have been signed
-using GnuPG (ID 6568B7EA).  The source code can be
-a href=http://samba.org/samba/ftp/stable/samba-3.6.1.tar.gz;downloaded
-now/a. A a 
href=http://samba.org/samba/ftp/patches/patch-3.6.0-3.6.1.diffs.gz;patch 
against Samba 3.6.0/a is also available. See a 
href=http://samba.org/samba/history/samba-3.6.1.html;the release notes for 
more info/a./p
-
diff --git a/news/developers/ms-patch.html b/news/developers/ms-patch.html
new file mode 100644
index 000..9396580
--- /dev/null
+++ b/news/developers/ms-patch.html
@@ -0,0 +1,58 @@
+!--#include virtual=/samba/header.html --
+  titleSamba - opening windows to a wider world/title
+!--#include virtual=/samba/global_menu.html --
+
+
+h2Samba Notes Passing a Milestone/h2
+
+p
+Perhaps this has happened to you...  You're cruising down the highway
+on a long roadtrip when a sleepy voice from the back seat pipes up to
+say We just passed a sign that says there was a historic battle
+here. You keep on driving, but maybe you think about how that battle
+may have changed history, and how the two sides have managed to
+resolve their differences and have moved forward since then.
+/p
+
+p
+If you follow the Samba Technical Mailing List (and who doesn't, I
+mean really), you may have noted a patch 

[SCM] Samba Website Repository - branch master updated

[Karolin Seeger]

The branch, master has been updated
   via  9c46f06 Fix link.
  from  f8a79de Announce MS patches.

http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master


- Log -
commit 9c46f06d6baa761d86956fc33a95772030e871cb
Author: Karolin Seeger ksee...@samba.org
Date:   Wed Nov 2 20:41:37 2011 +0100

Fix link.

Karolin

---

Summary of changes:
 generated_news/latest_10_bodies.html |2 +-
 generated_news/latest_2_bodies.html  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/generated_news/latest_10_bodies.html 
b/generated_news/latest_10_bodies.html
index 67672c0..c6994b9 100644
--- a/generated_news/latest_10_bodies.html
+++ b/generated_news/latest_10_bodies.html
@@ -3,7 +3,7 @@
pMicrosoft developers commited Samba patches!/p
 
pThe whole story can be found
-   a href=/samba/news/developers/ms-commit.htmlhere/a./p
+   a href=/samba/news/developers/ms-patch.htmlhere/a./p
 
h5a name=3.5.1226 October 2011/a/h5
p class=headlineSamba 3.5.12 Available for Download/p
diff --git a/generated_news/latest_2_bodies.html 
b/generated_news/latest_2_bodies.html
index 62afdfe..a24b48f 100644
--- a/generated_news/latest_2_bodies.html
+++ b/generated_news/latest_2_bodies.html
@@ -3,7 +3,7 @@
pMicrosoft developers commited Samba patches!/p
 
pThe whole story can be found
-   a href=/samba/news/developers/ms-commit.htmlhere/a./p
+   a href=/samba/news/developers/ms-patch.htmlhere/a./p
 
h5a name=3.5.1226 October 2011/a/h5
p class=headlineSamba 3.5.12 Available for Download/p


-- 
Samba Website Repository

[SCM] Samba Website Repository - branch master updated

[Karolin Seeger]

The branch, master has been updated
   via  f288e00 Add headline.
  from  9c46f06 Fix link.

http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master


- Log -
commit f288e0074175ad3a4976efd8cacbb868be640777
Author: Karolin Seeger ksee...@samba.org
Date:   Wed Nov 2 20:46:15 2011 +0100

Add headline.

Karolin

---

Summary of changes:
 generated_news/latest_10_headlines.html |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/generated_news/latest_10_headlines.html 
b/generated_news/latest_10_headlines.html
index 0b24236..34c100a 100644
--- a/generated_news/latest_10_headlines.html
+++ b/generated_news/latest_10_headlines.html
@@ -1,4 +1,6 @@
 ul
+   li 02 November 2011 a 
href=/samba/news/developers/ms-patch.htmlSamba Notes Passing a 
Milestone/a/li
+
li 26 October 2011 a href=#3.5.12Samba 3.5.12 Available for 
Download/a/li
 
li 20 October 2011 a href=#3.6.1Samba 3.6.1 Available for 
Download/a/li
@@ -16,6 +18,4 @@
li 26 July 2011 a href=#3.6.0rc3Samba 3.6.0rc3 Available for 
Download/a/li
 
li 26 July 2011 a href=#3.5.10Samba 3.5.10 Available for 
Download/a/li
-
-   li 26 July 2011 a href=#3.4.14Samba 3.4.14 Available for 
Download/a/li
 /ul


-- 
Samba Website Repository

[SCM] Samba Shared Repository - branch master updated

[Matthieu Patou]

The branch, master has been updated
   via  2db221c s4-sites: Document, fix under optimal coding, use exceptions
  from  23d3880 samba.netcmd: Pass in outf/errf.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 2db221c3845e2b1c44f8237c550704dca41df91a
Author: Matthieu Patou m...@matws.net
Date:   Wed Nov 2 20:24:20 2011 +0100

s4-sites: Document, fix under optimal coding, use exceptions

Autobuild-User: Matthieu Patou m...@samba.org
Autobuild-Date: Wed Nov  2 22:35:00 CET 2011 on sn-devel-104

---

Summary of changes:
 source4/dsdb/tests/python/sites.py |   36 ++--
 source4/scripting/python/samba/netcmd/sites.py |   40 +++---
 source4/scripting/python/samba/sites.py|   68 +++-
 3 files changed, 104 insertions(+), 40 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/tests/python/sites.py 
b/source4/dsdb/tests/python/sites.py
index d3f5c57..8b984b2 100644
--- a/source4/dsdb/tests/python/sites.py
+++ b/source4/dsdb/tests/python/sites.py
@@ -80,7 +80,6 @@ class SitesBaseTests(samba.tests.TestCase):
 #tests on sites
 class SimpleSitesTests(SitesBaseTests):
 
-
 def test_create(self):
 test creation of 1 site
 
@@ -88,30 +87,31 @@ class SimpleSitesTests(SitesBaseTests):
 ok = sites.create_site(self.ldb_admin, 
self.ldb_admin.get_config_basedn(),
 testsamba)
 self.ldb_admin.transaction_commit()
-self.assertTrue(ok)
-ok = False
-try:
-ok = sites.create_site(self.ldb_admin, 
self.ldb_admin.get_config_basedn(),
-testsamba)
-self.assertFalse(ok)
-except:
-   self.assertFalse(ok)
+
+self.assertRaises(sites.SiteAlreadyExistsException,
+sites.create_site, self.ldb_admin, 
self.ldb_admin.get_config_basedn(),
+testsamba)
 
 def test_delete(self):
-test creation of 1 site
+test removal of 1 site
 
 self.ldb_admin.transaction_start()
 ok = sites.delete_site(self.ldb_admin, 
self.ldb_admin.get_config_basedn(),
 testsamba)
+
 self.ldb_admin.transaction_commit()
-self.assertTrue(ok)
-ok = False
-try:
-ok = sites.delete_site(self.ldb_admin, 
self.ldb_admin.get_config_basedn(),
-testsamba)
-self.assertFalse(ok)
-except:
-   self.assertFalse(ok)
+
+self.assertRaises(sites.SiteNotFoundException,
+sites.delete_site, self.ldb_admin, 
self.ldb_admin.get_config_basedn(),
+testsamba)
+
+
+def test_delete_not_empty(self):
+test removal of 1 site with servers
+
+self.assertRaises(sites.SiteServerNotEmptyException,
+sites.delete_site, self.ldb_admin, 
self.ldb_admin.get_config_basedn(),
+Default-First-Site-Name)
 
 
 ldb = SamDB(ldapshost, credentials=creds, session_info=system_session(lp), 
lp=lp)
diff --git a/source4/scripting/python/samba/netcmd/sites.py 
b/source4/scripting/python/samba/netcmd/sites.py
index a63b524..f5223db 100644
--- a/source4/scripting/python/samba/netcmd/sites.py
+++ b/source4/scripting/python/samba/netcmd/sites.py
@@ -23,7 +23,7 @@
 
 import os
 from samba import sites
-from samba import Ldb
+from samba.samdb import SamDB
 from samba.auth import system_session
 from samba.netcmd import (
 Command,
@@ -42,20 +42,20 @@ class cmd_sites_create(Command):
 def run(self, sitename, sambaopts=None, credopts=None, versionopts=None):
 lp = sambaopts.get_loadparm()
 creds = credopts.get_credentials(lp, fallback_machine=True)
-name = sam.ldb
-path = lp.get(private dir)
-url = os.path.join(path, name)
+url =  lp.private_path(sam.ldb)
+
 if not os.path.exists(url):
 raise CommandError(secret database not found at %s  % url)
-samdb = Ldb(url=url, session_info=system_session(),
-credentials=creds, lp=lp)
+samdb = SamDB(url=url, session_info=system_session(),
+  credentials=creds, lp=lp)
 
 samdb.transaction_start()
-ok = sites.create_site(samdb, samdb.get_config_basedn(), sitename)
-samdb.transaction_commit()
-
-if not ok:
-raise CommandError(Error while creating site %s % sitename)
+try:
+ok = sites.create_site(samdb, samdb.get_config_basedn(), sitename)
+samdb.transaction_commit()
+except sites.SiteAlreadyExistsException, e:
+samdb.transaction_cancel()
+raise CommandError(Error while creating site %s, error: %s % 
(sitename,