from:"Jelmer Vernooij"

[SCM] Samba Shared Repository - branch master updated

2016-01-12 Thread Jelmer Vernooij

The branch, master has been updated
   via  da8674c Rename 'errors' to 'samba-errors' and make it public.
   via  218f96f libcli: Make headers for private libraries private.
   via  ffbd9c4 Add a new header file for functions in lib/util/util.c.
   via  512d15d Make libcli-smb-raw private, for now.
   via  773cfba Avoid including libds/common/roles.h in public loadparm.h 
header.
   via  ce32f26 ldb: Only set public headers field when installing as a 
public library.
   via  1860e98 time_basic.h: Remove unnecessary dependency on replace.h
   via  620d5cb Remove public library dcerpc-atsvc.
   via  232726a Make libregistry private, for now.
   via  2f7dde3 Make libtorture private, for now.
   via  c46a8cf Make gensec private, for now.
   via  5d67d55 talloc: Only set public headers field when installing as a 
public library.
   via  3eb9065 Error when private libraries have public headers.
   via  68a3576 tdb: Only set public headers field when installing as a 
public library.
   via  48ebeaa Add private_headers flag to SAMBA_*() functions.
   via  2cba491 tevent: Only set public headers field when installing as a 
public library.
   via  fddca39 samdb: Add explicit dependency on ldb.
   via  3123e2c Simplify handling of dependencies on external libraries in 
test_headers.
   via  4ab7a00 Use full path to dlinklist.h in includes.
  from  6f3656c Revert "winbind: Retry after SESSION_EXPIRED error in 
ping-dc"

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


- Log -
commit da8674c72ab1f2dc8458434d714c61530630f51e
Author: Jelmer Vernooĳ <jel...@jelmer.uk>
Date:   Mon Jan 4 01:01:53 2016 +

Rename 'errors' to 'samba-errors' and make it public.

This is necessary because it has public headers.

Signed-off-by: Jelmer Vernooĳ <jel...@jelmer.uk>
Reviewed-By: Andrew Bartlett <abart...@samba.org>
Reviewed-By: Stefan Metzmacher <me...@samba.org>

    Autobuild-User(master): Jelmer Vernooij <jel...@samba.org>
Autobuild-Date(master): Wed Jan 13 07:47:04 CET 2016 on sn-devel-144

commit 218f96f2bf10f7f03ec964c4515f6e248fc31ad8
Author: Jelmer Vernooĳ <jel...@jelmer.uk>
Date:   Mon Jan 4 00:56:10 2016 +

libcli: Make headers for private libraries private.

Signed-off-by: Jelmer Vernooĳ <jel...@jelmer.uk>
Reviewed-By: Andrew Bartlett <abart...@samba.org>
Reviewed-By: Stefan Metzmacher <me...@samba.org>

commit ffbd9c4584d83c56e58901bc91effa75ebdcbb02
Author: Jelmer Vernooij <jel...@jelmer.uk>
Date:   Mon Dec 28 22:21:11 2015 +

Add a new header file for functions in lib/util/util.c.

This allows public headers to not include samba_util.h, but rather
    specific header files under lib/util.

Signed-Off-By: Jelmer Vernooij <jel...@samba.org>
Reviewed-By: Andrew Bartlett <abart...@samba.org>
Reviewed-By: Stefan Metzmacher <me...@samba.org>

commit 512d15de56ed3f5a0abf9a7b98934ed42f211306
Author: Jelmer Vernooij <jel...@jelmer.uk>
Date:   Mon Dec 28 22:19:21 2015 +

Make libcli-smb-raw private, for now.

Signed-Off-By: Jelmer Vernooij <jel...@samba.org>
Reviewed-By: Andrew Bartlett <abart...@samba.org>
Reviewed-By: Stefan Metzmacher <me...@samba.org>

commit 773cfba9af34e64b96e843b1b60afa5a0b0dec32
Author: Jelmer Vernooij <jel...@jelmer.uk>
Date:   Mon Dec 28 19:01:54 2015 +

Avoid including libds/common/roles.h in public loadparm.h header.

Signed-Off-By: Jelmer Vernooij <jel...@samba.org>
Reviewed-By: Andrew Bartlett <abart...@samba.org>
Reviewed-By: Stefan Metzmacher <me...@samba.org>

commit ce32f26647391df0e088b8850f5afc1120190a72
Author: Jelmer Vernooij <jel...@jelmer.uk>
Date:   Mon Dec 28 18:57:26 2015 +

ldb: Only set public headers field when installing as a public library.

Signed-Off-By: Jelmer Vernooij <jel...@samba.org>
Reviewed-By: Andrew Bartlett <abart...@samba.org>
Reviewed-By: Stefan Metzmacher <me...@samba.org>

commit 1860e98d31fc85f02e57cb9d035d664321f90db3
Author: Jelmer Vernooĳ <jel...@jelmer.uk>
Date:   Mon Jan 4 01:07:27 2016 +

time_basic.h: Remove unnecessary dependency on replace.h

Forward declare struct timeval

Signed-off-by: Jelmer Vernooĳ <jel...@jelmer.uk>
Reviewed-By: Andrew Bartlett <abart...@samba.org>
Reviewed-By: Stefan Metzmacher <me...@samba.org>

commit 620d5cbe1705fa5787b865ea469ac0688ab0cfeb
Author: Jelmer Vernooij <jel...@jelmer.uk>
Date:   Thu Jan 28 15:21:21 2016 +

Remove public library dcerpc-atsvc.

Signed-Off-By: Jelmer Vernooij <jel...@samba.org>
Reviewed-By: Andrew Bartlett <abart...@samba.org>
Reviewe

[SCM] Samba Shared Repository - branch master updated

2015-04-23 Thread Jelmer Vernooij

The branch, master has been updated
   via  78cdd5e buildtools: Use all of pyext_PATTERN in map_shlib_extension
   via  cc491fb buildtools: Honor LDVERSION when looking for Python library
   via  8ac21ec pytalloc: Add tests
   via  50311c7 wafsamba: Add install argument to SAMBA_PYTHON
   via  8ac9c86 pytalloc: Fix comparison of disparate types
  from  51ae17b docs: overhaul the description of smb encrypt to include 
SMB3 encryption.

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


- Log -
commit 78cdd5ea7ddf265d8143c8d9dc42934889618dd1
Author: Petr Viktorin pvikt...@redhat.com
Date:   Wed Nov 12 19:49:45 2014 +0100

buildtools: Use all of pyext_PATTERN in map_shlib_extension

In Python 3, C extension module filenames have an ABI tag;
the pyext_PATTERN is e.g. %s.cpython-34m.so.
The build system was only using the last dot-separated element
of that extension (the .so).

Use the whole extension when constructing the final filename.

Signed-off-by: Petr Viktorin pvikt...@redhat.com
Reviewed-By: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andreas Schneider a...@samba.org

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Fri Apr 24 04:26:45 CEST 2015 on sn-devel-104

commit cc491fb080882e36f549fd0a348800431ccb3074
Author: Petr Viktorin pvikt...@redhat.com
Date:   Wed Nov 12 16:53:33 2014 +0100

buildtools: Honor LDVERSION when looking for Python library

Since Python 3.2, Python .so files are tagged for ABI compatibility,
so the library name is something like libpython3.4m.so (note the 'm').
This information is found in distutils.sysconfig.get_config_var('LDVERSION')

This fixes waf issue 1405 
(https://code.google.com/p/waf/issues/detail?id=1405)

Signed-off-by: Petr Viktorin pvikt...@redhat.com
Reviewed-By: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andreas Schneider a...@samba.org

commit 8ac21ec4aa76beb48c9c26cf1fd45495324d74cc
Author: Petr Viktorin pvikt...@redhat.com
Date:   Thu Mar 5 10:06:05 2015 +0100

pytalloc: Add tests

Add tests for pytalloc.

Since talloc objects can't be created from Python, a C extension
with helpers is added.

Signed-off-by: Petr Viktorin pvikt...@redhat.com
Reviewed-by: Andreas Schneider a...@samba.org
Reviewed-by: Jelmer Vernooij jel...@samba.org

commit 50311c760685335160742efa01bc64584265ffd5
Author: Petr Viktorin pvikt...@redhat.com
Date:   Fri Mar 6 11:55:49 2015 +0100

wafsamba: Add install argument to SAMBA_PYTHON

This allows building Python modules that are only used for testing.

Signed-off-by: Petr Viktorin pvikt...@redhat.com
Reviewed-By: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andreas Schneider a...@samba.org

commit 8ac9c860de3b902855a00d7589b8a614eec3de45
Author: Petr Viktorin pvikt...@redhat.com
Date:   Fri Mar 6 18:57:00 2015 +0100

pytalloc: Fix comparison of disparate types

When fed Python objects of different types, pytalloc_default_cmp
compared pointers to PyType objects that weren't part of an array,
resulting in undefined behavior.

This makes things a bit better (though it still casts ptrdiff_t to int).

Signed-off-by: Petr Viktorin pvikt...@redhat.com
Reviewed-By: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andreas Schneider a...@samba.org

---

Summary of changes:
 buildtools/wafsamba/samba_python.py  |   2 +
 buildtools/wafsamba/samba_utils.py   |   2 +-
 lib/talloc/pytalloc.c|   2 +-
 lib/talloc/test_pytalloc.c   | 128 +++
 lib/talloc/test_pytalloc.py  | 114 +++
 lib/talloc/wscript   |  19 -
 third_party/waf/wafadmin/Tools/python.py |  14 ++--
 7 files changed, 273 insertions(+), 8 deletions(-)
 create mode 100644 lib/talloc/test_pytalloc.c
 create mode 100644 lib/talloc/test_pytalloc.py


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_python.py 
b/buildtools/wafsamba/samba_python.py
index 1ec2f7b..a371b43 100644
--- a/buildtools/wafsamba/samba_python.py
+++ b/buildtools/wafsamba/samba_python.py
@@ -34,6 +34,7 @@ def SAMBA_PYTHON(bld, name,
  init_function_sentinel=None,
  local_include=True,
  vars=None,
+ install=True,
  enabled=True):
 '''build a python extension for Samba'''
 
@@ -64,6 +65,7 @@ def SAMBA_PYTHON(bld, name,
   install_path='${PYTHONARCHDIR}',
   allow_undefined_symbols=True,
   allow_warnings=True,
+  install=install,
   enabled=enabled)
 
 Build.BuildContext.SAMBA_PYTHON

[SCM] Samba Shared Repository - branch master updated

2014-12-01 Thread Jelmer Vernooij

The branch, master has been updated
   via  87d39a8 Minor spelling correction in samba-tool domain
  from  7dbc58f Reduce number of places where sys.path is (possibly) 
updated for external module paths.

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


- Log -
commit 87d39a82048474e43045515bf5c8192bc20ba668
Author: Daniel Cotton danielcotton.mailingli...@gmail.com
Date:   Tue Dec 2 03:45:21 2014 +1030

Minor spelling correction in samba-tool domain

Signed-Off-By: Daniel Cotton danielcotton.patches at gmail.com
Reviewed-By: Michael Adam ob...@samba.org
Reviewed-By: Jelmer Vernooij jel...@samba.org

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Tue Dec  2 01:18:53 CET 2014 on sn-devel-104

---

Summary of changes:
 python/samba/netcmd/domain.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py
index 9dfbc39..07a0460 100644
--- a/python/samba/netcmd/domain.py
+++ b/python/samba/netcmd/domain.py
@@ -873,7 +873,7 @@ class cmd_domain_demote(Command):
 except ldb.LdbError, l:
 pass
 
-self.errf.write(Demote successfull\n)
+self.errf.write(Demote successful\n)
 
 
 class cmd_domain_level(Command):


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2014-11-30 Thread Jelmer Vernooij

The branch, master has been updated
   via  02e063b Be consistent about what functions add $LISTOPT and 
$LOADLIST to the command-line.
   via  0f40859 selftest: Add separate command line for listing tests, 
allowing us of subunit-filter (which doesn't support subunit v2).
   via  c3855da selftest/tests.py: Remove testsuite samba.tests.samdb which 
does not have any tests.
   via  afe94aa Re-use add_prefix function.
   via  f6e3cd7 selftest: Drop support for TESTSUITE-IDLIST, and remove its 
last user.
  from  13a1406 ldb: version 1.1.18

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


- Log -
commit 02e063bd5be06925489f735c51225b65ff961d6b
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Nov 1 16:36:54 2014 -0700

Be consistent about what functions add $LISTOPT and $LOADLIST to the 
command-line.

Change-Id: Ife86624b53a99d48ce9f00d146b14f798c9bdb24
Signed-off-by: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Sun Nov 30 16:43:52 CET 2014 on sn-devel-104

commit 0f408599f83f5d8e68f0fb0f765143aa6620651e
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Nov 1 15:13:18 2014 -0700

selftest: Add separate command line for listing tests, allowing us of 
subunit-filter (which doesn't support subunit v2).

Change-Id: Icb877214a422c63fd38ef92425c7b4fe7ee19ad5
Signed-Off-By: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

commit c3855dae71e557b824ad2679acd8bb5ad85936e2
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Nov 1 16:06:09 2014 -0700

selftest/tests.py: Remove testsuite samba.tests.samdb which does not have 
any tests.

Change-Id: I8edcf73aa4a9b61c6e5c7cfb592a4692d4030a29
Signed-Off-By: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

commit afe94aa53549ec66cb48959260753a4fa424e481
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Nov 1 14:40:30 2014 -0700

Re-use add_prefix function.

Change-Id: I6e91bc9fc6714c147427e920ca0e3e22cb9a076b
Signed-Off-By: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

commit f6e3cd7f03a15595a2fa65c22a56c60d7d3f8bff
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Oct 26 20:17:20 2014 -0700

selftest: Drop support for TESTSUITE-IDLIST, and remove its last user.

Change-Id: Ic616676bb770fa4769195d73c4309915646caae0
Signed-Off-By: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

---

Summary of changes:
 selftest/selftest.pl | 29 +-
 selftest/selftesthelpers.py  | 44 +---
 selftest/testlist.py |  7 +--
 selftest/tests.py|  1 -
 selftest/tests/test_testlist.py  |  6 +++---
 source4/scripting/bin/subunitrun |  2 ++
 source4/selftest/tests.py|  6 +++---
 7 files changed, 47 insertions(+), 48 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 7dde5b2..ea63ee5 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -568,17 +568,21 @@ sub read_testlist($)
open(IN, $filename) or die(Unable to open $filename: $!);
 
while (IN) {
-   if (/-- TEST(-LOADLIST|-IDLIST|) --\n/) {
+   if (/-- TEST(-LOADLIST|) --\n/) {
my $supports_loadlist = (defined($1) and $1 eq 
-LOADLIST);
-   my $supports_idlist = (defined($1) and $1 eq -IDLIST);
my $name = IN;
$name =~ s/\n//g;
my $env = IN;
$env =~ s/\n//g;
+   my $loadlist;
+   if ($supports_loadlist) {
+   $loadlist = IN;
+   $loadlist =~ s/\n//g;
+   }
my $cmdline = IN;
$cmdline =~ s/\n//g;
if (should_run_test($name) == 1) {
-   push (@ret, [$name, $env, $cmdline, 
$supports_loadlist, $supports_idlist]);
+   push (@ret, [$name, $env, $cmdline, $loadlist]);
}
} else {
print;
@@ -823,7 +827,6 @@ sub setup_env($$)
}
}
 
-   
return undef unless defined($testenv_vars);
 
$running_envs{$envname} = $testenv_vars;
@@ -939,11 +942,12 @@ $envvarstr
teardown_env($testenv_name);
 } elsif ($opt_list) {
foreach (@todo) {
-   my $cmd = $$_[2];
my $name = $$_[0];
my

[SCM] Samba Shared Repository - branch master updated

2014-11-30 Thread Jelmer Vernooij

The branch, master has been updated
   via  7dbc58f Reduce number of places where sys.path is (possibly) 
updated for external module paths.
   via  4323504 Don't assume st/subunit being present means it was 
generated by the current process.
  from  02e063b Be consistent about what functions add $LISTOPT and 
$LOADLIST to the command-line.

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


- Log -
commit 7dbc58f524fbde517966d671da138b69566929d7
Author: Jelmer Vernooij jel...@samba.org
Date:   Tue Nov 4 20:37:41 2014 +

Reduce number of places where sys.path is (possibly) updated for external 
module paths.

Change-Id: I69d060f27ea090d14405e884d1ce271975358c56
Signed-Off-By: Jelmer Vernooij jel...@samba.org

Reviewed-by: Andrew Bartlett abart...@samba.org

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Sun Nov 30 20:54:04 CET 2014 on sn-devel-104

commit 4323504921ff0a566c43dada90443bdad3162f9b
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Nov 2 12:36:13 2014 -0800

Don't assume st/subunit being present means it was generated by the current 
process.

This fixes --list.

Change-Id: I75fc765757e06861cf3bb489246e0845564a1123
Signed-off-by: Jelmer Vernooij jel...@samba.org

Reviewed-by: Andrew Bartlett abart...@samba.org

---

Summary of changes:
 python/samba/tests/__init__.py|  2 ++
 python/samba/tests/subunitrun.py  |  4 +---
 selftest/filter-subunit   | 11 ++-
 selftest/format-subunit   | 10 ++
 selftest/wscript  | 14 --
 source4/dsdb/tests/python/dsdb_schema_info.py |  3 +--
 source4/torture/drs/python/drs_base.py|  6 +-
 7 files changed, 25 insertions(+), 25 deletions(-)


Changeset truncated at 500 lines:

diff --git a/python/samba/tests/__init__.py b/python/samba/tests/__init__.py
index 8d3b4dd..8e662ed 100644
--- a/python/samba/tests/__init__.py
+++ b/python/samba/tests/__init__.py
@@ -26,6 +26,8 @@ from samba.samdb import SamDB
 import subprocess
 import tempfile
 
+samba.ensure_external_module(mimeparse, mimeparse)
+samba.ensure_external_module(extras, extras)
 samba.ensure_external_module(testtools, testtools)
 
 # Other modules import these two classes from here, for convenience:
diff --git a/python/samba/tests/subunitrun.py b/python/samba/tests/subunitrun.py
index d454676..291e7ab 100755
--- a/python/samba/tests/subunitrun.py
+++ b/python/samba/tests/subunitrun.py
@@ -37,9 +37,7 @@ signal.signal(signal.SIGINT, signal.SIG_DFL)
 import optparse
 import samba
 import sys
-samba.ensure_external_module(mimeparse, mimeparse)
-samba.ensure_external_module(extras, extras)
-samba.ensure_external_module(testtools, testtools)
+import samba.tests
 samba.ensure_external_module(subunit, subunit/python)
 import subunit.run
 
diff --git a/selftest/filter-subunit b/selftest/filter-subunit
index 2ce9584..4f95546 100755
--- a/selftest/filter-subunit
+++ b/selftest/filter-subunit
@@ -19,14 +19,15 @@
 # to upstream subunit's filtering tools.
 
 import optparse
-import os
 import sys
 import signal
 
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), 
../lib/subunit/python))
-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/mimeparse))
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), ../lib/extras))
+sys.path.insert(0, bin/python)
+import samba
+samba.ensure_external_module(mimeparse, mimeparse)
+samba.ensure_external_module(extras, extras)
+samba.ensure_external_module(testtools, testtools)
+samba.ensure_external_module(subunit, subunit/python)
 
 import subunithelper
 
diff --git a/selftest/format-subunit b/selftest/format-subunit
index f59de97..58321bf 100755
--- a/selftest/format-subunit
+++ b/selftest/format-subunit
@@ -9,10 +9,12 @@ import os
 import signal
 import sys
 
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), 
../lib/subunit/python))
-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/mimeparse))
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), ../lib/extras))
+sys.path.insert(0, bin/python)
+import samba
+samba.ensure_external_module(mimeparse, mimeparse)
+samba.ensure_external_module(extras, extras)
+samba.ensure_external_module(testtools, testtools)
+samba.ensure_external_module(subunit, subunit/python)
 
 import subunithelper
 
diff --git a/selftest/wscript b/selftest/wscript
index cf57adc..d1d7425 100644
--- a/selftest/wscript
+++ b/selftest/wscript
@@ -214,6 +214,7 @@ def cmd_testonly(opt):
 env.OPTIONS +=  --socket_wrapper_so_path= + CONFIG_GET(opt

[SCM] Samba Shared Repository - branch master updated

2014-11-24 Thread Jelmer Vernooij

The branch, master has been updated
   via  b7efc12 Print number of slow tests from script rather than wscript.
   via  869a9f7 sam: Use samba.tests.subunitrun.
   via  4f75f17 Use samba.tests.subunitrun in dsdb ldap and ldap_schema 
tests.
   via  98b5380 Use samba.tests.subunitrun in urgent replication test.
  from  2c67d55 Include mimeparse, which is used by subunit/testtools.

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


- Log -
commit b7efc124065612d9c4c35e2e7447a5ee5d150d1f
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Nov 1 13:54:31 2014 -0700

Print number of slow tests from script rather than wscript.

Change-Id: I6eaa0803b95cc81f514a2176f4e06f1e3fff4077
Signed-Off-By: Jelmer Vernooij jel...@samba.org

Reviewed-by: Andrew Bartlett abart...@samba.org

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Mon Nov 24 13:06:46 CET 2014 on sn-devel-104

commit 869a9f7a3a01810c1c1e3287b82034f67457b0b5
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Nov 2 09:00:09 2014 -0800

sam: Use samba.tests.subunitrun.

Change-Id: Ic2ac4b335cf805ddbd442a065c4eaf6ef2b210d9
Signed-off-by: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

commit 4f75f17ba7c9b80cf3aa0ce2db57e1754464403a
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Nov 1 21:31:18 2014 -0700

Use samba.tests.subunitrun in dsdb ldap and ldap_schema tests.

Change-Id: I51ddc55720a23013a2c6ae20e3225f027348083c
Signed-off-by: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

commit 98b5380af65ea1ec760d00187355384de0757b04
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Nov 1 21:22:59 2014 -0700

Use samba.tests.subunitrun in urgent replication test.

Change-Id: I3e7a32876d557ac376326ab75e851298e874d584
Signed-off-by: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

---

Summary of changes:
 script/show_testsuite_time  |  2 +
 selftest/wscript|  5 +--
 source4/dsdb/tests/python/ldap.py   | 34 ---
 source4/dsdb/tests/python/ldap_schema.py| 55 ++---
 source4/dsdb/tests/python/sam.py| 12 ++
 source4/dsdb/tests/python/urgent_replication.py | 17 ++--
 6 files changed, 62 insertions(+), 63 deletions(-)


Changeset truncated at 500 lines:

diff --git a/script/show_testsuite_time b/script/show_testsuite_time
index fb9ea2f..6e5808a 100755
--- a/script/show_testsuite_time
+++ b/script/show_testsuite_time
@@ -22,6 +22,8 @@ if ($#ARGV = 1) {
}
 }
 
+print TOP $max slowest tests\n;
+
 while($fh)
 {
if (m/^testsuite: (.*)/) {
diff --git a/selftest/wscript b/selftest/wscript
index fd92531..cf57adc 100644
--- a/selftest/wscript
+++ b/selftest/wscript
@@ -135,10 +135,10 @@ def cmd_testonly(opt):
   'nmblookup4:nmblookup4,' +
   'smbclient3:smbclient,' +
   'smbclient4:smbclient4,' +
-  'smbtorture4:smbtorture,' + 
+  'smbtorture4:smbtorture,' +
   'ntlm_auth3:ntlm_auth')
 
-env.OPTIONS = '--binary-mapping=%s' % binary_mapping 
+env.OPTIONS = '--binary-mapping=%s' % binary_mapping
 if not Options.options.SLOWTEST:
 env.OPTIONS += ' --exclude=${srcdir}/selftest/slow'
 if Options.options.QUICKTEST:
@@ -241,7 +241,6 @@ def cmd_testonly(opt):
 subunit_file = %s/subunit % env.SELFTEST_PREFIX
 if os.path.exists(subunit_file):
 nb = Options.options.NB_SLOWEST
-print TOP %d slowest tests % nb
 cmd = ./script/show_testsuite_time %s %d % (subunit_file, nb)
 runcmd = EXPAND_VARIABLES(opt, cmd)
 RUN_COMMAND(runcmd, env=env)
diff --git a/source4/dsdb/tests/python/ldap.py 
b/source4/dsdb/tests/python/ldap.py
index b1f0d6a..7139f3c 100755
--- a/source4/dsdb/tests/python/ldap.py
+++ b/source4/dsdb/tests/python/ldap.py
@@ -2,6 +2,21 @@
 # -*- coding: utf-8 -*-
 # This is a port of the original in testprogs/ejs/ldap.js
 
+# Copyright (C) Jelmer Vernooij jel...@samba.org 2008-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

[SCM] Samba Shared Repository - branch master updated

2014-11-21 Thread Jelmer Vernooij

The branch, master has been updated
   via  2c67d55 Include mimeparse, which is used by subunit/testtools.
   via  d857e7b ldap: Use samba.tests.subunitrun.
   via  cfb5e9b deletetest: use samba.tests.subunitrun.
   via  6fb26c0 ldap_syntaxes: Use samba.tests.subunitrun.
   via  3961bd6 password lockout: Use samba.tests.subunitrun.
   via  eae1efc passwords: Use samba.tests.subunitrun.
   via  0c82bdd sec_descriptor: Use samba.tests.subunitrun.
   via  fc0b8aa token_group: Use samba.tests.subunitrun.
   via  3305975 sites: Use samba.tests.subunitrun.
   via  d6545fe speedtest: Use samba.tests.subunitrun.
   via  8d933a8 credentials test: Use samba.tests.subunitrun.
   via  21280da sec_descriptor test: Simplify, use samba.tests.subunitrun 
module.
   via  ee281c6 Move option handling into samba.tests.subunitrun.
   via  24035a6 Move option parsing to samba.tests.subunitrun.
   via  ed4c07b subunitrun: Use new samba.tests.subunitrun module.
   via  8d8d800 Add convenience class for old-style Samba subunit python 
tests.
   via  a92877f Add bundled copy of 'extras' python module used by newer 
versions of testtools/subunit.
   via  3949ed6 Clean up more whitespace.
  from  927290b vfs_streams_xattr: check stream type

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


- Log -
commit 2c67d55614668583dc6290c6db86d5229fb654ea
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Nov 1 07:09:00 2014 -0700

Include mimeparse, which is used by subunit/testtools.

Change-Id: I984c82acc0bc82a165e8ea17d8948c465c786905
Signed-Off-By: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Sat Nov 22 04:44:11 CET 2014 on sn-devel-104

commit d857e7b1a7a2cc1f7f4f9f2ffd5a11f8c627ae39
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Nov 2 09:44:05 2014 -0800

ldap: Use samba.tests.subunitrun.

Change-Id: I872654afb31a5eda8c88aac716f9ce79816e5f05
Signed-off-by: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

commit cfb5e9bbf2bde885c50097ab0a2914c674e65860
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Nov 2 09:39:17 2014 -0800

deletetest: use samba.tests.subunitrun.

Change-Id: I13565c7c14ea186709ce1de9038ef840c5b766b8
Signed-off-by: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

commit 6fb26c0e29d74c793f8714b057e0ed0e5ee0cc37
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Nov 2 09:32:58 2014 -0800

ldap_syntaxes: Use samba.tests.subunitrun.

Change-Id: Ib62b747876b4408fdc8ff44e9b4c63578e1a6408
Signed-Off-By: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

commit 3961bd68cad510c3ac06270036b54b065d0c3566
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Nov 2 09:30:50 2014 -0800

password lockout: Use samba.tests.subunitrun.

Change-Id: I848099d22acd4a0ce7d589de48eb72e2d180ceae
Signed-off-by: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

commit eae1efca41f4714afedff74afe330aad970f44ab
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Nov 2 09:13:06 2014 -0800

passwords: Use samba.tests.subunitrun.

Change-Id: Ib806f63ef412fec264445eefd82146e5140b0bac
Signed-off-by: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

commit 0c82bdda0fddab4aa6bdbbbe13b6f888ed1c2c67
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Nov 2 08:57:37 2014 -0800

sec_descriptor: Use samba.tests.subunitrun.

Change-Id: I5caba3e27ad21cc5381883a823e0ec5e2966a264
Signed-off-by: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

commit fc0b8aac9d5f1f77aa9a412fa5da2cc6b1a984ae
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Nov 2 08:35:06 2014 -0800

token_group: Use samba.tests.subunitrun.

Change-Id: Id7c247451532eded1f44ef9b1aa1808dd18098c6
Signed-off-by: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

commit 330597507c796db55a48b084c7542f03ee4a93ee
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Nov 2 08:37:08 2014 -0800

sites: Use samba.tests.subunitrun.

Change-Id: Ic06e1a0f7174683b6b817a5412b8635145329c00
Signed-off-by: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

commit d6545fe27b35e63781f9f87fe9262bb933ffa9be
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Nov 2 08:32:24 2014 -0800

speedtest: Use samba.tests.subunitrun.

Change-Id: Id842c3f74aec24faeab68e975ff4d9e9a0dc337b
Signed-off-by: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

commit

[SCM] Samba Shared Repository - branch master updated

2014-11-19 Thread Jelmer Vernooij

The branch, master has been updated
   via  71a9e5d filter-subunit: Consistently use spaces rather than tabs.
   via  4944554 Support using system ldbmodify.
   via  fb08cd5 Fix subunit test suite name.
   via  1800bc5 dsdb.tests.acl: Create and run a single testsuite, should 
easy migration to regulary Python unit tests.
   via  d817791 dsdb.tests.ldap: Create and run a single testsuite, should 
easy migration to regulary Python unit tests.
   via  5757c50 speedtest: Create and run a single testsuite, should easy 
migration to regulary Python unit tests.
   via  7f0969d dirsync test: Create and run a single testsuite, should 
easy migration to regulary Python unit tests.
   via  a214bf6 Add 'make randomized-test' rule.
   via  1ef2f39 Remove tabs in python file, unnecessary 'pass'.
  from  082f887 pidl: White space cleanups in Conformance.pm and NDR.pm

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


- Log -
commit 71a9e5da2be8feae2f7cbb248b7c091f435d964e
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Oct 26 11:31:38 2014 -0700

filter-subunit: Consistently use spaces rather than tabs.

Change-Id: I760399cb4bf0aa9753f5f1e842919b386e1caca9
Signed-Off-By: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Wed Nov 19 20:50:29 CET 2014 on sn-devel-104

commit 49445541e750328fc9b766593eddc61a65f97ccb
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Nov 1 10:17:23 2014 -0700

Support using system ldbmodify.

Fixes this test when bin/ldbmodify isn't built because we're using the
system ldbmodify.

Change-Id: I2ff0d9808245353006c6be4989976a3edad8f98e
Signed-Off-By: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

commit fb08cd5310c2c806e49597da4c3a310b058645ae
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Nov 1 15:57:35 2014 -0700

Fix subunit test suite name.

Only run it when testscenarios is installed, as it depends on that.

Change-Id: I1e1284024cf94f909e585a55b8a15e33273f167b
Signed-Off-By: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

commit 1800bc567d56d0c193410a83692185ebbbce7f43
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Nov 1 20:06:52 2014 -0700

dsdb.tests.acl: Create and run a single testsuite, should easy migration to 
regulary Python unit tests.

Change-Id: I89072d3af1d90e87a47c197d28943f47cedc5deb
Signed-off-by: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

commit d8177912be179dc4342118827ce439048df43ef9
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Nov 1 20:07:02 2014 -0700

dsdb.tests.ldap: Create and run a single testsuite, should easy migration 
to regulary Python unit tests.

Change-Id: I07216ff1063e127b541bf4e5d6349d5a75cec678
Signed-off-by: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

commit 5757c5071e3cf5f207bc9772beffe5c2a7eb22f3
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Nov 1 20:09:12 2014 -0700

speedtest: Create and run a single testsuite, should easy migration to 
regulary Python unit tests.

Change-Id: Ib31eb26b8f6094a51cd4985b9ae98d018ae95c2d
Signed-off-by: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

commit 7f0969d79a45c7ae4c62a319889680bf3117b71c
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Nov 1 20:27:30 2014 -0700

dirsync test: Create and run a single testsuite, should easy migration to 
regulary Python unit tests.

Change-Id: I6fbffd6453f8af966938943f2895bd6d93f8fb59
Signed-off-by: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

commit a214bf6fb1a43be98e2a3354a4785053996e4ee0
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Nov 16 15:44:33 2014 +

Add 'make randomized-test' rule.

Signed-Off-By: Jelmer Vernooij jel...@samba.org

commit 1ef2f39c95ca3ceb45a88343e1375f10c3dfdc29
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Nov 16 14:43:29 2014 +

Remove tabs in python file, unnecessary 'pass'.

Signed-Off-By: Jelmer Vernooij jel...@samba.org

---

Summary of changes:
 Makefile   |   3 +
 nsswitch/tests/test_rfc2307_mapping.sh |   7 +-
 selftest/filter-subunit|  72 ++---
 selftest/tests.py  |   7 +-
 source4/dsdb/tests/python/acl.py   |  77 --
 source4/dsdb/tests/python/dirsync.py   |  27 +++--
 source4/dsdb/tests/python/ldap.py  | 189 +
 source4/scripting/devel/speedtest.py   |  16 +--
 wscript

[SCM] Samba Shared Repository - branch master updated

2014-11-18 Thread Jelmer Vernooij

The branch, master has been updated
   via  082f887 pidl: White space cleanups in Conformance.pm and NDR.pm
   via  34c6d47 Rewrite show_test_time in python and support --limit 
argument.
   via  393b04c format-subunit: Remove remaining tabs.
   via  f0fa563 Remove unused imports.
   via  fb4b0ac Display total number of tests in format-subunit, not just 
number of test suites.
  from  1d6016d lib: Add proper {} to tcopy_passwd

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


- Log -
commit 082f88709a7f11284881ac35dc07f38bf6e2147c
Author: Guy Harris g...@alum.mit.edu
Date:   Sat Nov 1 08:50:43 2014 -0700

pidl: White space cleanups in Conformance.pm and NDR.pm

Change-Id: Ibf106d023c50a7f3caf8f416e9927ac4a040f2c0
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10842
Signed-Off-By: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Wed Nov 19 05:06:33 CET 2014 on sn-devel-104

commit 34c6d47194cf52ca7228076da5bd80c6029e356f
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Nov 1 14:33:37 2014 -0700

Rewrite show_test_time in python and support --limit argument.

Change-Id: I6c3f28ed52cc8597251aa195ec3c7e38587c2573
Signed-Off-By: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

commit 393b04cd57d351ee7c250178e7c8a910dc6416a9
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Nov 1 08:38:31 2014 -0700

format-subunit: Remove remaining tabs.

Change-Id: I70eabda60e3d4eede874eb5e95bf455eddfb0992
Signed-Off-By: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

commit f0fa5636e30063a75f2942013fc1579afa3525c2
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Nov 1 06:56:09 2014 -0700

Remove unused imports.

Change-Id: I8915f62206edb53ffc2d89434e46d9e71db8bb9a
Signed-Off-By: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

commit fb4b0ac611e971a5278de41d1f04309f7cca3b95
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Nov 1 12:51:31 2014 -0700

Display total number of tests in format-subunit, not just number of test 
suites.

Change-Id: Iae17df773f380b13d2b3f69e83593139c01c4a6d
Signed-Off-By: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

---

Summary of changes:
 auth/credentials/tests/bind.py   |   8 +-
 pidl/lib/Parse/Pidl/Wireshark/Conformance.pm |   6 +-
 pidl/lib/Parse/Pidl/Wireshark/NDR.pm | 190 +--
 script/show_test_time|  58 +---
 selftest/format-subunit  |   3 +-
 selftest/subunithelper.py|   8 +-
 6 files changed, 147 insertions(+), 126 deletions(-)


Changeset truncated at 500 lines:

diff --git a/auth/credentials/tests/bind.py b/auth/credentials/tests/bind.py
index aa4b17a..ceb3e8f 100755
--- a/auth/credentials/tests/bind.py
+++ b/auth/credentials/tests/bind.py
@@ -17,18 +17,12 @@ samba.ensure_external_module(subunit, subunit/python)
 
 import samba.getopt as options
 
-from ldb import (
-SCOPE_BASE, SCOPE_SUBTREE, LdbError, ERR_NO_SUCH_OBJECT)
-from samba.dcerpc import security
+from ldb import SCOPE_BASE, SCOPE_SUBTREE
 
-from samba.auth import system_session
 from samba import gensec
-from samba.samdb import SamDB
-from samba.credentials import Credentials
 import samba.tests, unittest
 from samba.tests import delete_force
 from subunit.run import SubunitTestRunner
-from samba.tests import TestCase, TestSkipped
 
 parser = optparse.OptionParser(ldap [options] host)
 sambaopts = options.SambaOptions(parser)
diff --git a/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm 
b/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm
index fbdaa9a..f658831 100644
--- a/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm
+++ b/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm
@@ -269,9 +269,9 @@ sub handle_noemit($$$)
my ($pos,$data,$type) = @_;
 
if (defined($type)) {
-   $data-{noemit}-{$type} = 1;
+   $data-{noemit}-{$type} = 1;
} else {
-   $data-{noemit_dissector} = 1;
+   $data-{noemit_dissector} = 1;
}
 }
 
@@ -284,7 +284,7 @@ sub handle_manual($$$)
return;
}
 
-$data-{manual}-{$fn} = 1;
+   $data-{manual}-{$fn} = 1;
 }
 
 sub handle_protocol($$)
diff --git a/pidl/lib/Parse/Pidl/Wireshark/NDR.pm 
b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
index 89cbf84..caa58c2 100644
--- a/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
+++ b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
@@ -27,7 +27,7 @@ use Parse::Pidl::Util qw(has_property property_matches 
make_str);
 use Parse::Pidl::NDR qw(ContainsString

[SCM] build.samba.org - branch master updated

2014-08-18 Thread Jelmer Vernooij

The branch, master has been updated
   via  4cc7c29 Re-enable buildfarm tests.
   via  b60f215 Reuse DEADAGE rather than defining our own constant.
  from  295dc1a Add constant for maximum build age.

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


- Log -
commit 4cc7c2975425c558ad8c4c3dfd689ad09f0d3760
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Aug 18 21:46:28 2014 +0200

Re-enable buildfarm tests.

commit b60f215d1fa2f04bee4c650efbba629a215fda6f
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Aug 2 21:43:06 2014 +0200

Reuse DEADAGE rather than defining our own constant.

---

Summary of changes:
 TODO  |1 +
 buildfarm/tests/__init__.py   |1 +
 buildfarm/tests/test_buildfarm.py |8 ++--
 buildfarm/web/__init__.py |7 +--
 4 files changed, 5 insertions(+), 12 deletions(-)
 create mode 100644 TODO


Changeset truncated at 500 lines:

diff --git a/TODO b/TODO
new file mode 100644
index 000..1480b02
--- /dev/null
+++ b/TODO
@@ -0,0 +1 @@
+- age is misnamed
diff --git a/buildfarm/tests/__init__.py b/buildfarm/tests/__init__.py
index bc66ab1..d5abd68 100644
--- a/buildfarm/tests/__init__.py
+++ b/buildfarm/tests/__init__.py
@@ -109,6 +109,7 @@ def test_suite():
 names = [
 '__init__',
 'test_build',
+'test_buildfarm',
 'test_history',
 'test_hostdb',
 'test_sqldb',
diff --git a/buildfarm/tests/test_buildfarm.py 
b/buildfarm/tests/test_buildfarm.py
index 417576b..2cc1b33 100644
--- a/buildfarm/tests/test_buildfarm.py
+++ b/buildfarm/tests/test_buildfarm.py
@@ -131,12 +131,8 @@ class BuildFarmTests(BuildFarmTestCase):
 BUILD COMMIT REVISION: 42\n, mtime=4200)
 builds = list(self.x.get_summary_builds())
 self.assertEquals(2, len(builds))
-self.assertEquals(4200, builds[0].upload_time)
-self.assertEquals(42, builds[0].revision_details())
-self.assertEquals(trivial, builds[0].tree)
-self.assertEquals(1200, builds[1].upload_time)
-self.assertEquals(12, builds[1].revision_details())
-self.assertEquals(other, builds[1].tree)
+self.assertEquals(other, builds[0][0])
+self.assertEquals(trivial, builds[1][0])
 builds = list(self.x.get_summary_builds(min_age=4000))
 self.assertEquals(1, len(builds))
 builds = list(self.x.get_summary_builds(min_age=5000))
diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index 7cd1a7e..3b3c38d 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -58,11 +58,6 @@ webdir = 
os.path.abspath(os.path.join(os.path.dirname(__file__), .., .., we
 GITWEB_BASE = https://gitweb.samba.org;
 HISTORY_HORIZON = 1000
 
-# Maximum age of builds to consider when displaying summary page statistics.
-# Note that trees only get rebuilt when they change, so this value is
-# intentionally set to a high value to cope with trees that don't change often.
-SUMMARY_MAX_BUILD_AGE = (180 * 24 * 60 * 60)
-
 # this is automatically filled in
 deadhosts = []
 
@@ -732,7 +727,7 @@ class ViewSummaryPage(BuildFarmPage):
 # output when we want
 broken_table = 
 
-builds = self.buildfarm.get_summary_builds(min_age=time.time() - 
SUMMARY_MAX_BUILD_AGE)
+builds = self.buildfarm.get_summary_builds(min_age=time.time() - 
BuildFarm.DEADAGE)
 
 for tree, status in builds:
 host_count[tree]+=1


-- 
build.samba.org

[SCM] build.samba.org - branch master updated

2014-08-18 Thread Jelmer Vernooij

The branch, master has been updated
   via  742f79b http - https
  from  4cc7c29 Re-enable buildfarm tests.

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


- Log -
commit 742f79b65d1c28353d598086441dfab004add15f
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Aug 18 22:01:27 2014 +0200

http - https

---

Summary of changes:
 admin.py  |2 +-
 import-and-analyse.py |2 +-
 mail-dead-hosts.py|4 ++--
 web/about.html|4 ++--
 web/header3.html  |   12 ++--
 web/instructions.html |8 
 6 files changed, 16 insertions(+), 16 deletions(-)


Changeset truncated at 500 lines:

diff --git a/admin.py b/admin.py
index b78fb32..fa317f3 100755
--- a/admin.py
+++ b/admin.py
@@ -142,7 +142,7 @@ Your host %(hostname)s has been added to the Samba Build 
farm.
 We have recorded that it is running %(platform)s.  
 
 If you have not already done so, please read:
-http://build.samba.org/instructions.html
+https://build.samba.org/instructions.html
 
 The password for your rsync .password file is %(password)s
 
diff --git a/import-and-analyse.py b/import-and-analyse.py
index 2318cc1..6a22797 100755
--- a/import-and-analyse.py
+++ b/import-and-analyse.py
@@ -90,7 +90,7 @@ The build may have been broken by one of the following 
commits:
 old_rev: diff.old_rev,
 cur_status: diff.new_status,
 old_status: diff.old_status,
-build_link: build_uri(http://build.samba.org/build.cgi;, cur)
+build_link: build_uri(https://build.samba.org/build.cgi;, cur)
 }
 
 msg = MIMEText(body)
diff --git a/mail-dead-hosts.py b/mail-dead-hosts.py
index 56ca811..b83ce4b 100755
--- a/mail-dead-hosts.py
+++ b/mail-dead-hosts.py
@@ -42,7 +42,7 @@ for host in hosts:
 
 body = 
 Your host %s has been part of the Samba Build farm, hosted
-at http://build.samba.org/.
+at https://build.samba.org/.
 
 Sadly however we have not heard from it since %s.
 
@@ -59,7 +59,7 @@ Thanks,
 
 The Build Farm administration team.
 
- % (host.name, last_update, host_uri(http://build.samba.org/build.cgi;, 
host.name))
+ % (host.name, last_update, host_uri(https://build.samba.org/build.cgi;, 
host.name))
 
 msg = MIMEText(body)
 
diff --git a/web/about.html b/web/about.html
index 05e0117..acd6825 100644
--- a/web/about.html
+++ b/web/about.html
@@ -11,7 +11,7 @@
   real time. Each host in the build farm builds each of the projects regularly
   (currently every 15 minutes for some hosts) and uploads the results of the
   configure, build, install, and runtime testing to the central site
-  (a href=http://build.samba.org/;build.samba.org/a) for display.
+  (a href=https://build.samba.org/;build.samba.org/a) for display.
 /p
 
 p
@@ -22,7 +22,7 @@
 
 p
   The build farm pulls the source code from the a
-  href=http://www.samba.org/ftp/unpacked/;unpacked Git
+  href=https://www.samba.org/ftp/unpacked/;unpacked Git
   repository/a and does a clean configure and build whenever a change is
   detected in the tree. The results shown give information on the status of the
   configure and build process, plus any error logs.
diff --git a/web/header3.html b/web/header3.html
index ab9a540..526d766 100644
--- a/web/header3.html
+++ b/web/header3.html
@@ -11,16 +11,16 @@
   ul
 lia href=/about.htmlAbout the build farm/a/li
 lia href=/instructions.htmlAdding a new machine/a/li
-lia href=http://www.samba.org/;Samba Web pages/a/li
+lia href=https://www.samba.org/;Samba Web pages/a/li
   /ul
 
   img src=/hack.png alt=hack samba /
   ul
-lia href=http://www.samba.org/samba/devel/;Devel Overview/a/li
-lia href=http://gitweb.samba.org;Git Source/a/li
-lia href=http://websvn.samba.org;Historical SVN Source/a/li
-lia href=http://cvs.samba.org/cgi-bin/cvsweb/;Historical CVS 
Source/a/li
-lia href=http://build.samba.org/;Build Farm/a/li
+lia href=https://www.samba.org/samba/devel/;Devel Overview/a/li
+lia href=https://gitweb.samba.org;Git Source/a/li
+lia href=https://websvn.samba.org;Historical SVN Source/a/li
+lia href=https://cvs.samba.org/cgi-bin/cvsweb/;Historical CVS 
Source/a/li
+lia href=https://build.samba.org/;Build Farm/a/li
 lia href=https://bugzilla.samba.org;Bug Reports/a/li
   /ul
 
diff --git a/web/instructions.html b/web/instructions.html
index 3bdf079..68f4cff 100644
--- a/web/instructions.html
+++ b/web/instructions.html
@@ -47,19 +47,19 @@ If you have a machine that you wish to add to our build 
farm then please follow
   account, no special privileges are needed, just change ~build to your
   home directory in the instructions below./li
 
-  liMake sure a recent version of a href=http://rsync.samba.org/;rsync/a
+  liMake sure a recent version of a 
href=https://rsync.samba.org/;rsync/a
   is installed on the machine/li
 
   liCreate a directory

[SCM] build.samba.org - branch master updated

2014-08-18 Thread Jelmer Vernooij

The branch, master has been updated
   via  cd17a96 Update Samba build farm to new web site layout.
  from  742f79b http - https

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


- Log -
commit cd17a9658a2dbe90a881d36f27ad22d35e777fd6
Author: krishnatejaperannagari krishnatejaperannag...@gmail.com
Date:   Mon Aug 18 22:07:38 2014 +0200

Update Samba build farm to new web site layout.

Reviewed-By: Jelmer Vernooij jel...@samba.org

---

Summary of changes:
 .gitmodules  |3 +
 buildfarm/tests/test_util.py |   19 +++-
 buildfarm/util.py|   24 
 buildfarm/web/__init__.py|  111 +++-
 web/about.html   |5 -
 web/bannernav1.html  |   32 +
 web/bannernav2.html  |   17 +++
 web/build_farm.css   |  286 +
 web/closingtags.html |9 ++
 web/instructions.html|   19 +--
 web/samba-web|1 +
 11 files changed, 445 insertions(+), 81 deletions(-)
 create mode 100644 .gitmodules
 create mode 100644 web/bannernav1.html
 create mode 100644 web/bannernav2.html
 create mode 100644 web/closingtags.html
 create mode 16 web/samba-web


Changeset truncated at 500 lines:

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000..765c2d8
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule web/samba-web]
+   path = web/samba-web
+   url = https://git.samba.org/samba-web.git
diff --git a/buildfarm/tests/test_util.py b/buildfarm/tests/test_util.py
index a727ee2..fbd8f24 100755
--- a/buildfarm/tests/test_util.py
+++ b/buildfarm/tests/test_util.py
@@ -40,7 +40,7 @@ class LoadTests(testtools.TestCase):
 f = os.fdopen(fd, 'w')
 f.write(one
 two
-three

+three
 
 for
 )
@@ -49,4 +49,21 @@ for
 self.assertEquals(4, len(l))
 self.assertEquals(three, l[2])
 
+class SambaWebFileLoadTest(testtools.TestCase):
+
+def test_simple(self):
+fd, name = tempfile.mkstemp()
+self.addCleanup(os.remove, name)
+f = os.fdopen(fd, 'w')
+f.write('href=/samba/index.html')
+f.close()
+l = util.SambaWebFileLoad(os.getcwd(),name)
+self.assertEquals('href=http://www.samba.org/samba/index.html;', l)
+fd1, name1 = tempfile.mkstemp()
+self.addCleanup(os.remove, name1)
+f1 = os.fdopen(fd1, 'w')
+f1.write('!--#include virtual=/samba/name2 --')
+f1.close()
+l1 = 
util.SambaWebFileLoad(os.path.dirname(os.path.realpath(name1)),name1)
+self.assertEquals('', l1)
 
diff --git a/buildfarm/util.py b/buildfarm/util.py
index 9d6c8ca..9ce71ca 100644
--- a/buildfarm/util.py
+++ b/buildfarm/util.py
@@ -17,6 +17,9 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+import re
+import os
+
 def load_list(fname):
 load a list from a file, using : to separate
 ret = []
@@ -40,6 +43,27 @@ def FileLoad(filename):
 finally:
 f.close()
 
+def SambaWebFileLoad(webdir, filename):
+loads file and changes the links to suit buildfarm
+try:
+f = open(os.path.join(webdir, filename), 'r')
+text = f.read()
+except IOError:
+return ''
+else:
+f.close()
+def add_virtual_headers(m):
+try:
+f = open(os.path.join(webdir, m.group(1)), 'r')
+text = f.read()
+except:
+return ''
+else:
+f.close()
+return text
+text = re.sub('!--#include virtual=/samba/(.*) --',add_virtual_headers 
, text)
+text = re.sub('href=/samba', 'href=http://www.samba.org/samba', text)
+return text
 
 def dhm_time(sec):
 display a time as days, hours, minutes
diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index 3b3c38d..8794978 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -55,7 +55,7 @@ import time
 import wsgiref.util
 webdir = os.path.abspath(os.path.join(os.path.dirname(__file__), .., .., 
web))
 
-GITWEB_BASE = https://gitweb.samba.org;
+GITWEB_BASE = //gitweb.samba.org
 HISTORY_HORIZON = 1000
 
 # this is automatically filled in
@@ -418,7 +418,7 @@ class ViewBuildPage(BuildFarmPage):
 
 yield h2Older builds:/h2\n
 
-yield table class='real'\n
+yield table class='newtable'\n
 yield 
theadtrthRevision/ththStatus/ththAge/th/tr/thead\n
 yield tbody\n
 
@@ -473,7 +473,7 @@ class ViewBuildPage(BuildFarmPage):
 if os.path.exists(host_web_file):
 yield util.FileLoad(host_web_file)
 
-yield table class='real'\n
+yield table class='newtable'\n
 yield trtdHost:/tdtda 
href='%s?function=View+Host;host=%s;tree=%s;\
   compiler=%s#'%s/a - %s

[SCM] build.samba.org - branch master updated

2014-08-02 Thread Jelmer Vernooij

The branch, master has been updated
   via  0996a81 Fix whitespace, add basic tests for get_summary_builds.
   via  9fe0dc1 Merge branch 'query4summarypage' of 
git://github.com/krishnatejaperannagari/build-farm into summary-optimization
   via  9dee960 changes to reviews
   via  0ca8317 query and conversion completed
  from  338f129 Remove trailing whitespace.

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


- Log -
commit 0996a81eab145e1f866ed1b03e043712a35ec2a5
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Aug 2 20:11:18 2014 +0200

Fix whitespace, add basic tests for get_summary_builds.

commit 9fe0dc147edce633cbf2cd333d1ba0d98f878394
Merge: 338f129aae35054dd350677b19170279549c22db 
9dee960b26fa090b2d0fb8449430e95246f8998c
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Aug 2 20:03:58 2014 +0200

Merge branch 'query4summarypage' of 
git://github.com/krishnatejaperannagari/build-farm into summary-optimization

commit 9dee960b26fa090b2d0fb8449430e95246f8998c
Author: krishnatejaperannagari krishnatejaperannag...@gmail.com
Date:   Tue Jul 1 16:13:53 2014 +0530

changes to reviews

Signed-off-by: krishnatejaperannagari krishnatejaperannag...@gmail.com

commit 0ca8317f8d3bfc552dc9859c2a8e5edd0f428a35
Author: krishnatejaperannagari krishnatejaperannag...@gmail.com
Date:   Mon Jun 23 14:03:26 2014 +0530

query and conversion completed

Signed-off-by: krishnatejaperannagari krishnatejaperannag...@gmail.com

---

Summary of changes:
 buildfarm/__init__.py |   21 +
 buildfarm/build.py|3 +--
 buildfarm/tests/test_buildfarm.py |   19 +++
 buildfarm/web/__init__.py |   11 +--
 4 files changed, 46 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/__init__.py b/buildfarm/__init__.py
index 7c4428e..52ac085 100644
--- a/buildfarm/__init__.py
+++ b/buildfarm/__init__.py
@@ -17,6 +17,7 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+from buildfarm.build import BuildStatus
 from buildfarm.sqldb import distinct_builds, Cast, StormBuild, setup_schema, 
StormHostDatabase
 from buildfarm.tree import Tree
 from storm.database import create_database
@@ -143,6 +144,26 @@ class BuildFarm(object):
 result = self._get_store().find(StormBuild)
 return distinct_builds(result.order_by(Desc(StormBuild.upload_time)))
 
+def get_summary_builds(self):
+Return last build age, status for each tree/host/compiler.
+
+:return: iterator over tree, status
+
+store = self._get_store()
+return ((tree, BuildStatus.__deserialize__(status_str))
+for (tree, status_str) in store.execute(
+SELECT obd.tree, obd.status AS status_str
+FROM build obd
+INNER JOIN(
+SELECT MAX(age) age, tree, host, compiler
+FROM build
+GROUP BY tree, host, compiler
+) ibd ON obd.age = ibd.age AND
+ obd.tree = ibd.tree AND
+ obd.host = ibd.host AND
+ obd.compiler = ibd.compiler;
+))
+
 def get_tree_builds(self, tree):
 result = self._get_store().find(StormBuild,
 Cast(StormBuild.tree, TEXT) == Cast(tree, TEXT))
diff --git a/buildfarm/build.py b/buildfarm/build.py
index fae37a1..1348a96 100644
--- a/buildfarm/build.py
+++ b/buildfarm/build.py
@@ -566,8 +566,7 @@ class BuildResultStore(object):
 os.link(build.basename+.log, new_basename+.log)
 if os.path.exists(build.basename+.err):
 os.link(build.basename+.err, new_basename+.err)
-new_build = StormBuild(new_basename, build.tree, build.host,
-build.compiler, rev)
+new_build = StormBuild(new_basename, build.tree, build.host, 
build.compiler, rev)
 new_build.checksum = build.log_checksum()
 new_build.upload_time = build.upload_time
 new_build.status_str = build.status().__serialize__()
diff --git a/buildfarm/tests/test_buildfarm.py 
b/buildfarm/tests/test_buildfarm.py
index d78ed68..9091bf8 100644
--- a/buildfarm/tests/test_buildfarm.py
+++ b/buildfarm/tests/test_buildfarm.py
@@ -119,6 +119,25 @@ class BuildFarmTests(BuildFarmTestCase):
 self.assertEquals(12, builds[1].revision_details())
 self.assertEquals(other, builds[1].tree)
 
+def test_get_summary_builds_empty(self):
+self.assertEquals([], list(self.x.get_summary_builds()))
+
+def test_get_summary_builds(self):
+path = self.upload_mock_logfile(self.x.builds, other, myhost, cc,
+BUILD COMMIT REVISION: 12\n, mtime=1200)
+path = self.upload_mock_logfile(self.x.builds, trivial, myhost, 
cc,
+BUILD COMMIT REVISION: 13\n, mtime=1300)
+path = self.upload_mock_logfile

[SCM] build.samba.org - branch master updated

2014-08-02 Thread Jelmer Vernooij

The branch, master has been updated
   via  c5f371b Only show builds in the last seven days.
  from  0996a81 Fix whitespace, add basic tests for get_summary_builds.

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


- Log -
commit c5f371b907ef13bef16bd4ac8be29e0fc7961882
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Aug 2 21:23:22 2014 +0200

Only show builds in the last seven days.

---

Summary of changes:
 buildfarm/__init__.py |6 --
 buildfarm/web/__init__.py |2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/__init__.py b/buildfarm/__init__.py
index 52ac085..933e5fd 100644
--- a/buildfarm/__init__.py
+++ b/buildfarm/__init__.py
@@ -144,9 +144,10 @@ class BuildFarm(object):
 result = self._get_store().find(StormBuild)
 return distinct_builds(result.order_by(Desc(StormBuild.upload_time)))
 
-def get_summary_builds(self):
+def get_summary_builds(self, min_age=0):
 Return last build age, status for each tree/host/compiler.
 
+:param min_age: Minimum timestamp of builds to report
 :return: iterator over tree, status
 
 store = self._get_store()
@@ -157,12 +158,13 @@ FROM build obd
 INNER JOIN(
 SELECT MAX(age) age, tree, host, compiler
 FROM build
+WHERE age  ?
 GROUP BY tree, host, compiler
 ) ibd ON obd.age = ibd.age AND
  obd.tree = ibd.tree AND
  obd.host = ibd.host AND
  obd.compiler = ibd.compiler;
-))
+, min_age))
 
 def get_tree_builds(self, tree):
 result = self._get_store().find(StormBuild,
diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index 0368022..bd29cc1 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -727,7 +727,7 @@ class ViewSummaryPage(BuildFarmPage):
 # output when we want
 broken_table = 
 
-builds = self.buildfarm.get_summary_builds()
+builds = self.buildfarm.get_summary_builds(min_age=(7 * 24 * 60 * 60))
 
 for tree, status in builds:
 host_count[tree]+=1


-- 
build.samba.org

[SCM] build.samba.org - branch master updated

2014-08-02 Thread Jelmer Vernooij

The branch, master has been updated
   via  ec031ac Add tests for new min_age argument.
  from  c5f371b Only show builds in the last seven days.

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


- Log -
commit ec031ac5beadd5d6d4d78214c705ed62d60be170
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Aug 2 21:25:01 2014 +0200

Add tests for new min_age argument.

---

Summary of changes:
 buildfarm/tests/test_buildfarm.py |4 
 1 files changed, 4 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/tests/test_buildfarm.py 
b/buildfarm/tests/test_buildfarm.py
index 9091bf8..417576b 100644
--- a/buildfarm/tests/test_buildfarm.py
+++ b/buildfarm/tests/test_buildfarm.py
@@ -137,6 +137,10 @@ class BuildFarmTests(BuildFarmTestCase):
 self.assertEquals(1200, builds[1].upload_time)
 self.assertEquals(12, builds[1].revision_details())
 self.assertEquals(other, builds[1].tree)
+builds = list(self.x.get_summary_builds(min_age=4000))
+self.assertEquals(1, len(builds))
+builds = list(self.x.get_summary_builds(min_age=5000))
+self.assertEquals(0, len(builds))
 
 def test_get_host_builds_empty(self):
 self.assertEquals([], list(self.x.get_host_builds(myhost)))


-- 
build.samba.org

[SCM] build.samba.org - branch master updated

2014-08-02 Thread Jelmer Vernooij

The branch, master has been updated
   via  01ab8dc Use tuple for sqlite arguments - breaks on older versions 
of storm without.
  from  ec031ac Add tests for new min_age argument.

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


- Log -
commit 01ab8dc8abf928cf030a955cfae2ea680597ee24
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Aug 2 21:28:52 2014 +0200

Use tuple for sqlite arguments - breaks on older versions of storm
without.

---

Summary of changes:
 buildfarm/__init__.py |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/__init__.py b/buildfarm/__init__.py
index 933e5fd..0e9eb39 100644
--- a/buildfarm/__init__.py
+++ b/buildfarm/__init__.py
@@ -164,7 +164,7 @@ INNER JOIN(
  obd.tree = ibd.tree AND
  obd.host = ibd.host AND
  obd.compiler = ibd.compiler;
-, min_age))
+, (min_age, )))
 
 def get_tree_builds(self, tree):
 result = self._get_store().find(StormBuild,


-- 
build.samba.org

[SCM] build.samba.org - branch master updated

2014-08-02 Thread Jelmer Vernooij

The branch, master has been updated
   via  e73c92c min_age takes an absolute timestamp.
  from  01ab8dc Use tuple for sqlite arguments - breaks on older versions 
of storm without.

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


- Log -
commit e73c92c339ab3f90abe9c0465de713f0d95f50d1
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Aug 2 21:37:01 2014 +0200

min_age takes an absolute timestamp.

---

Summary of changes:
 buildfarm/web/__init__.py |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index bd29cc1..b66ffce 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -727,7 +727,7 @@ class ViewSummaryPage(BuildFarmPage):
 # output when we want
 broken_table = 
 
-builds = self.buildfarm.get_summary_builds(min_age=(7 * 24 * 60 * 60))
+builds = self.buildfarm.get_summary_builds(min_age=time.time() - (7 * 
24 * 60 * 60))
 
 for tree, status in builds:
 host_count[tree]+=1


-- 
build.samba.org

[SCM] build.samba.org - branch master updated

2014-08-02 Thread Jelmer Vernooij

The branch, master has been updated
   via  295dc1a Add constant for maximum build age.
  from  e73c92c min_age takes an absolute timestamp.

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


- Log -
commit 295dc1ad7e31efcb8313a0ad2fc4ab4683ee40d3
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Aug 2 21:39:37 2014 +0200

Add constant for maximum build age.

---

Summary of changes:
 buildfarm/web/__init__.py |7 ++-
 1 files changed, 6 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index b66ffce..7cd1a7e 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -58,6 +58,11 @@ webdir = 
os.path.abspath(os.path.join(os.path.dirname(__file__), .., .., we
 GITWEB_BASE = https://gitweb.samba.org;
 HISTORY_HORIZON = 1000
 
+# Maximum age of builds to consider when displaying summary page statistics.
+# Note that trees only get rebuilt when they change, so this value is
+# intentionally set to a high value to cope with trees that don't change often.
+SUMMARY_MAX_BUILD_AGE = (180 * 24 * 60 * 60)
+
 # this is automatically filled in
 deadhosts = []
 
@@ -727,7 +732,7 @@ class ViewSummaryPage(BuildFarmPage):
 # output when we want
 broken_table = 
 
-builds = self.buildfarm.get_summary_builds(min_age=time.time() - (7 * 
24 * 60 * 60))
+builds = self.buildfarm.get_summary_builds(min_age=time.time() - 
SUMMARY_MAX_BUILD_AGE)
 
 for tree, status in builds:
 host_count[tree]+=1


-- 
build.samba.org

[SCM] build.samba.org - branch master updated

2014-07-10 Thread Jelmer Vernooij

The branch, master has been updated
   via  338f129 Remove trailing whitespace.
   via  9ab3ded Merge remote-tracking branch 
'krishna/recentcheckinimprovements'
   via  7840268 changes to reviews 2
   via  8257486 changes to reviews
   via  b43a773 recent checkins page speed improvements with hidng feature
  from  4a37365 Add --debug-storm option.

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


- Log -
commit 338f129aae35054dd350677b19170279549c22db
Author: Jelmer VernooÄ³ jel...@samba.org
Date:   Fri Jul 11 02:19:38 2014 +0200

Remove trailing whitespace.

commit 9ab3ded91c65b715211293967846bd2d454a7921
Merge: 4a37365dc220a84e952c8214cf3b9acfcafe746a 
78402689a044b11a94114d2d136b9dbba870238e
Author: Jelmer VernooÄ³ jel...@samba.org
Date:   Fri Jul 11 02:17:43 2014 +0200

Merge remote-tracking branch 'krishna/recentcheckinimprovements'

commit 78402689a044b11a94114d2d136b9dbba870238e
Author: krishnatejaperannagari krishnatejaperannag...@gmail.com
Date:   Mon Jul 7 20:50:27 2014 +0530

changes to reviews 2

Signed-off-by: krishnatejaperannagari krishnatejaperannag...@gmail.com

commit 825748611865259a3d5336c5ff7f61015de5b29a
Author: krishnatejaperannagari krishnatejaperannag...@gmail.com
Date:   Fri Jul 4 13:56:18 2014 +0530

changes to reviews

Signed-off-by: krishnatejaperannagari krishnatejaperannag...@gmail.com

commit b43a77316d4500fe30b30d581f1915476e6058ac
Author: krishnatejaperannagari krishnatejaperannag...@gmail.com
Date:   Tue Jun 17 11:37:54 2014 +0530

recent checkins page speed improvements with hidng feature

Signed-off-by: krishnatejaperannagari krishnatejaperannag...@gmail.com

---

Summary of changes:
 buildfarm/web/__init__.py |   31 +++
 1 files changed, 27 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index 438d412..b1f0fb4 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -886,14 +886,15 @@ class DiffPage(HistoryPage):
 
 class RecentCheckinsPage(HistoryPage):
 
-limit = 40
+limit = 10
 
-def render(self, myself, tree, author=None):
+def render(self, myself, tree, gitstart, author=None):
 t = self.buildfarm.trees[tree]
 interesting = list()
 authors = {ALL: ALL}
 branch = t.get_branch()
 re_author = re.compile(^(.*) (.*)$)
+ 
 for entry in branch.log(limit=HISTORY_HORIZON):
 m = re_author.match(entry.author)
 authors[m.group(2)] = m.group(1)
@@ -910,11 +911,28 @@ class RecentCheckinsPage(HistoryPage):
 yield input type='hidden' name='function', value='Recent Checkins'/
 yield /form
 
-for entry in interesting[:self.limit]:
+gitstop = gitstart + self.limit
+
+for entry in interesting[gitstart:gitstop]:
 changes = branch.changes_summary(entry.revision)
 yield .join(self.history_row_html(myself, entry, t, changes))
 yield \n
 
+yield form method='GET'
+yield div class='newform'\n
+if gitstart != 0:
+yield button name='gitstart' type='submit' value= + 
str(gitstart - self.limit) +  
style='position:absolute;left:0px;'Previous/button
+if len(interesting)  gitstop:
+yield button name='gitstart' type='submit' value= + 
str(gitstop) +  style='position:absolute;right:0px;'Next/button
+yield input type='hidden' name='function', value='Recent Checkins'/
+yield input type='hidden' name='gitcount' value='%s'/ % gitstop
+if author and author != ALL:
+yield input type='hidden' name='author' value='%s'/ % author
+yield input type='hidden' name='tree' value='%s'/ % tree
+yield /div\n
+yield /form
+yield br
+
 
 class BuildFarmApp(object):
 
@@ -1020,8 +1038,13 @@ class BuildFarmApp(object):
 elif fn_name == Recent_Checkins:
 # validate the tree
 author = get_param(form, 'author')
+gitstart = get_param(form, 'gitstart')
+if gitstart is None:
+gitstart = 0
+else:
+gitstart = int(gitstart)
 page = RecentCheckinsPage(self.buildfarm)
-yield .join(self.html_page(form, page.render(myself, tree, 
author)))
+yield .join(self.html_page(form, page.render(myself, tree, 
gitstart, author)))
 elif fn_name == diff:
 revision = get_param(form, 'revision')
 page = DiffPage(self.buildfarm)


-- 
build.samba.org

[SCM] build.samba.org - branch master updated

2014-06-12 Thread Jelmer Vernooij

The branch, master has been updated
   via  4a37365 Add --debug-storm option.
   via  b55c89d Simplify handling of old build limit showing.
  from  242950a Add some notes on running the build farm locally to README.

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


- Log -
commit 4a37365dc220a84e952c8214cf3b9acfcafe746a
Author: Jelmer VernooÄ³ jel...@samba.org
Date:   Thu Jun 12 23:52:42 2014 +0200

Add --debug-storm option.

commit b55c89d354e616f00ebcf5d6a31f86688a2a8765
Author: Jelmer VernooÄ³ jel...@samba.org
Date:   Sat Jun 7 18:32:33 2014 +0200

Simplify handling of old build limit showing.

---

Summary of changes:
 buildfarm/web/__init__.py |   22 +-
 1 files changed, 13 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index 08d577a..438d412 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # This CGI script presents the results of the build_farm build
 
-# Copyright (C) Jelmer Vernooij jel...@samba.org 2010
+# Copyright (C) Jelmer Vernooij jel...@samba.org 2010-2014
 # Copyright (C) Matthieu Patou m...@matws.net 2010-2012
 #
 # Based on the original web/build.pl:
@@ -33,6 +33,7 @@
 
 from collections import defaultdict
 import os
+import sys
 
 from buildfarm import (
 hostdb,
@@ -125,7 +126,8 @@ def build_uri(myself, build):
 
 
 def build_link(myself, build):
-return a href='%s'%s/a % (build_uri(myself, build), 
html_build_status(build.status()))
+return a href='%s'%s/a % (
+build_uri(myself, build), html_build_status(build.status()))
 
 
 def tree_uri(myself, tree):
@@ -134,7 +136,8 @@ def tree_uri(myself, tree):
 
 def tree_link(myself, tree):
 return a link to a particular tree
-return a href='%s' title='View recent builds for %s'%s:%s/a % 
(tree_uri(myself, tree), tree.name, tree.name, tree.branch)
+return a href='%s' title='View recent builds for %s'%s:%s/a % (
+tree_uri(myself, tree), tree.name, tree.name, tree.branch)
 
 
 def host_uri(myself, host):
@@ -404,7 +407,7 @@ class BuildFarmPage(object):
 
 class ViewBuildPage(BuildFarmPage):
 
-def show_oldrevs(self, myself, build, host, compiler, limit):
+def show_oldrevs(self, myself, build, host, compiler, limit=None):
 show the available old revisions, if any
 
 tree = build.tree
@@ -419,11 +422,7 @@ class ViewBuildPage(BuildFarmPage):
 yield 
theadtrthRevision/ththStatus/ththAge/th/tr/thead\n
 yield tbody\n
 
-nb = 0
-for old_build in old_builds:
-if limit = 0 and nb = limit:
-break
-nb = nb + 1
+for old_build in old_builds[:limit]:
 yield trtd%s/tdtd%s/tdtd%s/td/tr\n % (
 revision_link(myself, old_build.revision, tree),
 build_link(myself, old_build),
@@ -1123,6 +1122,8 @@ class BuildFarmApp(object):
 if __name__ == '__main__':
 import optparse
 parser = optparse.OptionParser([options])
+parser.add_option(--debug-storm, help=Enable storm debugging,
+  default=False, action='store_true')
 parser.add_option(--port, help=Port to listen on [localhost:8000],
 default=localhost:8000, type=str)
 opts, args = parser.parse_args()
@@ -1150,6 +1151,9 @@ if __name__ == '__main__':
 except ValueError:
 address = localhost
 port = opts.port
+if opts.debug_storm:
+from storm.tracer import debug
+debug(True, stream=sys.stdout)
 httpd = make_server(address, int(port), standaloneApp)
 print Serving on %s:%d... % (address, int(port))
 httpd.serve_forever()


-- 
build.samba.org

[SCM] Samba Website Repository - branch master updated

2014-06-11 Thread Jelmer Vernooij

The branch, master has been updated
   via  69225f5 Link to my samba.org homepage.
  from  c6855a9 Updated as requested by Michael via mail

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


- Log -
commit 69225f55120b88a05095eb06190c5dda257e959d
Author: Jelmer VernooÄ³ jel...@samba.org
Date:   Thu Jun 12 03:24:04 2014 +0200

Link to my samba.org homepage.

---

Summary of changes:
 team/index.html |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/team/index.html b/team/index.html
index 95c1a2f..476b4e0 100755
--- a/team/index.html
+++ b/team/index.html
@@ -94,7 +94,7 @@ mailing list/a and start contributing to the development of 
Samba./p
 lia href=mailto:mi...@samba.org;Rafal Szczesniak/a/li
 lia href=mailto:j...@samba.org;John Terpstra/a/li
 lia href=http://samba.org/~tridge/;Andrew Tridgell/a/li
-lia href=mailto:jel...@samba.org;Jelmer Vernooij/a/li
+lia href=https://samba.org/~jelmer/;Jelmer Vernooij/a/li
 lia href=mailto:m...@samba.org;Matthias Dieter Wallnouml;fer/a/li
 lia href=mailto:m...@samba.org;Michael Warfield/a/li
 lia href=mailto:boy...@samba.org;Bo Yang/a/li


-- 
Samba Website Repository

[SCM] build.samba.org - branch master updated

2014-06-01 Thread Jelmer Vernooij

The branch, master has been updated
   via  242950a Add some notes on running the build farm locally to README.
  from  69dcf9f Update about page for buildfarm to mention sources are now 
in Git.

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


- Log -
commit 242950a7095c2add03710de6ce7bed9db7a696d3
Author: Jelmer VernooÄ³ jel...@samba.org
Date:   Mon Jun 2 01:05:17 2014 +0200

Add some notes on running the build farm locally to README.

---

Summary of changes:
 README |   39 ++-
 1 files changed, 38 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/README b/README
index e1fe3fe..39c6366 100644
--- a/README
+++ b/README
@@ -1,8 +1,12 @@
 This is the build system for build.samba.org
 
 tri...@samba.org, April 2001
+abart...@samba.org / jel...@samba.org, October 2010
 
-To set it up on a new box you need to do this:
+New build machines
+==
+
+To set up a new build machine, you need to do this:
 
 1) create an account on the box (I'll assume its called build)
 2) copy over build_test to ~build/build_farm/
@@ -14,3 +18,36 @@ To set it up on a new box you need to do this:
 6) add the host to the buildfarm using admin.py.
 7) if desired, create a HOSTNAME.fns file that defines what gets built on
build.samba.org
+
+Running the site
+
+
+The current build farm site is written in Python. It
+manages a directory with raw build logs that get parsed and
+displayed when viewing individual builds.
+
+A sqlite database is used to store metadata about builds
+(to prevent rereading all the logs when e.g. creating
+the summary page). Information about the build farm machines
+and their owners can also be found in the sqlite database.
+
+You will need to have python-storm (our ORM), sqlite
+and python-dulwich (pure-Python Git implementation) installed.
+We don't use any fancy webby frameworks, everything just
+outputs raw HTML.
+
+To run the web site locally, run:
+
+ % python -m buildfarm.web.__init__
+
+For build machine management, you can use the cli tool ./admin.py.
+It should be fairly self-explanatory.
+
+Logs are initially uploaded to data/upload/. Once they are processed
+and an entry has been created in the database for them, they are
+moved over to data/oldrevs/. After they have been moved they should only be
+accessed when the full build log output is viewed.
+
+There are some unit tests for the build farm objects. Run them using:
+
+ % python -m unittest buildfarm.tests.test_suite


-- 
build.samba.org

[SCM] build.samba.org - branch master updated

2014-05-21 Thread Jelmer Vernooij

The branch, master has been updated
   via  69dcf9f Update about page for buildfarm to mention sources are now 
in Git.
  from  326c4af Only create db directory if it does not yet exist.

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


- Log -
commit 69dcf9f1f3371430500569062c415ac7f0b2fc7b
Author: Jelmer VernooÄ³ jel...@samba.org
Date:   Wed May 21 23:57:59 2014 +0200

Update about page for buildfarm to mention sources are now in Git.

---

Summary of changes:
 web/about.html |8 
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/web/about.html b/web/about.html
index a26dfd4..05e0117 100644
--- a/web/about.html
+++ b/web/about.html
@@ -16,13 +16,13 @@
 
 p
   This allows team members to check on the build status on a wide
-  variety of operating systems and architectures without the drudgery of 
-  logging into each machine after each CVS commit.
+  variety of operating systems and architectures without the drudgery of
+  logging into each machine after each Git commit.
 /p
 
 p
   The build farm pulls the source code from the a
-  href=http://www.samba.org/ftp/unpacked/;unpacked CVS/Subversion
+  href=http://www.samba.org/ftp/unpacked/;unpacked Git
   repository/a and does a clean configure and build whenever a change is
   detected in the tree. The results shown give information on the status of the
   configure and build process, plus any error logs.
@@ -32,7 +32,7 @@
 p
   The author of the build farm is a href=mailto:tri...@samba.org;Andrew
   Tridgell/a. The source for the build farm is available in the build-farm
-  Subversion tree on the a href=http://svn.samba.org/;samba.org SVN
+  Git repository on the a href=https://git.samba.org/;samba.org Git
   server/a.
 /p
 


-- 
build.samba.org

[SCM] build.samba.org - branch master updated

2014-05-18 Thread Jelmer Vernooij

The branch, master has been updated
   via  326c4af Only create db directory if it does not yet exist.
  from  4ba733a Create db directory if it did not yet exist.

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


- Log -
commit 326c4af20b34726da9382673d4018e6ae58f18c1
Author: Jelmer VernooÄ³ jel...@samba.org
Date:   Sun May 18 10:50:18 2014 +0200

Only create db directory if it does not yet exist.

---

Summary of changes:
 buildfarm/__init__.py |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/__init__.py b/buildfarm/__init__.py
index ac6add9..7c4428e 100644
--- a/buildfarm/__init__.py
+++ b/buildfarm/__init__.py
@@ -159,7 +159,8 @@ class BuildFarm(object):
 if self.store is not None:
 return self.store
 db_dir_path = os.path.join(self.path, db)
-os.mkdir(db_dir_path)
+if not os.path.isdir(db_dir_path):
+os.mkdir(db_dir_path)
 db_path = os.path.join(db_dir_path, hostdb.sqlite)
 db = create_database(sqlite:%s?timeout=%f % (db_path, self.timeout))
 self.store = Store(db)


-- 
build.samba.org

[SCM] build.samba.org - branch master updated

2014-05-17 Thread Jelmer Vernooij

The branch, master has been updated
   via  4ba733a Create db directory if it did not yet exist.
  from  8a8c26c Add makefile with check target.

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


- Log -
commit 4ba733af447860d96d8f090ad9c1dfafc935798d
Author: Jelmer VernooÄ³ jel...@samba.org
Date:   Sat May 17 13:36:02 2014 +0200

Create db directory if it did not yet exist.

This is fallout from the svn - git migration, as git does not support
empty directories.

---

Summary of changes:
 buildfarm/__init__.py |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/__init__.py b/buildfarm/__init__.py
index 3708dc2..ac6add9 100644
--- a/buildfarm/__init__.py
+++ b/buildfarm/__init__.py
@@ -158,7 +158,9 @@ class BuildFarm(object):
 def _get_store(self):
 if self.store is not None:
 return self.store
-db_path = os.path.join(self.path, db, hostdb.sqlite)
+db_dir_path = os.path.join(self.path, db)
+os.mkdir(db_dir_path)
+db_path = os.path.join(db_dir_path, hostdb.sqlite)
 db = create_database(sqlite:%s?timeout=%f % (db_path, self.timeout))
 self.store = Store(db)
 setup_schema(self.store)


-- 
build.samba.org

[SCM] build.samba.org - branch master updated

2014-05-16 Thread Jelmer Vernooij

The branch, master has been updated
   via  8a8c26c Add makefile with check target.
  from  10745f4 build_test.fns: use --with-perl-{lib,arch}-install-dir= for 
samba_4_*

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


- Log -
commit 8a8c26cc4778f315770ce805eaae29ffeae13f02
Author: Jelmer VernooÄ³ jel...@samba.org
Date:   Fri May 16 19:14:19 2014 +0200

Add makefile with check target.

---

Summary of changes:
 Makefile |4 
 1 files changed, 4 insertions(+), 0 deletions(-)
 create mode 100644 Makefile


Changeset truncated at 500 lines:

diff --git a/Makefile b/Makefile
new file mode 100644
index 000..fda6019
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,4 @@
+PYTHON = python
+
+check:
+   $(PYTHON) -m unittest buildfarm.tests.test_suite


-- 
build.samba.org

[SCM] Samba Shared Repository - branch master updated

2014-04-14 Thread Jelmer Vernooij

The branch, master has been updated
   via  3b82b6f Do not install smbclient4 and nmblookup4
  from  2f2421b ctdb-eventscripts: CTDB_NATGW_PUBLIC_* optional on 
slave-only nodes

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


- Log -
commit 3b82b6f53118c4ae257fa83a11d6aed38e500b62
Author: Jeroen Dekkers jer...@dekkers.ch
Date:   Sat Sep 21 01:43:31 2013 +0200

Do not install smbclient4 and nmblookup4

Change-Id: I2d91d9c9faa2df084321d10fbdc948acbd2bb735
Signed-off-by: Jeroen Dekkers jer...@dekkers.ch
Reviewed-by: Jelmer Vernooij jel...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Tue Apr 15 03:25:13 CEST 2014 on sn-devel-104

---

Summary of changes:
 libcli/nbt/wscript_build |3 ++-
 source4/wscript_build|3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build
index c4a9428..090789c 100755
--- a/libcli/nbt/wscript_build
+++ b/libcli/nbt/wscript_build
@@ -20,7 +20,8 @@ bld.SAMBA_LIBRARY('cli-nbt',
 bld.SAMBA_BINARY('nmblookup' + bld.env.suffix4,
  source='tools/nmblookup.c',
  manpages='man/nmblookup4.1',
- deps='samba-hostconfig samba-util cli-nbt popt POPT_SAMBA 
netif LIBCLI_RESOLVE'
+ deps='samba-hostconfig samba-util cli-nbt popt POPT_SAMBA 
netif LIBCLI_RESOLVE',
+ install=False
  )
 
 bld.SAMBA_PYTHON('python_netbios',
diff --git a/source4/wscript_build b/source4/wscript_build
index af71e80..1dd1356 100644
--- a/source4/wscript_build
+++ b/source4/wscript_build
@@ -2,7 +2,8 @@
 
 bld.SAMBA_BINARY('client/smbclient'  + bld.env.suffix4,
source='client/client.c',
-   deps='samba-hostconfig SMBREADLINE samba-util LIBCLI_SMB RPC_NDR_SRVSVC 
LIBCLI_LSA popt POPT_SAMBA POPT_CREDENTIALS smbclient-raw param_options dcerpc'
+   deps='samba-hostconfig SMBREADLINE samba-util LIBCLI_SMB RPC_NDR_SRVSVC 
LIBCLI_LSA popt POPT_SAMBA POPT_CREDENTIALS smbclient-raw param_options dcerpc',
+   install=False
)
 
 


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2014-04-13 Thread Jelmer Vernooij

The branch, master has been updated
   via  5521cf0 Typo: speciefied - specified.
   via  23beb5b Typo: s/prefered/preferred/
   via  d81bada9 Typo: sucessfully - successfully
   via  9de0dc7 Typo: Specifing - specifying.
  from  e49bae7 s3:smb2_server: remove unused get_min_receive_file_size() 
wrapper function

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


- Log -
commit 5521cf03089322005e7d94c1c2915b31b2b21158
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 30 04:03:15 2014 +0200

Typo: speciefied - specified.

Signed-Off-By: Jelmer Vernooij jel...@samba.org
Change-Id: I0357440cde2ef70945ff4a9ba87b62ab88b271a8
Reviewed-on: https://gerrit.samba.org/218
Reviewed-by: Andrew Bartlett abart...@samba.org

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Sun Apr 13 19:12:22 CEST 2014 on sn-devel-104

commit 23beb5b37c415c1b10a06d8dc0aa93b6eea0aade
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 30 04:05:09 2014 +0200

Typo: s/prefered/preferred/

Signed-Off-By: Jelmer Vernooij jel...@samba.org
Change-Id: Ib82b7fd208990aa876a8bf06431cfed21a6c
Reviewed-on: https://gerrit.samba.org/220
Reviewed-by: Andrew Bartlett abart...@samba.org

commit d81bada9f73af5eebfd21b2242612a5986f2a2d3
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 30 04:04:18 2014 +0200

Typo: sucessfully - successfully

Signed-Off-By: Jelmer Vernooij jel...@samba.org
Change-Id: I23258edf9c197081c882ba85dedf833292e56e4e
Reviewed-on: https://gerrit.samba.org/219
Reviewed-by: Andrew Bartlett abart...@samba.org

commit 9de0dc792d422145291a8682e5560f5444ec1e70
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 30 04:05:45 2014 +0200

Typo: Specifing - specifying.

Signed-Off-By: Jelmer Vernooij jel...@samba.org
Change-Id: I80286441b32cd0b8384610b5b6db7790b8a22d48
Reviewed-on: https://gerrit.samba.org/221
Reviewed-by: Andrew Bartlett abart...@samba.org

---

Summary of changes:
 docs-xml/Samba3-Developers-Guide/unix-smb.xml |2 +-
 source3/lib/util.c|2 +-
 source3/smbd/statvfs.c|2 +-
 source3/utils/net_ads_gpo.c   |2 +-
 source3/utils/net_groupmap.c  |2 +-
 source3/utils/net_rpc_printer.c   |4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/Samba3-Developers-Guide/unix-smb.xml 
b/docs-xml/Samba3-Developers-Guide/unix-smb.xml
index 6964b7f..3412019 100644
--- a/docs-xml/Samba3-Developers-Guide/unix-smb.xml
+++ b/docs-xml/Samba3-Developers-Guide/unix-smb.xml
@@ -206,7 +206,7 @@ Unix has no equivalent notion. To implement this Samba uses 
either lock
 files based on the files inode and placed in a separate lock
 directory or a shared memory implementation. The lock file method 
 is clumsy and consumes processing and file resources,
-the shared memory implementation is vastly prefered and is turned on
+the shared memory implementation is vastly preferred and is turned on
 by default for those systems that support it.
 /para
 
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 945fc97..f11d6f1 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -1856,7 +1856,7 @@ bool name_to_fqdn(fstring fqdn, const char *name)
}
if (full  (strcasecmp_m(full, localhost.localdomain) == 0)) {
DEBUG(1, (WARNING: your /etc/hosts file may be broken!\n));
-   DEBUGADD(1, (Specifing the machine hostname for address 
127.0.0.1 may lead\n));
+   DEBUGADD(1, (Specifying the machine hostname for address 
127.0.0.1 may lead\n));
DEBUGADD(1, (to Kerberos authentication problems as 
localhost.localdomain\n));
DEBUGADD(1, (may end up being used instead of the real 
machine FQDN.\n));
full = hp-h_name;
diff --git a/source3/smbd/statvfs.c b/source3/smbd/statvfs.c
index 94ec2d5..f9f2211 100644
--- a/source3/smbd/statvfs.c
+++ b/source3/smbd/statvfs.c
@@ -151,7 +151,7 @@ static int linux_statvfs(const char *path, 
vfs_statvfs_struct *statbuf)
  sys_statvfs() is an abstraction layer over system-dependent statvfs()/statfs()
  for particular POSIX systems. Due to controversy of what is considered more 
important
  between LSB and FreeBSD/POSIX.1 (IEEE Std 1003.1-2001) we need to abstract 
the interface
- so that particular OS would use its prefered interface.
+ so that particular OS would use its preferred interface.
 */
 int sys_statvfs(const char *path, vfs_statvfs_struct *statbuf)
 {
diff --git a/source3/utils/net_ads_gpo.c b/source3/utils/net_ads_gpo.c
index 444e160..79793b8 100644
--- a/source3/utils/net_ads_gpo.c
+++ b/source3/utils

[SCM] Samba Shared Repository - branch master updated

2014-04-13 Thread Jelmer Vernooij

The branch, master has been updated
   via  e0cddcd Typo: s/preceeded/preceded/
   via  986e539 Typo: Commiting - Committing
  from  5521cf0 Typo: speciefied - specified.

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


- Log -
commit e0cddcd5c44a22a36a156079f8546d3b8e7ee0c1
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 30 04:01:06 2014 +0200

Typo: s/preceeded/preceded/

Caught by lintian, the Debian package linter :)

Change-Id: Ia7162ea8c2b1845155345526b66d71ae64f15227
Reviewed-on: https://gerrit.samba.org/216
Reviewed-by: Andrew Bartlett abart...@samba.org

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Mon Apr 14 03:51:15 CEST 2014 on sn-devel-104

commit 986e53967a84f8bcabfc333198159ef7ebe9efe0
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 30 04:02:39 2014 +0200

Typo: Commiting - Committing

Signed-Off-By: Jelmer Vernooij jel...@samba.org
Change-Id: I9d71706ce6d6782da72a26fa37e33fe5b527788e
Reviewed-on: https://gerrit.samba.org/217
Reviewed-by: Andrew Bartlett abart...@samba.org

---

Summary of changes:
 libcli/auth/ntlm_check.c   |6 +++---
 python/samba/upgrade.py|6 +++---
 source3/utils/net_registry_check.c |2 +-
 source4/utils/oLschema2ldif.c  |2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/auth/ntlm_check.c b/libcli/auth/ntlm_check.c
index dc70957..7f91b52 100644
--- a/libcli/auth/ntlm_check.c
+++ b/libcli/auth/ntlm_check.c
@@ -485,7 +485,7 @@ NTSTATUS ntlm_password_check(TALLOC_CTX *mem_ctx,
 client_domain,
 tmp_sess_key)) {
if (nt_response-length  24) {
-   /* If NTLMv2 authentication has preceeded us
+   /* If NTLMv2 authentication has preceded us
 * (even if it failed), then use the session
 * key from that.  See the RPC-SAMLOGON
 * torture test */
@@ -514,7 +514,7 @@ NTSTATUS ntlm_password_check(TALLOC_CTX *mem_ctx,
 upper_client_domain,
 tmp_sess_key)) {
if (nt_response-length  24) {
-   /* If NTLMv2 authentication has preceeded us
+   /* If NTLMv2 authentication has preceded us
 * (even if it failed), then use the session
 * key from that.  See the RPC-SAMLOGON
 * torture test */
@@ -542,7 +542,7 @@ NTSTATUS ntlm_password_check(TALLOC_CTX *mem_ctx,
 ,
 tmp_sess_key)) {
if (nt_response-length  24) {
-   /* If NTLMv2 authentication has preceeded us
+   /* If NTLMv2 authentication has preceded us
 * (even if it failed), then use the session
 * key from that.  See the RPC-SAMLOGON
 * torture test */
diff --git a/python/samba/upgrade.py b/python/samba/upgrade.py
index c06454a..7eca5b6 100644
--- a/python/samba/upgrade.py
+++ b/python/samba/upgrade.py
@@ -777,7 +777,7 @@ Please fix this account before attempting to upgrade again
 result.samdb.transaction_cancel()
 raise
 
-logger.info(Commiting 'add groups' transaction to disk)
+logger.info(Committing 'add groups' transaction to disk)
 result.samdb.transaction_commit()
 
 logger.info(Adding users)
@@ -811,7 +811,7 @@ Please fix this account before attempting to upgrade again
 result.samdb.transaction_cancel()
 raise
 
-logger.info(Commiting 'add users' transaction to disk)
+logger.info(Committing 'add users' transaction to disk)
 result.samdb.transaction_commit()
 
 logger.info(Adding users to groups)
@@ -828,7 +828,7 @@ Please fix this account before attempting to upgrade again
 result.samdb.transaction_cancel()
 raise
 
-logger.info(Commiting 'add users to groups' transaction to disk)
+logger.info(Committing 'add users to groups' transaction to disk)
 result.samdb.transaction_commit()
 
 # Set password for administrator
diff --git a/source3/utils/net_registry_check.c 
b/source3/utils/net_registry_check.c
index d57c2aa..de79f3e 100644
--- a/source3/utils/net_registry_check.c
+++ b/source3/utils/net_registry_check.c
@@ -378,7 +378,7 @@ static void check_ctx_transaction_stop(struct check_ctx 
*ctx, bool ok) {
return;
}
if (!ctx-opt.test  ok) {
-   d_printf(Commiting changes\n);
+   d_printf(Committing changes\n

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

2014-01-23 Thread Jelmer Vernooij

On Thu, Jan 23, 2014 at 11:52:04PM +0100, Andrew Bartlett wrote:
 The branch, master has been updated
via  6104b1f samba-tool classicupgrade: Remove unsued upgrade_smbconf
via  6c6c3fa samba-tool classicupgrade: Remove unsued reference to 
 samba3sam
   from  7638f52 s3: Don't open the dir for stat/attr/acl related mask
 
 http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
 
 
 - Log -
 commit 6104b1fe98798f275d0fe5f81a678941ab29b184
 Author: Andrew Bartlett abart...@samba.org
 Date:   Thu Jan 16 15:08:16 2014 +1300
 
 samba-tool classicupgrade: Remove unsued upgrade_smbconf
 
 Signed-off-by: Andrew Bartlett abart...@samba.org
 Reviewed-By: Jelmer Vernooij jel...@samba.org
 
 Autobuild-User(master): Andrew Bartlett abart...@samba.org
 Autobuild-Date(master): Thu Jan 23 23:51:56 CET 2014 on sn-devel-104
 
 commit 6c6c3fa7ccb1415addd9553c68fc21115b7c23da
 Author: Andrew Bartlett abart...@samba.org
 Date:   Thu Jan 16 15:07:31 2014 +1300
 
 samba-tool classicupgrade: Remove unsued reference to samba3sam
 
 Signed-off-by: Andrew Bartlett abart...@samba.org
 Reviewed-By: Jelmer Vernooij jel...@samba.org

gwenhwyvar:~/src/samba% git log  | grep -i unsued | wc -l
7

:-)


signature.asc
Description: Digital signature

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

2014-01-07 Thread Jelmer Vernooij

On Wed, Jan 08, 2014 at 08:13:04AM +0100, Andrew Bartlett wrote:
 The branch, master has been updated
via  f8363dd crypto: fix build on OS X
via  af5102f build: test the generic md5 function after importing it 
 from hashlib
   from  8e5f4ea libgpo: apply some const.
 
 http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
 
 
 - Log -
 commit f8363dd22a67108022bc0fe95003450f79057f7d
 Author: Björn Jacke b...@sernet.de
 Date:   Tue Jan 7 15:55:57 2014 +0100
 
 crypto: fix build on OS X
 
 we also need to use the CC_MD5_CTX from CommonCrypto here instead of the 
 MD5_CTX
 
 Signed-off-by: Bjoern Jacke b...@sernet.de
 
 Reviewed-by: Andrew Bartlett abart...@samba.org
 
 Autobuild-User(master): Andrew Bartlett abart...@samba.org
 Autobuild-Date(master): Wed Jan  8 08:12:29 CET 2014 on sn-devel-104
 
 commit af5102fe0075520d62beba412c994d4a74f5446b
 Author: Björn Jacke b...@sernet.de
 Date:   Tue Jan 7 15:55:56 2014 +0100
 
 build: test the generic md5 function after importing it from hashlib
 
 otherwise we used the one from md5 which lead to the following warning on 
 SerNet-imini:
 
 the md5 module is deprecated; use hashlib instead import md5

Do we still support Python 2.4 ? It does not have hashlib, just the md5 module.

Cheers,

jelmer

[SCM] Samba Shared Repository - branch master updated

2013-11-27 Thread Jelmer Vernooij

The branch, master has been updated
   via  91c1053 Add a basic guide on pytalloc.
  from  bfbf62b ctdb:tests/simple: Nobody looks at /tmp/recloop.out so use 
/dev/null instead

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


- Log -
commit 91c1053413e1f309b2d5b215a423f37e3883aa91
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Nov 27 02:12:02 2013 +

Add a basic guide on pytalloc.

Signed-off-by: Jelmer Vernooij jel...@samba.org
Reviewed-By: Andrew Bartlett abart...@samba.org

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Thu Nov 28 02:24:45 CET 2013 on sn-devel-104

---

Summary of changes:
 lib/talloc/pytalloc.h |3 +
 lib/talloc/pytalloc_guide.txt |  153 +
 2 files changed, 156 insertions(+), 0 deletions(-)
 create mode 100644 lib/talloc/pytalloc_guide.txt


Changeset truncated at 500 lines:

diff --git a/lib/talloc/pytalloc.h b/lib/talloc/pytalloc.h
index 2d2c57b..5c3876e 100644
--- a/lib/talloc/pytalloc.h
+++ b/lib/talloc/pytalloc.h
@@ -29,7 +29,10 @@ typedef struct {
void *ptr;
 } pytalloc_Object;
 
+/* Return the PyTypeObject for pytalloc_Object. Returns a new reference. */
 PyTypeObject *pytalloc_GetObjectType(void);
+
+/* Check whether a specific object is a talloc Object. */
 int pytalloc_Check(PyObject *);
 
 /* Retrieve the pointer for a pytalloc_object. Like talloc_get_type() 
diff --git a/lib/talloc/pytalloc_guide.txt b/lib/talloc/pytalloc_guide.txt
new file mode 100644
index 000..755a52b
--- /dev/null
+++ b/lib/talloc/pytalloc_guide.txt
@@ -0,0 +1,153 @@
+Using talloc in Samba4
+==
+
+.. contents::
+
+Jelmer Vernooij
+August 2013
+
+The most current version of this document is available at
+   http://samba.org/ftp/unpacked/talloc/pytalloc_guide.txt
+
+pytalloc is a small library that provides glue for wrapping
+talloc-allocated objects from C in Python objects.
+
+What is pytalloc, and what is it not?
+-
+
+pytalloc is merely a helper library - it provides a convenient base type object
+for objects that wrap talloc-maintained memory in C. It won't write your
+bindings for you but it will make it easier to write C bindings that involve
+talloc, and take away some of the boiler plate.
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+pytalloc_Object
+
+This is the new base class that all Python objects that wrap talloc pointers
+derive from. It is itself a subclass of the Object type that all objects
+in Python derive from.
+
+Note that you will almost never create objects of the pytalloc_Object type
+itself, as they are just opaque pointers that can not be accessed from
+Python. A common pattern is other objects that subclass pytalloc_Object and
+rely on it for their memory management.
+
+Each `pytalloc_Object` wraps two core of information - a talloc context
+and a pointer. The pointer is the actual data that is wrapped. The talloc
+context is used for memory management purposes only; when the wrapping Python 
object
+goes away, it unlinks the talloc context. The talloc context pointer and the 
ptr
+can (and often do) have the same value.
+
+Each pytalloc_Object has a custom __repr__ implementation that
+describes that it is a talloc object and the location of the
+pointer it is wrapping. it also has a custom __cmp__/__eq__/__neq__ method that
+compares the pointers the object is wrapping rather than the objects
+themselves (since there can be multiple objects that wrap the same talloc
+pointer).
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+PyTypeObject *pytalloc_GetObjectType(void)
+
+Obtain a reference to the PyTypeObject for `pytalloc_Object`. The reference
+counter for the object will be incremented, so the caller will have to
+decrement it when it no longer needs it (using `Py_DECREF`).
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-==-=-=-=-=-=-=-=-=-=-=-
+int pytalloc_Check(PyObject *)
+
+Check whether a specific object is a talloc Object. Returns non-zero if it is
+a pytalloc_Object and zero otherwise.
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+type *pytalloc_get_type(PyObject *py_obj, type)
+
+Retrieve the pointer from a `pytalloc_Object` py_obj. type should be a
+C type, similar to a type passed to `talloc_get_type`.
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+pytalloc_get_ptr(PyObject *py_obj)
+
+Retrieve the pointer from a `pytalloc_Object` py_obj. There is no
+type checking - use `pytalloc_get_type` if possible.
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+TALLOC_CTX *pytalloc_get_mem_ctx(PyObject *py_obj)
+
+Retrieve the talloc context associated with a pytalloc_Object

[SCM] Samba Shared Repository - branch master updated

2013-11-16 Thread Jelmer Vernooij

The branch, master has been updated
   via  c0d897e Release ntdb 1.0.
  from  d02d702 s3-libnet: Use a const char for realm.

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


- Log -
commit c0d897e2ebe1dcb82c212bf3c4ea52de01e29861
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Nov 15 21:40:36 2013 +

Release ntdb 1.0.

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Sat Nov 16 19:06:59 CET 2013 on sn-devel-104

---

Summary of changes:
 lib/ntdb/ABI/{ntdb-0.9.sigs = ntdb-1.0.sigs} |0
 lib/ntdb/wscript  |2 +-
 2 files changed, 1 insertions(+), 1 deletions(-)
 copy lib/ntdb/ABI/{ntdb-0.9.sigs = ntdb-1.0.sigs} (100%)


Changeset truncated at 500 lines:

diff --git a/lib/ntdb/ABI/ntdb-0.9.sigs b/lib/ntdb/ABI/ntdb-1.0.sigs
similarity index 100%
copy from lib/ntdb/ABI/ntdb-0.9.sigs
copy to lib/ntdb/ABI/ntdb-1.0.sigs
diff --git a/lib/ntdb/wscript b/lib/ntdb/wscript
index ce66c92..de67615 100644
--- a/lib/ntdb/wscript
+++ b/lib/ntdb/wscript
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 APPNAME = 'ntdb'
-VERSION = '0.9'
+VERSION = '1.0'
 
 blddir = 'bin'
 


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2013-05-25 Thread Jelmer Vernooij

The branch, master has been updated
   via  92254d0 pidl: Recent Perl warns about defined(@var) constructs.
  from  39d7982 building RPMs on RHEL fail because of a typo.

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


- Log -
commit 92254d09e0ee5a7d9d0cd91fe1803f54e64d9a5f
Author: Vadim Zhukov persg...@gmail.com
Date:   Sat May 25 15:19:24 2013 +0100

pidl: Recent Perl warns about defined(@var) constructs.

Signed-off-by: Jelmer Vernooij jel...@samba.org

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Sat May 25 18:10:53 CEST 2013 on sn-devel-104

---

Summary of changes:
 pidl/lib/Parse/Pidl/ODL.pm |2 +-
 pidl/pidl  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/pidl/lib/Parse/Pidl/ODL.pm b/pidl/lib/Parse/Pidl/ODL.pm
index 74d9ac7..14e77fa 100644
--- a/pidl/lib/Parse/Pidl/ODL.pm
+++ b/pidl/lib/Parse/Pidl/ODL.pm
@@ -70,7 +70,7 @@ sub ODL2IDL
next;
}
my $podl = 
Parse::Pidl::IDL::parse_file($idl_path, $opt_incdirs);
-   if (defined(@$podl)) {
+   if (defined($podl)) {
require Parse::Pidl::Typelist;
my $basename = basename($idl_path, 
.idl);
 
diff --git a/pidl/pidl b/pidl/pidl
index 2a46e92..c65092e 100755
--- a/pidl/pidl
+++ b/pidl/pidl
@@ -605,7 +605,7 @@ sub process_file($)
require Parse::Pidl::IDL;
 
$pidl = Parse::Pidl::IDL::parse_file($idl_file, \@opt_incdirs);
-   defined @$pidl || die Failed to parse $idl_file;
+   defined $pidl || die Failed to parse $idl_file;
}
 
require Parse::Pidl::Typelist;


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-12-27 Thread Jelmer Vernooij

The branch, master has been updated
   via  bcacd8f subunit: Update to latest upstream version.
   via  983a3ea testtools: Update to latest upstream version.
  from  2495752 lib/param: use the correct path names again

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


- Log -
commit bcacd8fc80f8b366566d576fd654856930cfc4a4
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Dec 26 22:11:13 2012 +0100

subunit: Update to latest upstream version.

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Thu Dec 27 21:08:32 CET 2012 on sn-devel-104

commit 983a3ea437d76b769b82726cc602d26e0e57894a
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Dec 26 22:11:04 2012 +0100

testtools: Update to latest upstream version.

---

Summary of changes:
 lib/subunit/INSTALL|2 +-
 lib/subunit/MANIFEST.in|1 -
 lib/subunit/Makefile.am|3 +
 lib/subunit/NEWS   |   13 ++
 lib/subunit/README |   13 ++
 lib/subunit/configure.ac   |2 +-
 lib/subunit/python/subunit/__init__.py |   29 -
 lib/subunit/python/subunit/run.py  |   15 ++-
 lib/subunit/python/subunit/test_results.py |7 +
 .../python/subunit/tests/test_test_protocol.py |   15 ++-
 .../python/subunit/tests/test_test_results.py  |6 +
 lib/subunit/runtests.py|2 +-
 lib/subunit/setup.py   |5 +-
 lib/testtools/LICENSE  |1 +
 lib/testtools/NEWS |   52 
 lib/testtools/doc/for-framework-folk.rst   |   11 ++
 lib/testtools/doc/for-test-authors.rst |2 +-
 lib/testtools/setup.py |4 +-
 lib/testtools/testtools/__init__.py|2 +-
 lib/testtools/testtools/content.py |   19 ++-
 lib/testtools/testtools/matchers/_higherorder.py   |   20 +++
 lib/testtools/testtools/run.py |   35 -
 lib/testtools/testtools/testresult/doubles.py  |   18 +++
 lib/testtools/testtools/testresult/real.py |  136 +++-
 lib/testtools/testtools/tests/helpers.py   |4 +
 .../testtools/tests/matchers/test_higherorder.py   |   33 +
 lib/testtools/testtools/tests/test_content.py  |   35 +
 lib/testtools/testtools/tests/test_distutilscmd.py |   21 ++--
 lib/testtools/testtools/tests/test_run.py  |   46 ++-
 lib/testtools/testtools/tests/test_testresult.py   |   55 
 lib/testtools/testtools/tests/test_testsuite.py|   32 +-
 lib/testtools/testtools/testsuite.py   |   40 ++-
 32 files changed, 604 insertions(+), 75 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/subunit/INSTALL b/lib/subunit/INSTALL
index 2a053d8..eeea734 100644
--- a/lib/subunit/INSTALL
+++ b/lib/subunit/INSTALL
@@ -14,7 +14,7 @@ Dependencies
 * Python for the filters
 * 'testtools' (On Debian and Ubuntu systems the 'python-testtools' package,
   the testtools package on pypi, or https://launchpad.net/testtools) for
-  the extended test API which permits attachments. Version 0.9.11 or newer is 
+  the extended test API which permits attachments. Version 0.9.23 or newer is 
   required. Of particular note, http://testtools.python-hosting.com/ is not
   the testtools you want.
 * A C compiler for the C bindings
diff --git a/lib/subunit/MANIFEST.in b/lib/subunit/MANIFEST.in
index 7c449cf..eb98981 100644
--- a/lib/subunit/MANIFEST.in
+++ b/lib/subunit/MANIFEST.in
@@ -16,6 +16,5 @@ exclude missing
 prune perl
 exclude py-compile
 prune shell
-prune python/iso8601
 exclude stamp-h1
 include NEWS
diff --git a/lib/subunit/Makefile.am b/lib/subunit/Makefile.am
index 310c042..da16020 100644
--- a/lib/subunit/Makefile.am
+++ b/lib/subunit/Makefile.am
@@ -35,6 +35,7 @@ EXTRA_DIST =  \
python/subunit/tests/test_test_protocol.py \
python/subunit/tests/test_test_results.py \
runtests.py \
+   setup.py \
shell/README \
shell/share/subunit.sh \
shell/subunit-ui.patch \
@@ -48,8 +49,10 @@ include_subunitdir = $(includedir)/subunit
 dist_bin_SCRIPTS = \
filters/subunit-filter \
filters/subunit-ls \
+   filters/subunit-notify \
filters/subunit-stats \
filters/subunit-tags \
+   filters/subunit2csv \
filters/subunit2gtk \
filters/subunit2junitxml \
filters/subunit2pyunit \
diff --git a/lib/subunit/NEWS b/lib/subunit/NEWS
index f28ec5a..081dc5d 100644
--- a/lib/subunit/NEWS
+++ b/lib/subunit/NEWS
@@ -5,12 +5,25 @@ subunit release notes
 NEXT (In development

[SCM] Samba Shared Repository - branch master updated

2012-12-26 Thread Jelmer Vernooij

The branch, master has been updated
   via  f2a6afb selftest.pl: Fix typo 'snprintf' - 'sprintf'.
   via  e1a819e wafsamba: python-config is not always a script.
  from  c1fb37d Recent coverity changes added directory_create_or_exist() 
checks to many directories.

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


- Log -
commit f2a6afb87e8b968681fbe0a178e76cddc680953f
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Dec 15 22:16:28 2012 +0100

selftest.pl: Fix typo 'snprintf' - 'sprintf'.

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Wed Dec 26 22:35:12 CET 2012 on sn-devel-104

commit e1a819ea18aa3ecfcddb76ec681f520db162338e
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Dec 16 15:01:53 2012 +0100

wafsamba: python-config is not always a script.

---

Summary of changes:
 buildtools/wafadmin/Tools/python.py |2 +-
 selftest/selftest.pl|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafadmin/Tools/python.py 
b/buildtools/wafadmin/Tools/python.py
index c2af312..a15e1f6 100644
--- a/buildtools/wafadmin/Tools/python.py
+++ b/buildtools/wafadmin/Tools/python.py
@@ -259,7 +259,7 @@ MACOSX_DEPLOYMENT_TARGET = %r
 
includes = []
if python_config:
-   for incstr in Utils.cmd_output(%s %s --includes % (python, 
python_config)).strip().split():
+   for incstr in Utils.cmd_output(%s --includes % 
(python_config,)).strip().split():
# strip the -I or /I
if (incstr.startswith('-I')
or incstr.startswith('/I')):
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index ffb6149..c6eadd7 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -886,7 +886,7 @@ $envvarstr
if ($? == -1) {
die(Unable to run $cmd: $!);
} elsif ($?  127) {
-   die(snprintf(%s died with signal %d, %s coredump\n, 
$cmd, ($?  127),  ($?  128) ? 'with' : 'without'));
+   die(sprintf(%s died with signal %d, %s coredump\n, 
$cmd, ($?  127),  ($?  128) ? 'with' : 'without'));
}
 
my $exitcode = $?  8;


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-12-15 Thread Jelmer Vernooij

The branch, master has been updated
   via  6127ba8 s3fs: make the log warning go away
   via  d4c3f54 tdr: Strip trailing whitespace.
  from  229d934 s4-libnet: Fix setting the group handle and return codes.

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


- Log -
commit 6127ba853b8288be60adc70bc0ea084f26e216f7
Author: Ricky Nance ricky.na...@weaubleau.k12.mo.us
Date:   Thu Dec 13 20:52:46 2012 -0600

s3fs: make the log warning go away

standard input is not a socket, assuming -D option

Signed-off-by: Jelmer Vernooij jel...@samba.org

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Sat Dec 15 17:50:23 CET 2012 on sn-devel-104

commit d4c3f54bbf6053783a221da84b5dbf249cdf05e7
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Oct 26 06:55:04 2012 -0800

tdr: Strip trailing whitespace.

---

Summary of changes:
 file_server/file_server.c |1 +
 lib/tdr/tdr.c |   20 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/file_server/file_server.c b/file_server/file_server.c
index 430782c..5d44d5a 100644
--- a/file_server/file_server.c
+++ b/file_server/file_server.c
@@ -67,6 +67,7 @@ static void s3fs_task_init(struct task_server *task)
/* start it as a child process */
subreq = samba_runcmd_send(task, task-event_ctx, timeval_zero(), 1, 0,
smbd_cmd,
+   -D,
--option=server role check:inhibit=yes,
--foreground,

debug_get_output_is_stdout()?--log-stdout:NULL,
diff --git a/lib/tdr/tdr.c b/lib/tdr/tdr.c
index 616cc98..95ef982 100644
--- a/lib/tdr/tdr.c
+++ b/lib/tdr/tdr.c
@@ -1,21 +1,21 @@
-/* 
+/*
Unix SMB/CIFS implementation.
 
TDR (Trivial Data Representation) helper functions
  Based loosely on ndr.c by Andrew Tridgell.
 
Copyright (C) Jelmer Vernooij 2005
-   
+
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/.
 */
@@ -162,7 +162,7 @@ NTSTATUS tdr_pull_charset(struct tdr_pull *tdr, TALLOC_CTX 
*ctx, const char **v,
}
 
TDR_PULL_NEED_BYTES(tdr, el_size*length);
-   
+
if (!convert_string_talloc(ctx, chset, CH_UNIX, 
tdr-data.data+tdr-offset, el_size*length, discard_const_p(void *, v), ret)) {
return NT_STATUS_INVALID_PARAMETER;
}
@@ -193,9 +193,9 @@ NTSTATUS tdr_push_charset(struct tdr_push *tdr, const char 
**v, uint32_t length,
if (size  required) {
memset(tdr-data.data+tdr-data.length+size, 0, required-size);
}
-   
+
tdr-data.length += required;
-
+
return NT_STATUS_OK;
 }
 
@@ -297,7 +297,7 @@ NTSTATUS tdr_print_DATA_BLOB(struct tdr_print *tdr, const 
char *name, DATA_BLOB
 #define TDR_ALIGN(l,n) (((l)  ((n)-1)) == 0?0:((n)-((l)((n)-1
 
 /*
-  push a DATA_BLOB onto the wire. 
+  push a DATA_BLOB onto the wire.
 */
 NTSTATUS tdr_push_DATA_BLOB(struct tdr_push *tdr, DATA_BLOB *blob)
 {
@@ -310,13 +310,13 @@ NTSTATUS tdr_push_DATA_BLOB(struct tdr_push *tdr, 
DATA_BLOB *blob)
}
 
TDR_PUSH_NEED_BYTES(tdr, blob-length);
-   
+
memcpy(tdr-data.data+tdr-data.length, blob-data, blob-length);
return NT_STATUS_OK;
 }
 
 /*
-  pull a DATA_BLOB from the wire. 
+  pull a DATA_BLOB from the wire.
 */
 NTSTATUS tdr_pull_DATA_BLOB(struct tdr_pull *tdr, TALLOC_CTX *ctx, DATA_BLOB 
*blob)
 {


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-12-07 Thread Jelmer Vernooij

The branch, master has been updated
   via  b4ae73f samba-tool processes: Make the output a bit neater
  from  df0f59f winbind: Make the code more readable in 
trustdom_list_done().

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


- Log -
commit b4ae73f58c48b3502147332ee4c72621867fffb3
Author: Ricky Nance ricky.na...@weaubleau.k12.mo.us
Date:   Fri Dec 7 18:43:16 2012 -0600

samba-tool processes: Make the output a bit neater

Reviewed-By: Jelmer Vernooij jel...@samba.org

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Sat Dec  8 03:34:29 CET 2012 on sn-devel-104

---

Summary of changes:
 source4/scripting/python/samba/netcmd/processes.py |   10 +-
 1 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/netcmd/processes.py 
b/source4/scripting/python/samba/netcmd/processes.py
index 751ab94..b25a2e4 100644
--- a/source4/scripting/python/samba/netcmd/processes.py
+++ b/source4/scripting/python/samba/netcmd/processes.py
@@ -62,17 +62,17 @@ class cmd_processes(Command):
 if name is not None:
 ids = msg_ctx.irpc_servers_byname(name)
 for server_id in ids:
-print %d\n % server_id.pid
+self.outf.write(%d\n % server_id.pid)
 elif pid is not None:
 names = msg_ctx.irpc_all_servers()
 for name in names:
 for server_id in name.ids:
 if server_id.pid == int(pid):
-print %s\n % name.name
+self.outf.write(%s\n % name.name)
 else:
 names = msg_ctx.irpc_all_servers()
+self.outf.write( Service:PID \n)
+self.outf.write(-\n)
 for name in names:
-print %s:  % name.name
 for server_id in name.ids:
-print %d  % server_id.pid
-print \n
+self.outf.write(%-16s  %6d\n % (name.name, 
server_id.pid))


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-12-05 Thread Jelmer Vernooij

The branch, master has been updated
   via  2618d67 wsgi: Serve '500 Internal Server Error' page when errors 
occur.
   via  ad252fb web_server: Make second argument to websrv_output const.
   via  12c72a3 wsgi: When encountering error in Python code, print 
traceback to logs.
  from  2ad5620 BUG 9459: Install manpages only if we install the target.

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


- Log -
commit 2618d67fe5eda1e86f90de2fcde90c048fbcd50b
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Nov 24 20:44:23 2012 +0100

wsgi: Serve '500 Internal Server Error' page when errors occur.

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Wed Dec  5 18:40:25 CET 2012 on sn-devel-104

commit ad252fb2f5b403001a283aff58773b8b429be145
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Nov 24 20:44:08 2012 +0100

web_server: Make second argument to websrv_output const.

commit 12c72a38359cb81328c5c57a8d6b6fb9920aebe6
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Nov 24 19:35:33 2012 +0100

wsgi: When encountering error in Python code, print traceback to logs.

Signed-off-by: Jelmer Vernooij jel...@samba.org

---

Summary of changes:
 source4/web_server/web_server.c |2 +-
 source4/web_server/web_server.h |2 +-
 source4/web_server/wsgi.c   |   80 ++
 3 files changed, 73 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/web_server/web_server.c b/source4/web_server/web_server.c
index 99a6b65..239612a 100644
--- a/source4/web_server/web_server.c
+++ b/source4/web_server/web_server.c
@@ -93,7 +93,7 @@ void websrv_output_headers(struct websrv_context *web, const 
char *status, struc
data_blob_free(b);
 }
 
-void websrv_output(struct websrv_context *web, void *data, size_t length)
+void websrv_output(struct websrv_context *web, const void *data, size_t length)
 {
data_blob_append(web, web-output.content, data, length);
TEVENT_FD_NOT_READABLE(web-conn-event.fde);
diff --git a/source4/web_server/web_server.h b/source4/web_server/web_server.h
index 274a54a..9f21359 100644
--- a/source4/web_server/web_server.h
+++ b/source4/web_server/web_server.h
@@ -67,7 +67,7 @@ struct websrv_context {
 bool wsgi_initialize(struct web_server_data *wdata);
 void http_error(struct websrv_context *web, const char *status, const char 
*info);
 void websrv_output_headers(struct websrv_context *web, const char *status, 
struct http_header *headers);
-void websrv_output(struct websrv_context *web, void *data, size_t length);
+void websrv_output(struct websrv_context *web, const void *data, size_t 
length);
 NTSTATUS http_parse_header(struct websrv_context *web, const char *line);
 
 #endif /* __WEB_SERVER_H__ */
diff --git a/source4/web_server/wsgi.c b/source4/web_server/wsgi.c
index 00c9535..17ad65a 100644
--- a/source4/web_server/wsgi.c
+++ b/source4/web_server/wsgi.c
@@ -134,7 +134,7 @@ static PyObject *py_error_write(PyObject *self, PyObject 
*args, PyObject *kwargs
return NULL;
}
 
-   DEBUG(0, (WSGI App: %s, str));
+   DEBUG(0, (%s, str));
 
Py_RETURN_NONE;
 }
@@ -147,11 +147,11 @@ static PyObject *py_error_writelines(PyObject *self, 
PyObject *args, PyObject *k
if (!PyArg_ParseTupleAndKeywords(args, kwargs, O:writelines, 
discard_const_p(char *, kwnames), seq)) {
return NULL;
}
-   
+
while ((item = PyIter_Next(seq))) {
char *str = PyString_AsString(item);
 
-   DEBUG(0, (WSGI App: %s, str));
+   DEBUG(0, (%s, str));
}
 
Py_RETURN_NONE;
@@ -260,6 +260,49 @@ static PyObject *Py_ErrorHttpStream(void)
return (PyObject *)ret;
 }
 
+static void DEBUG_Print_PyError(int level, const char *message)
+{
+   PyObject *old_stderr, *new_stderr;
+   PyObject *sys_module;
+   PyObject *ptype, *pvalue, *ptb;
+
+   PyErr_Fetch(ptype, pvalue, ptb);
+
+   DEBUG(0, (WSGI: Server exception occurred: %s\n, message));
+
+   sys_module = PyImport_ImportModule(sys);
+   if (sys_module == NULL) {
+   DEBUG(0, (Unable to obtain sys module while printing error));
+   return;
+   }
+
+   old_stderr = PyObject_GetAttrString(sys_module, stderr);
+   if (old_stderr == NULL) {
+   DEBUG(0, (Unable to obtain old stderr));
+   Py_DECREF(sys_module);
+   return;
+   }
+
+   new_stderr = Py_ErrorHttpStream();
+   if (new_stderr == NULL) {
+   DEBUG(0, (Unable to create error stream));
+   Py_DECREF(sys_module);
+   Py_DECREF(old_stderr);
+   return;
+   }
+
+   PyObject_SetAttrString(sys_module, stderr, new_stderr

[SCM] Samba Shared Repository - branch master updated

2012-11-21 Thread Jelmer Vernooij

The branch, master has been updated
   via  831a9f8 s4/web_server: Fix typo in URL.
  from  d6983f4 s3:smbd/aio do not mark file modified during reads

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


- Log -
commit 831a9f8f6dc7057855b75128bf14ed9d4a03ab26
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Nov 21 22:56:57 2012 +

s4/web_server: Fix typo in URL.

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Thu Nov 22 01:37:02 CET 2012 on sn-devel-104

---

Summary of changes:
 .../scripting/python/samba/web_server/__init__.py  |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/web_server/__init__.py 
b/source4/scripting/python/samba/web_server/__init__.py
index c439240..ed3c7de 100644
--- a/source4/scripting/python/samba/web_server/__init__.py
+++ b/source4/scripting/python/samba/web_server/__init__.py
@@ -35,7 +35,7 @@ def render_placeholder(environ, start_response):
 yield pWelcome to this Samba web server./p\n
 yield pThis page is a simple placeholder. You probably want to install 
 yield SWAT. More information can be found 
-yield a href='http://wiki.samba.org/index.php/SWAT'on the wiki/a./p
+yield a href='http://wiki.samba.org/index.php/SWAT2'on the 
wiki/a./p
 yield /p\n
 yield /body\n
 yield /html\n


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-11-14 Thread Jelmer Vernooij

The branch, master has been updated
   via  a53caea subunit: Update to latest upstream version.
   via  7b654a8 testtools: Update to latest version.
  from  d10c737 smbd_open_one_socket does not use the messaging_context 
variable so why pass it in?

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


- Log -
commit a53caea7a27c8616cabfc2e5bdf91a90e35891d5
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Nov 14 09:47:16 2012 +0100

subunit: Update to latest upstream version.

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Wed Nov 14 12:11:58 CET 2012 on sn-devel-104

commit 7b654a8c180a6467147189332916a5e56634b5af
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Nov 14 09:46:53 2012 +0100

testtools: Update to latest version.

---

Summary of changes:
 lib/subunit/Makefile.am|2 +
 lib/subunit/NEWS   |   37 +-
 lib/subunit/configure.ac   |2 +-
 lib/subunit/filters/subunit-filter |  148 ++-
 lib/subunit/filters/subunit-notify |   53 +-
 lib/subunit/filters/subunit2csv|   23 +
 lib/subunit/filters/subunit2junitxml   |   42 +-
 lib/subunit/perl/Makefile.PL.in|1 +
 lib/subunit/python/subunit/__init__.py |   71 +-
 lib/subunit/python/subunit/filters.py  |  125 ++
 lib/subunit/python/subunit/iso8601.py  |2 +-
 lib/subunit/python/subunit/test_results.py |  404 +--
 lib/subunit/python/subunit/tests/sample-script.py  |   20 +-
 .../python/subunit/tests/sample-two-script.py  |8 +-
 lib/subunit/python/subunit/tests/test_run.py   |4 +-
 .../python/subunit/tests/test_subunit_filter.py|  170 +++-
 .../python/subunit/tests/test_test_protocol.py |   38 +-
 .../python/subunit/tests/test_test_results.py  |  272 -
 lib/subunit/runtests.py|2 +-
 lib/subunit/setup.py   |   25 +-
 lib/subunit/shell/tests/test_function_output.sh|   12 +-
 lib/testtools/.testr.conf  |2 +-
 lib/testtools/MANIFEST.in  |2 -
 lib/testtools/NEWS |  213 
 lib/testtools/README   |5 +-
 lib/testtools/doc/for-framework-folk.rst   |8 +
 lib/testtools/doc/for-test-authors.rst |   21 +
 lib/testtools/doc/hacking.rst  |9 +-
 lib/testtools/doc/index.rst|5 +-
 lib/testtools/doc/overview.rst |   10 +-
 lib/testtools/scripts/all-pythons  |2 +-
 lib/testtools/setup.py |   11 +-
 lib/testtools/testtools/__init__.py|   12 +-
 lib/testtools/testtools/_compat3x.py   |2 +-
 lib/testtools/testtools/compat.py  |1 -
 lib/testtools/testtools/content.py |   91 ++-
 lib/testtools/testtools/content_type.py|6 +-
 lib/testtools/testtools/deferredruntest.py |2 +-
 lib/testtools/testtools/helpers.py |   34 +-
 lib/testtools/testtools/matchers.py| 1284 ---
 lib/testtools/testtools/matchers/__init__.py   |  113 ++
 lib/testtools/testtools/matchers/_basic.py |  315 +
 .../testtools/matchers/_datastructures.py  |  228 
 lib/testtools/testtools/matchers/_dict.py  |  259 
 lib/testtools/testtools/matchers/_doctest.py   |  104 ++
 lib/testtools/testtools/matchers/_exception.py |  124 ++
 lib/testtools/testtools/matchers/_filesystem.py|  192 +++
 lib/testtools/testtools/matchers/_higherorder.py   |  269 
 lib/testtools/testtools/matchers/_impl.py  |  175 +++
 lib/testtools/testtools/run.py |2 +-
 lib/testtools/testtools/tags.py|   34 +
 lib/testtools/testtools/testcase.py|   98 +-
 lib/testtools/testtools/testresult/__init__.py |8 +-
 lib/testtools/testtools/testresult/doubles.py  |   21 +
 lib/testtools/testtools/testresult/real.py |  348 +-
 lib/testtools/testtools/tests/__init__.py  |6 +-
 lib/testtools/testtools/tests/helpers.py   |   36 +-
 lib/testtools/testtools/tests/matchers/__init__.py |   29 +
 lib/testtools/testtools/tests/matchers/helpers.py  |   42 +
 .../testtools/tests/matchers/test_basic.py |  374 ++
 .../tests/matchers/test_datastructures.py  |  209 +++
 .../testtools/tests/matchers/test_dict.py  |  222 
 .../testtools/tests/matchers/test_doctest.py   |   82 ++
 .../testtools/tests/matchers/test_exception.py |  192

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

2012-11-11 Thread Jelmer Vernooij

On Sun, Nov 11, 2012 at 03:49:02PM +0100, Andrew Bartlett wrote:
 The branch, master has been updated
via  1d81e52 selftest: Add tests for expected behaviour on directories 
 as well as files
via  a6a0155 pysmbd: Add SMB_ACL_EXECUTE to the mask set by 
 make_simple_acl()
via  312f8dd selftest: Make samba.tests.ntacl also use 
 TestCaseInTempDir
via  b4d8629 samba-tool: Rework ldap attribute fetch in classicupgrade 
 for missing attributes
   from  c06d602 s3:smbd: Fix typo in got_duplicate_group check
 
 http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
 
 
 - Log -
 commit 1d81e52bba65f05378db7027537aa27eb5bfa70a
 Author: Andrew Bartlett abart...@samba.org
 Date:   Sun Nov 11 21:33:41 2012 +1100
 
 selftest: Add tests for expected behaviour on directories as well as files
 
 This is important because it covers the codepath which had the talloc
 error fixed by commit 60cf4cb5a630506747431ecbf00d890509baf2f3
 (vfs_acl_common: In add_directory_inheritable_components allocate on
 psd as parent)
 
 Andrew Bartlett
 
 Signed-off-by: Andrew Bartlett abart...@samba.org
 Reviewed-by: Jelmer Vernooij jel...@samba.org
 Reviewed-by: Andrew Bartlett abart...@samba.org
You've reviewed your own changes ? I'm shocked. :-) Is this a
script gone crazy perhaps ?

Cheers,

Jelmer

[SCM] Samba Shared Repository - branch master updated

2012-11-09 Thread Jelmer Vernooij

The branch, master has been updated
   via  ec0104b Makefile: Allow specifying PYTHON environment variable.
   via  010fd29 configure: Support specifying PYTHON environment variable 
to run waf.
  from  702049e torture: Fix smb2.create.blob test.

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


- Log -
commit ec0104b1e0eea73331c58d26ea96b5167c2847ed
Author: Jelmer Vernooij jel...@samba.org
Date:   Tue Nov 6 22:29:07 2012 +0100

Makefile: Allow specifying PYTHON environment variable.

This is required for Minix, where python is named python2.X.

Reviewed-by: Simo Sorce i...@samba.org
Signed-off-by: Jelmer Vernooij jel...@samba.org

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Fri Nov  9 16:39:09 CET 2012 on sn-devel-104

commit 010fd296881aa643a4b631d57df503c9e832b35c
Author: Jelmer Vernooij jel...@samba.org
Date:   Tue Nov 6 22:24:07 2012 +0100

configure: Support specifying PYTHON environment variable to run waf.

This is necessary to run configure on Minix, where python is named
python2.X.

Reviewed-by: Simo Sorce i...@samba.org
Signed-off-by: Jelmer Vernooij jel...@samba.org

---

Summary of changes:
 Makefile  |3 ++-
 configure |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/Makefile b/Makefile
index ae2fc06..5f220fa 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 # simple makefile wrapper to run waf
 
-WAF_BINARY=./buildtools/bin/waf
+PYTHON?=python
+WAF_BINARY=$(PYTHON) ./buildtools/bin/waf
 WAF=WAF_MAKE=1 $(WAF_BINARY)
 
 all:
diff --git a/configure b/configure
index 72f758e..30858df 100755
--- a/configure
+++ b/configure
@@ -10,5 +10,5 @@ JOBS=1
 export JOBS
 
 cd . || exit 1
-$WAF configure $@ || exit 1
+${PYTHON:=python} $WAF configure $@ || exit 1
 cd $PREVPATH


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-11-06 Thread Jelmer Vernooij

The branch, master has been updated
   via  da284b3 heimdal_build: Fix finding of system heimdal.
   via  9cf985c heimdal_build: HEIMDAL_LIBRARY(): Remove unused cflags 
argument.
  from  47bbf98 selftest/skip: add samba.tests.samba_tool.gpo until it's 
stable

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


- Log -
commit da284b3765e3c73d204fe2c8b45d6fbd2c08d451
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Nov 5 23:38:23 2012 +0100

heimdal_build: Fix finding of system heimdal.

When checking for Heimdal headers, make sure HAVE_CONFIG_H is not
defined, as config.h will not be available.

Reviewed-by: Andrew Bartlett abart...@samba.org
Signed-off-by: Jelmer Vernooij jel...@samba.org

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Tue Nov  6 16:27:03 CET 2012 on sn-devel-104

commit 9cf985c53eb1a4bbe8b8110f123744291026cee6
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Nov 5 23:33:21 2012 +0100

heimdal_build: HEIMDAL_LIBRARY(): Remove unused cflags argument.

---

Summary of changes:
 source4/heimdal_build/wscript_build |3 +-
 source4/heimdal_build/wscript_configure |   55 --
 2 files changed, 30 insertions(+), 28 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/heimdal_build/wscript_build 
b/source4/heimdal_build/wscript_build
index 3dfeb2b..f4837ac 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -209,7 +209,7 @@ def HEIMDAL_GENERATOR(name, rule, source='', target='',
 name=name)
 
 
-def HEIMDAL_LIBRARY(libname, source, deps, vnum, version_script, includes='', 
cflags=''):
+def HEIMDAL_LIBRARY(libname, source, deps, vnum, version_script, includes=''):
 '''define a Heimdal library'''
 
 obj_target = libname + '.objlist'
@@ -221,7 +221,6 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum, 
version_script, includes='', cf
 source = source,
 deps   = deps,
 includes   = includes,
-cflags = cflags,
 group  = 'main')
 
 if not SET_TARGET_TYPE(bld, libname, LIBRARY):
diff --git a/source4/heimdal_build/wscript_configure 
b/source4/heimdal_build/wscript_configure
index ea854f2..168be6d 100755
--- a/source4/heimdal_build/wscript_configure
+++ b/source4/heimdal_build/wscript_configure
@@ -203,26 +203,31 @@ if check_system_heimdal_lib(roken, 
rk_socket_set_reuseaddr, roken.h):
 conf.env.LIBPATH_ROKEN_HOSTCC = conf.env.LIBPATH_ROKEN
 conf.env.LIB_ROKEN_HOSTCC = roken
 conf.SET_TARGET_TYPE(ROKEN_HOSTCC, 'SYSLIB')
-check_system_heimdal_lib(wind, wind_stringprep, wind.h, onlyif=roken)
-check_system_heimdal_lib(hx509, hx509_bitstring_print, hx509.h, 
onlyif=roken wind)
-check_system_heimdal_lib(asn1, initialize_asn1_error_table, asn1_err.h, 
onlyif=roken com_err)
-check_system_heimdal_lib(heimbase, heim_cmp, heimbase.h, onlyif=roken)
-check_system_heimdal_lib(hcrypto, MD4_Init, hcrypto/md4.h,
-onlyif=asn1 roken com_err)
-if check_system_heimdal_lib(krb5, krb5_anyaddr, krb5.h,
-onlyif=roken wind asn1 hx509 hcrypto com_err heimbase):
-conf.CHECK_FUNCS_IN('krb5_free_unparsed_name', 'krb5', headers=krb5.h)
-check_system_heimdal_lib(gssapi, gss_oid_to_name, gssapi.h,
-onlyif=hcrypto asn1 roken krb5 com_err wind)
-check_system_heimdal_lib(heimntlm, heim_ntlm_ntlmv2_key, heimntlm.h,
-onlyif=roken hcrypto krb5)
-if check_system_heimdal_lib(hdb, hdb_db_dir, krb5.h hdb.h,
-onlyif=roken krb5 hcrypto com_err wind):
-CCDEFINES = list(conf.env.CCDEFINES)
-conf.undefine(HAVE_CONFIG_H)
-while HAVE_CONFIG_H=1 in conf.env.CCDEFINES:
-conf.env.CCDEFINES.remove(HAVE_CONFIG_H=1)
-try:
+
+# Make sure HAVE_CONFIG_H is unset, as the system Heimdal headers use it
+# and include config.h if it is set, resulting in failure (since config.h
+# doesn't yet exist)
+
+CCDEFINES = list(conf.env.CCDEFINES)
+conf.undefine(HAVE_CONFIG_H)
+while HAVE_CONFIG_H=1 in conf.env.CCDEFINES:
+conf.env.CCDEFINES.remove(HAVE_CONFIG_H=1)
+try:
+check_system_heimdal_lib(wind, wind_stringprep, wind.h, 
onlyif=roken)
+check_system_heimdal_lib(hx509, hx509_bitstring_print, hx509.h, 
onlyif=roken wind)
+check_system_heimdal_lib(asn1, initialize_asn1_error_table, 
asn1_err.h, onlyif=roken com_err)
+check_system_heimdal_lib(heimbase, heim_cmp, heimbase.h, 
onlyif=roken)
+check_system_heimdal_lib(hcrypto, MD4_Init, hcrypto/md4.h,
+onlyif=asn1 roken com_err)
+if check_system_heimdal_lib(krb5, krb5_anyaddr, krb5.h,
+onlyif=roken wind asn1 hx509 hcrypto com_err heimbase):
+conf.CHECK_FUNCS_IN('krb5_free_unparsed_name', 'krb5', 
headers=krb5.h

[SCM] Samba Shared Repository - branch master updated

2012-10-27 Thread Jelmer Vernooij

The branch, master has been updated
   via  1326992 selftesthelpers: Fix detection of tap2subunit.
   via  8d397b6 TestCaseInTempDir: Use addCleanup rather than tearDown.
   via  67dd28f selftest: Add --random-order option.
   via  1190f38 source4.selftest.tests: Add FIXME about database 
verification.
   via  05dc5a3 selftesthelpers: Simplify detection of tap2subunit.
   via  fd607e0 source3.selftests.tests: Use common 
plansmbtorture4testsuite() function.
   via  efb27e2 source3.selftest.tests: Add suffix for 
smbclient3/ntlm_auth3.
   via  a841f0f source3.selftest.tests: Remove tabs.
   via  ea5e2b5 source4.selftest.tests: Add suffix for 
smbclient4/nmblookup4.
   via  5834582 selftesthelpers: Add function for printing smbtorture4 
version.
   via  8237e27 selftest: Move determining of smbtorture4 options to 
selftesthelpers.
   via  fcb7926 selftest/selftesthelpers: Share environment handling for 
extra smbtorture options.
   via  6bcb256 selftest/selftesthelpers.py: Share configuration variable, 
strip whitespace.
   via  4c4d3c8 selftesthelpers: Share code for listing smbtorture4 tests.
   via  868c8c0 source4.selftest.tests: Rename plansmbtorturesuite() to 
plansmbtorture4suite().
   via  55507d0 source4.selftest.tests: Consistent naming of smbtorture 
binary.
  from  2b4672f libcli/smb: fix unitialized padding in 
smb2_create_blob_push_one() (bug #9209)

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


- Log -
commit 13269923585888912e2433c15c0ca010a9897595
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Oct 26 17:31:40 2012 -0800

selftesthelpers: Fix detection of tap2subunit.

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Sat Oct 27 16:57:49 CEST 2012 on sn-devel-104

commit 8d397b69bb29b7a464b610bc46cedd6be01b2455
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Oct 26 15:58:06 2012 -0800

TestCaseInTempDir: Use addCleanup rather than tearDown.

commit 67dd28f3605db4cbdc5feacc1121ec3d7dd075a6
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Oct 26 15:53:57 2012 -0800

selftest: Add --random-order option.

commit 1190f385f72f68f22277c8b380f2d4c461c413a4
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Oct 26 14:40:09 2012 -0800

source4.selftest.tests: Add FIXME about database verification.

commit 05dc5a39a6ad4b1ffafc904faea3e8e40f6f5cde
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Oct 26 14:14:42 2012 -0800

selftesthelpers: Simplify detection of tap2subunit.

commit fd607e0a9eefb79130941e244435980afbbb4bf7
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Oct 26 14:06:47 2012 -0800

source3.selftests.tests: Use common plansmbtorture4testsuite() function.

commit efb27e29dadf58d2dec651ca3a0c108b4cf515ae
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Oct 26 14:00:07 2012 -0800

source3.selftest.tests: Add suffix for smbclient3/ntlm_auth3.

commit a841f0fced7abfb0f6d98390c07becdf49a91af5
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Oct 26 13:56:30 2012 -0800

source3.selftest.tests: Remove tabs.

commit ea5e2b56c14072eeaa785d05f1da4d439667e8b6
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Oct 26 13:52:55 2012 -0800

source4.selftest.tests: Add suffix for smbclient4/nmblookup4.

commit 58345820c078f79fe7f67b8e6f947691f7237641
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Oct 26 13:51:54 2012 -0800

selftesthelpers: Add function for printing smbtorture4 version.

commit 8237e2727da0d04b82cb3cf644dd337a4c77fe34
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Oct 26 13:38:32 2012 -0800

selftest: Move determining of smbtorture4 options to selftesthelpers.

commit fcb7926ce544a8d4b0e5aa6577fe21712b38bb53
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Oct 26 13:12:54 2012 -0800

selftest/selftesthelpers: Share environment handling for extra smbtorture 
options.

commit 6bcb25673bdc249f5a49ded912d90bc84b13809d
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Oct 26 13:09:45 2012 -0800

selftest/selftesthelpers.py: Share configuration variable, strip whitespace.

commit 4c4d3c86f0430d38f78d16dcb5d365b577ef4227
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Oct 26 13:03:32 2012 -0800

selftesthelpers: Share code for listing smbtorture4 tests.

commit 868c8c058306b66fb3baa4a36bfe91d6461805d5
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Oct 26 11:51:19 2012 -0800

source4.selftest.tests: Rename plansmbtorturesuite() to 
plansmbtorture4suite().

commit 55507d0612ecf2db34867eb6065fc5038ea81aa0
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Oct 26 11:50:41 2012 -0800

source4.selftest.tests: Consistent naming of smbtorture binary.

---

Summary of changes:
 selftest/selftest.pl

[SCM] Samba Shared Repository - branch master updated

2012-10-27 Thread Jelmer Vernooij

The branch, master has been updated
   via  a7b8d02 source3.selftest: Move last variables to selftesthelpers.
   via  6698098 source3.selftest: Move more variables to be in common.
  from  1326992 selftesthelpers: Fix detection of tap2subunit.

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


- Log -
commit a7b8d0260a55959c72614251db880fed04a48316
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Oct 27 05:31:06 2012 -0800

source3.selftest: Move last variables to selftesthelpers.

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Sat Oct 27 19:08:42 CEST 2012 on sn-devel-104

commit 66980989e5b28490cd7b04b576cf39d26f183b90
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Oct 27 05:23:57 2012 -0800

source3.selftest: Move more variables to be in common.

---

Summary of changes:
 selftest/selftesthelpers.py |   15 +++
 source3/selftest/tests.py   |   21 +
 2 files changed, 20 insertions(+), 16 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py
index 8d36356..cdbe975 100644
--- a/selftest/selftesthelpers.py
+++ b/selftest/selftesthelpers.py
@@ -29,6 +29,9 @@ def srcdir():
 def source4dir():
 return os.path.normpath(os.path.join(srcdir(), source4))
 
+def source3dir():
+return os.path.normpath(os.path.join(srcdir(), source3))
+
 def bindir():
 return os.path.normpath(os.getenv(BINDIR, ./bin))
 
@@ -192,6 +195,7 @@ def get_env_torture_options():
 
 
 samba4srcdir = source4dir()
+samba3srcdir = source3dir()
 bbdir = os.path.join(srcdir(), testprogs/blackbox)
 configuration = --configfile=$SMB_CONF_PATH
 
@@ -233,3 +237,14 @@ def plansmbtorture4testsuite(name, env, options, target, 
modname=None):
 
 def smbtorture4_testsuites(prefix):
 return filter(lambda x: x.startswith(prefix), smbtorture4_testsuite_list)
+
+
+smbclient3 = binpath('smbclient3')
+smbtorture3 = binpath('smbtorture3')
+ntlm_auth3 = binpath('ntlm_auth3')
+net = binpath('net')
+scriptdir = os.path.join(srcdir(), script/tests)
+
+wbinfo = binpath('wbinfo')
+dbwrap_tool = binpath('dbwrap_tool')
+vfstest = binpath('vfstest')
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 777a882..9b0527c 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -22,17 +22,6 @@ import os, sys
 sys.path.insert(0, os.path.normpath(os.path.join(os.path.dirname(__file__), 
../../selftest)))
 import selftesthelpers
 from selftesthelpers import *
-samba3srcdir = srcdir() + /source3
-scriptdir = os.path.join(samba3srcdir, ../script/tests)
-
-smbclient3 = binpath('smbclient3')
-wbinfo = binpath('wbinfo')
-net = binpath('net')
-smbtorture3 = binpath('smbtorture3')
-ntlm_auth3 = binpath('ntlm_auth3')
-dbwrap_tool = binpath('dbwrap_tool')
-vfstest = binpath('vfstest')
-
 smbtorture4_options.extend([
'--option=torture:winbindd_netbios_name=$SERVER',
'--option=torture:winbindd_netbios_domain=$DOMAIN',
@@ -62,7 +51,7 @@ plantestsuite(samba3.local_s3, s3dc:local, 
[os.path.join(samba3srcdir, scri
 
 plantestsuite(samba3.blackbox.registry.upgrade, s3dc:local, 
[os.path.join(samba3srcdir, script/tests/test_registry_upgrade.sh), net, 
dbwrap_tool])
 
-tests=[ FDPASS, LOCK1, LOCK2, LOCK3, LOCK4, LOCK5, LOCK6, 
LOCK7, LOCK9,
+tests = [FDPASS, LOCK1, LOCK2, LOCK3, LOCK4, LOCK5, LOCK6, 
LOCK7, LOCK9,
 UNLINK, BROWSE, ATTR, TRANS2, TORTURE,
 OPLOCK1, OPLOCK2, OPLOCK4, STREAMERROR,
 DIR, DIR1, DIR-CREATETIME, TCON, TCONDEV, RW1, RW2, 
RW3, RW-SIGNING,
@@ -89,7 +78,7 @@ tests = [RW1, RW2, RW3]
 for t in tests:
 plantestsuite(samba3.smbtorture_s3.vfs_aio_fork(simpleserver).%s % t, 
simpleserver, [os.path.join(samba3srcdir, 
script/tests/test_smbtorture_s3.sh), t, '//$SERVER_IP/vfs_aio_fork', 
'$USERNAME', '$PASSWORD', smbtorture3, , -l $LOCAL_PATH])
 
-posix_tests=[ POSIX, POSIX-APPEND]
+posix_tests = [POSIX, POSIX-APPEND]
 
 for t in posix_tests:
 plantestsuite(samba3.smbtorture_s3.plain(s3dc).%s % t, s3dc, 
[os.path.join(samba3srcdir, script/tests/test_smbtorture_s3.sh), t, 
'//$SERVER_IP/posix_share', '$USERNAME', '$PASSWORD', smbtorture3, , -l 
$LOCAL_PATH])
@@ -100,7 +89,7 @@ env = s3dc:local
 t = CLEANUP3
 plantestsuite(samba3.smbtorture_s3.plain(%s).%s % (env, t), env, 
[os.path.join(samba3srcdir, script/tests/test_smbtorture_s3.sh), t, 
'//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', binpath('smbtorture3'), , -l 
$LOCAL_PATH])
 
-local_tests=[
+local_tests = [
 LOCAL-SUBSTITUTE,
 LOCAL-GENCACHE,
 LOCAL-TALLOC-DICT,
@@ -123,7 +112,7 @@ local_tests=[
 for t in local_tests:
 plantestsuite(samba3.smbtorture_s3.%s % t, s3dc, 
[os.path.join(samba3srcdir, script/tests/test_smbtorture_s3.sh), t, 
'//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', smbtorture3, -e])
 
-tests

[SCM] Samba Shared Repository - branch master updated

2012-10-21 Thread Jelmer Vernooij

The branch, master has been updated
   via  13bbd3b pyglue: Make all_interfaces argumen to interface_ips() 
optional.
   via  f67c0a2 pyglue: Mention parameters in interface_ips() docstring.
  from  d18591c s3:rpc_server: avoid a level 0 DEBUG if 
tstream_npa_connect_recv fails (bug #9309)

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


- Log -
commit 13bbd3b3b12bcc6e0a2e62c344908ca621774f34
Author: Jelmer Vernooij jel...@samba.org
Date:   Thu Sep 27 15:19:03 2012 -0700

pyglue: Make all_interfaces argumen to interface_ips() optional.

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Sun Oct 21 21:26:01 CEST 2012 on sn-devel-104

commit f67c0a28cfe3f3fc6ef2888c833e57c3d2138348
Author: Jelmer Vernooij jel...@samba.org
Date:   Thu Sep 27 15:13:37 2012 -0700

pyglue: Mention parameters in interface_ips() docstring.

---

Summary of changes:
 source4/scripting/python/pyglue.c |6 --
 1 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/pyglue.c 
b/source4/scripting/python/pyglue.c
index c21de46..735f03a 100644
--- a/source4/scripting/python/pyglue.c
+++ b/source4/scripting/python/pyglue.c
@@ -140,9 +140,9 @@ static PyObject *py_interface_ips(PyObject *self, PyObject 
*args)
struct loadparm_context *lp_ctx;
struct interface *ifaces;
int i, ifcount;
-   int all_interfaces;
+   int all_interfaces = 1;
 
-   if (!PyArg_ParseTuple(args, Oi, py_lp_ctx, all_interfaces))
+   if (!PyArg_ParseTuple(args, O|i, py_lp_ctx, all_interfaces))
return NULL;
 
tmp_ctx = talloc_new(NULL);
@@ -223,6 +223,8 @@ static PyMethodDef py_misc_methods[] = {
{ get_debug_level, (PyCFunction)py_get_debug_level, METH_NOARGS,
get debug level },
{ interface_ips, (PyCFunction)py_interface_ips, METH_VARARGS,
+   interface_ips(lp_ctx[, all_interfaces) - list_of_ifaces\n
+   \n
get interface IP address list},
{ strcasecmp_m, (PyCFunction)py_strcasecmp_m, METH_VARARGS,
(for testing) compare two strings using Samba's 
strcasecmp_m()},


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-10-19 Thread Jelmer Vernooij

The branch, master has been updated
   via  e3a48bb samba-tool user test: Fix expected output.
   via  364ed82 samba.tests.docs: Ignore removed parameters.
   via  4b4e8e2 smb.conf(5): Mark four removed parameters as such.
   via  ed37b8a samba.tests.docs: Assume docs are generated by waf.
   via  cfa72bc samba.tests.docs: Write error output from xsltproc to 
standard out.
   via  8412b57 samba.tests.docs: Skip tests if xsltproc is not present.
   via  2a31f0b smb.conf(5): Consistent spelling of parameter names.
   via  32fad2b samba.tests.docs: Support spaces before synonyms.
   via  be4dea4 samba.tests.docs: Support synonyms.
   via  d0e644e samba.tests.docs: Distinguish between unknown and 
undocumened parameters.
   via  d2f8fe8 tests: Convert find_missing_doc into a unit test.
   via  4790270 smb.conf(5): Fix mixing of tabs and spaces.
   via  aad30c0 smb.conf(5): Add basic documentation for 'nsupdate command'.
   via  0cea6da smb.conf(5): Add basic documentation for 'afs token 
lifetime'.
   via  695df86 smb.conf(5): Add 'ldap password sync' as synonym for 'ldap 
passwd sync'.
   via  6c160e3 smb.conf(5): Add 'socket address' as alias for 'nbt client 
socket address'.
   via  03b48e2 smb.conf(5): Add basic documentation for 'tls dh params 
file'.
   via  946a873 smb.conf(5): Add basic documentation for 'tls enabled'.
   via  2e4f054 smb.conf(5): Add basic documentation for 'tls crlfile'.
   via  008dfb9 smb.conf(5): Add basic documentation for 'tls certfile'.
   via  0f5e45b smb.conf(5): Add basic documentation for 'tls keyfile'.
   via  4e1a06d smb.conf(5): Add basic documentation for 'tls cafile'.
   via  e27e8f4 smb.conf(5): Add basic documentation for 'log nt token 
command'.
   via  7341dca smb.conf(5): Add basic documentation for 'ntp signd socket 
directory'.
   via  6f36bde smb.conf(5): Add basic documentation for 'spn update 
command'.
   via  68fdcaa smb.conf(5): Add basic documentation for 'allow dns 
updates'.
   via  b0b0266 smb.conf(5): Add basic documentation for 'rndc command'.
   via  4ccea7f smb.conf(5): Add basic documentation for 'dns update 
command'.
   via  3cc61af7 smb.conf(5): Add basic documentation for 'server services'.
   via  a63d6a9 smb.conf(5): Add basic documentation for 'samba kcc 
command'.
   via  d09f151 samba-tool user: Fix typos, improve messages.
   via  e7c8fca smb.conf(5): Add basic documentation 'winbind sealed pipes'.
   via  e9d91cd smb.conf(5): Add basic documentation for 'dns forwarder'.
   via  394258a smb.conf(5): Add basic documentation for 'ntvfs handler'.
   via  c6ba857 smb.conf(5): Add : to idmap config description to mark it 
as parametric.
   via  3cea625 smb.conf(5): Add basic documentation for 'winbindd 
privileged socket directory'.
   via  d0b3875 smb.conf(5): Add basic documentation for 'winbindd socket 
directory'.
   via  dfe75c2f smb.conf(5): Extend 'server min protocol' description.
  from  bea7a25 build: Assert that auth_domain, auth_builtin, auth_sam, 
auth_winbind are builtin

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


- Log -
commit e3a48bb5f65bf9f5b77df010dcb75fcc9721cf3b
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Oct 19 09:53:02 2012 +0200

samba-tool user test: Fix expected output.

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Fri Oct 19 11:37:44 CEST 2012 on sn-devel-104

commit 364ed82d22bbcd69ae237098ba8d6946969bd390
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Oct 19 09:21:01 2012 +0200

samba.tests.docs: Ignore removed parameters.

commit 4b4e8e21235615af94788fa0ebfa0b0bc09f14fd
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Oct 19 09:20:44 2012 +0200

smb.conf(5): Mark four removed parameters as such.

commit ed37b8ad14d496114654017d394fa18d63456aee
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Oct 19 09:16:55 2012 +0200

samba.tests.docs: Assume docs are generated by waf.

commit cfa72bcc5e93a840fc07f5d419216443ef8f7599
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Sep 28 21:40:32 2012 -0700

samba.tests.docs: Write error output from xsltproc to standard out.

commit 8412b57f5ce40901a0a4e2e66c5f9bcbdcb4b46e
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Sep 28 09:52:41 2012 -0700

samba.tests.docs: Skip tests if xsltproc is not present.

commit 2a31f0b50976dc5b6770639b60184a8ef9158b8b
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Sep 26 13:20:42 2012 -0700

smb.conf(5): Consistent spelling of parameter names.

This includes spacing and casing.

commit 32fad2b910a9e4f9b753b43cb818c72829236a88
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Sep 26 13:09:01 2012 -0700

samba.tests.docs: Support spaces before synonyms.

commit

[SCM] Samba Shared Repository - branch master updated

2012-10-11 Thread Jelmer Vernooij

The branch, master has been updated
   via  c2d1474 provision: Always create DNS user.
   via  276460c wafsamba: Ignore some more symbols when checking for dupes.
  from  1ec5486 smbd: Always free the talloc_stackframe() before leaving 
smbd_do_query_security_desc

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


- Log -
commit c2d14747d608d406de6410556807d467cd0b85ef
Author: Jelmer Vernooij jel...@samba.org
Date:   Thu Oct 11 14:45:10 2012 +0200

provision: Always create DNS user.

The DNS user is currently only used by the bind9 plugin. This makes it
easier to later on switch between the builtin DNS server and bind
backend.

In addition, ideally the internal DNS server would use that (separate)
user too.

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Thu Oct 11 17:05:40 CEST 2012 on sn-devel-104

commit 276460cf8afb4894fe1e980c7a75e866c14ba144
Author: Jelmer Vernooij jel...@samba.org
Date:   Thu Oct 11 14:39:50 2012 +0200

wafsamba: Ignore some more symbols when checking for dupes.

---

Summary of changes:
 buildtools/wafsamba/symbols.py |2 +-
 .../scripting/python/samba/provision/__init__.py   |   31 ---
 2 files changed, 14 insertions(+), 19 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/symbols.py b/buildtools/wafsamba/symbols.py
index 13d84b9..daa18b9 100644
--- a/buildtools/wafsamba/symbols.py
+++ b/buildtools/wafsamba/symbols.py
@@ -569,7 +569,7 @@ def symbols_whyneeded(task):
 
 def report_duplicate(bld, binname, sym, libs, fail_on_error):
 '''report duplicated symbols'''
-if sym in ['_init', '_fini']:
+if sym in ['_init', '_fini', '_edata', '_end', '__bss_start']:
 return
 libnames = []
 for lib in libs:
diff --git a/source4/scripting/python/samba/provision/__init__.py 
b/source4/scripting/python/samba/provision/__init__.py
index 9966192..d9ba90c 100644
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -969,7 +969,7 @@ def setup_samdb_rootdse(samdb, names):
 
 
 def setup_self_join(samdb, admin_session_info, names, fill, machinepass,
-dns_backend, dnspass, domainsid, next_rid, invocationid,
+dnspass, domainsid, next_rid, invocationid,
 policyguid, policyguid_dc,
 domainControllerFunctionality, ntdsguid=None, dc_rid=None):
 Join a host to its own domain.
@@ -1048,17 +1048,14 @@ def setup_self_join(samdb, admin_session_info, names, 
fill, machinepass,
 
 samdb.set_session_info(admin_session_info)
 
-if dns_backend != SAMBA_INTERNAL:
-# This is Samba4 specific and should be replaced by the correct
-# DNS AD-style setup
-setup_add_ldif(samdb, setup_path(provision_dns_add_samba.ldif), {
-  DNSDOMAIN: names.dnsdomain,
-  DOMAINDN: names.domaindn,
-  DNSPASS_B64: b64encode(dnspass.encode('utf-16-le')),
-  HOSTNAME : names.hostname,
-  DNSNAME : '%s.%s' % (
-  names.netbiosname.lower(), names.dnsdomain.lower())
-  })
+setup_add_ldif(samdb, setup_path(provision_dns_add_samba.ldif), {
+  DNSDOMAIN: names.dnsdomain,
+  DOMAINDN: names.domaindn,
+  DNSPASS_B64: b64encode(dnspass.encode('utf-16-le')),
+  HOSTNAME : names.hostname,
+  DNSNAME : '%s.%s' % (
+  names.netbiosname.lower(), names.dnsdomain.lower())
+  })
 
 
 def getpolicypath(sysvolpath, dnsdomain, guid):
@@ -1146,7 +1143,7 @@ def setup_samdb(path, session_info, provision_backend, 
lp, names,
 
 
 def fill_samdb(samdb, lp, names, logger, domainsid, domainguid, policyguid,
-policyguid_dc, fill, adminpass, krbtgtpass, machinepass, dns_backend,
+policyguid_dc, fill, adminpass, krbtgtpass, machinepass,
 dnspass, invocationid, ntdsguid, serverrole, am_rodc=False,
 dom_for_fun_level=None, schema=None, next_rid=None, dc_rid=None):
 
@@ -1334,7 +1331,6 @@ def fill_samdb(samdb, lp, names, logger, domainsid, 
domainguid, policyguid,
 logger.info(Setting up self join)
 setup_self_join(samdb, admin_session_info, names=names, fill=fill,
 invocationid=invocationid,
-dns_backend=dns_backend,
 dnspass=dnspass,
 machinepass=machinepass,
 domainsid=domainsid,
@@ -1607,8 +1603,8 @@ def provision_fill(samdb, secrets_ldb, logger, names, 
paths,
next_rid=1000, dc_rid=None, adminpass=None, krbtgtpass=None,
domainguid=None, policyguid=None, policyguid_dc=None,
invocationid=None, machinepass=None, ntdsguid=None,
-   dns_backend=None, dnspass

[SCM] Samba Shared Repository - branch master updated

2012-10-11 Thread Jelmer Vernooij

The branch, master has been updated
   via  21b58b5 samba.join: Fix multiple spaces.
   via  1aa291c selftest: Move some tests to common test script.
   via  1080b6c selftests.tests: Remove reference to Samba 4.
   via  2adf27a samba.provision.sambadns: Use == to compare strings, not 
'is'.
  from  cabd2b2 s3fs-printing: Simplify the comment and location handling.

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


- Log -
commit 21b58b5eacb67b4dee6e7efe90bd529bbfd6ef77
Author: Jelmer Vernooij jel...@samba.org
Date:   Thu Oct 11 17:23:13 2012 +0200

samba.join: Fix multiple spaces.

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Thu Oct 11 20:30:43 CEST 2012 on sn-devel-104

commit 1aa291c331c29c2f5ee4572b660c4c2061755856
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Oct 5 11:46:25 2012 +0200

selftest: Move some tests to common test script.

commit 1080b6c2caf1191fd896f3caf38e576a00b01982
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Oct 5 11:39:34 2012 +0200

selftests.tests: Remove reference to Samba 4.

commit 2adf27a99b999a4fd0329d9fa398a9208b60e367
Author: Jelmer Vernooij jel...@samba.org
Date:   Thu Oct 11 17:11:44 2012 +0200

samba.provision.sambadns: Use == to compare strings, not 'is'.

---

Summary of changes:
 selftest/tests.py  |   10 ++
 source4/scripting/python/samba/join.py |2 +-
 .../scripting/python/samba/provision/sambadns.py   |2 +-
 source4/selftest/tests.py  |2 --
 4 files changed, 8 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/tests.py b/selftest/tests.py
index 506ed73..d9ad9e9 100644
--- a/selftest/tests.py
+++ b/selftest/tests.py
@@ -1,16 +1,16 @@
 #!/usr/bin/python
 # This script generates a list of testsuites that should be run as part of
-# the Samba 4 test suite.
+# the Samba test suite.
 
 # The output of this script is parsed by selftest.pl, which then decides
 # which of the tests to actually run. It will, for example, skip all tests
 # listed in selftest/skip or only run a subset during make quicktest.
 
-# The idea is that this script outputs all of the tests of Samba 4, not
+# The idea is that this script outputs all of the tests of Samba, not
 # just those that are known to pass, and list those that should be skipped
 # or are known to fail in selftest/skip or selftest/knownfail. This makes it
-# very easy to see what functionality is still missing in Samba 4 and makes
-# it possible to run the testsuite against other servers, such as Samba 3 or
+# very easy to see what functionality is still missing in Samba and makes
+# it possible to run the testsuite against other servers, such as
 # Windows that have a different set of features.
 
 # The syntax for a testsuite is -- TEST -- on a single line, followed
@@ -21,3 +21,5 @@
 from selftesthelpers import *
 
 planpythontestsuite(none, samba.tests.source)
+planpythontestsuite(none, selftest.tests.test_suite, extra_path=[srcdir()])
+planpythontestsuite(none, subunit)
diff --git a/source4/scripting/python/samba/join.py 
b/source4/scripting/python/samba/join.py
index 7b511f8..c55c22c 100644
--- a/source4/scripting/python/samba/join.py
+++ b/source4/scripting/python/samba/join.py
@@ -749,7 +749,7 @@ class dc_join(object):
 print Done with always replicated NC (base, config, schema)
 
 for nc in (ctx.domaindns_zone, ctx.forestdns_zone):
-if nc  in ctx.nc_list:
+if nc in ctx.nc_list:
 print Replicating %s % (str(nc))
 repl.replicate(nc, source_dsa_invocation_id,
 destination_dsa_guid, rodc=ctx.RODC,
diff --git a/source4/scripting/python/samba/provision/sambadns.py 
b/source4/scripting/python/samba/provision/sambadns.py
index 576a33f..a66fde1 100644
--- a/source4/scripting/python/samba/provision/sambadns.py
+++ b/source4/scripting/python/samba/provision/sambadns.py
@@ -1017,7 +1017,7 @@ def setup_ad_dns(samdb, secretsdb, domainsid, names, 
paths, lp, logger,
 if not is_valid_os_level(os_level):
 raise Exception(Invalid os level: %r % os_level)
 
-if dns_backend is NONE:
+if dns_backend == NONE:
 logger.info(No DNS backend set, not configuring DNS)
 return
 
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 756b28c..d99c4b0 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -417,7 +417,6 @@ def planoldpythontestsuite(env, module, name=None, 
extra_path=[], environ={}, ex
 name = module
 plantestsuite(name, env, args)
 
-planpythontestsuite(none, selftest.tests.test_suite, extra_path=[srcdir()])
 planpythontestsuite(none, api, name=ldb.python

[SCM] Samba Shared Repository - branch master updated

2012-10-11 Thread Jelmer Vernooij

The branch, master has been updated
   via  ff82afb selftest: Move more tests to common list script.
  from  21b58b5 samba.join: Fix multiple spaces.

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


- Log -
commit ff82afb1f8ad3cf950277487aff05d442d03c969
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Oct 5 11:51:37 2012 +0200

selftest: Move more tests to common list script.

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Fri Oct 12 02:06:42 CEST 2012 on sn-devel-104

---

Summary of changes:
 selftest/selftesthelpers.py |6 ++
 selftest/tests.py   |   26 ++
 source4/selftest/tests.py   |   29 -
 3 files changed, 32 insertions(+), 29 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py
index 7fc0854..4517030 100644
--- a/selftest/selftesthelpers.py
+++ b/selftest/selftesthelpers.py
@@ -177,3 +177,9 @@ def planpythontestsuite(env, module, name=None, 
extra_path=[]):
 if pypath:
 args.insert(0, PYTHONPATH=%s % :.join([$PYTHONPATH] + pypath))
 plantestsuite_idlist(name, env, args)
+
+
+samba4srcdir = source4dir()
+bbdir = os.path.join(srcdir(), testprogs/blackbox)
+configuration = --configfile=$SMB_CONF_PATH
+
diff --git a/selftest/tests.py b/selftest/tests.py
index d9ad9e9..26510a8 100644
--- a/selftest/tests.py
+++ b/selftest/tests.py
@@ -23,3 +23,29 @@ from selftesthelpers import *
 planpythontestsuite(none, samba.tests.source)
 planpythontestsuite(none, selftest.tests.test_suite, extra_path=[srcdir()])
 planpythontestsuite(none, subunit)
+planpythontestsuite(none, samba.tests.blackbox.ndrdump)
+planpythontestsuite(none, api, name=ldb.python, 
extra_path=['lib/ldb/tests/python'])
+planpythontestsuite(none, samba.tests.credentials)
+planpythontestsuite(none, samba.tests.registry)
+planpythontestsuite(none, samba.tests.auth)
+planpythontestsuite(none, samba.tests.getopt)
+planpythontestsuite(none, samba.tests.security)
+planpythontestsuite(none, samba.tests.dcerpc.misc)
+planpythontestsuite(none, samba.tests.param)
+planpythontestsuite(none, samba.tests.upgrade)
+planpythontestsuite(none, samba.tests.core)
+planpythontestsuite(none, samba.tests.provision)
+planpythontestsuite(none, samba.tests.samba3)
+planpythontestsuite(none, samba.tests.strings)
+planpythontestsuite(none, samba.tests.netcmd)
+planpythontestsuite(none, samba.tests.dcerpc.rpc_talloc)
+planpythontestsuite(none, samba.tests.samdb)
+planpythontestsuite(none, samba.tests.hostconfig)
+planpythontestsuite(none, samba.tests.messaging)
+planpythontestsuite(none, samba.tests.samba3sam)
+planpythontestsuite(none, wafsamba.tests.test_suite, 
extra_path=[os.path.join(samba4srcdir, .., buildtools), 
os.path.join(samba4srcdir, .., buildtools, wafadmin)])
+plantestsuite(samba4.blackbox.dbcheck.alpha13, none , [PYTHON=%s % 
python, os.path.join(bbdir, dbcheck-alpha13.sh), '$PREFIX_ABS/provision', 
configuration])
+planpythontestsuite(none, samba.tests.upgradeprovision)
+planpythontestsuite(none, samba.tests.xattr)
+planpythontestsuite(none, samba.tests.ntacls)
+planpythontestsuite(none, samba.tests.policy)
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index d99c4b0..0bc7b29 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -51,8 +51,6 @@ subprocess.call([smb4torture, -V], stdout=sys.stderr)
 
 bbdir = os.path.join(srcdir(), testprogs/blackbox)
 
-configuration = --configfile=$SMB_CONF_PATH
-
 torture_options = [configuration, --maximum-runtime=$SELFTEST_MAXTIME, 
--target=samba4, --basedir=$SELFTEST_TMPDIR]
 if not os.getenv(SELFTEST_VERBOSE):
 torture_options.append(--option=torture:progress=no)
@@ -314,7 +312,6 @@ planpythontestsuite(s3dc, 
samba.tests.libsmb_samba_internal);
 for env in [s3member, s4member, dc, chgdcpass]:
 plantestsuite(samba4.blackbox.smbclient(%s:local) % env, %s:local % 
env, [os.path.join(samba4srcdir, utils/tests/test_smbclient.sh), '$SERVER', 
'$SERVER_IP', '$USERNAME', '$PASSWORD', '$DOMAIN', smbclient])
 
-planpythontestsuite(none, samba.tests.blackbox.ndrdump)
 plantestsuite(samba4.blackbox.samba_tool(dc:local), dc:local, 
[os.path.join(samba4srcdir, utils/tests/test_samba_tool.sh), '$SERVER', 
'$SERVER_IP', '$USERNAME', '$PASSWORD', '$DOMAIN', smbclient])
 plantestsuite(samba4.blackbox.pkinit(dc:local), dc:local, 
[os.path.join(bbdir, test_pkinit.sh), '$SERVER', '$USERNAME', '$PASSWORD', 
'$REALM', '$DOMAIN', '$PREFIX', aes256-cts-hmac-sha1-96, smbclient, 
configuration])
 plantestsuite(samba4.blackbox.kinit(dc:local), dc:local, 
[os.path.join(bbdir, test_kinit.sh), '$SERVER', '$USERNAME', '$PASSWORD', 
'$REALM', '$DOMAIN', '$PREFIX', aes256-cts-hmac-sha1-96, smbclient, 
configuration])
@@ -417,40 +414,19 @@ def

[SCM] Samba Shared Repository - branch master updated

2012-10-03 Thread Jelmer Vernooij

The branch, master has been updated
   via  df23b17 provision: Use logger rather than print.
  from  c1677e3 s4-provision: do not skip setting the acls on sysvol

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


- Log -
commit df23b17fa99409f680bbda3abcbb6d8eb7c498b0
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Oct 3 10:26:55 2012 +0200

provision: Use logger rather than print.

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Wed Oct  3 14:24:09 CEST 2012 on sn-devel-104

---

Summary of changes:
 .../scripting/python/samba/provision/__init__.py   |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/provision/__init__.py 
b/source4/scripting/python/samba/provision/__init__.py
index f1da4db..d5d57d2 100644
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -1650,7 +1650,7 @@ def provision_fill(samdb, secrets_ldb, logger, names, 
paths,
  paths.wheel_gid, domainsid, names.dnsdomain,
  names.domaindn, lp, use_ntvfs)
 else:
-print Setting acl on sysvol skipped
+logger.info(Setting acl on sysvol skipped)
 
 secretsdb_self_join(secrets_ldb, domain=names.domain,
 realm=names.realm, dnsdomain=names.dnsdomain,


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-09-27 Thread Jelmer Vernooij

The branch, master has been updated
   via  b7822a5 samba4-tests: Move 'samba.tests.source' up.
   via  0883e17 sanba.upgradehelpers: Use standard functionality for 
getting temp dir.
   via  2a797f2 s4-python: Various formatting fixes.
   via  6986f7b samba.tests.source: Check for trailing whitespace in Python 
files.
   via  f8aab2f smb.conf(5): Add basic documentation for 'dcerpc endpoint 
servers'.
  from  aad669b s3: Fix some blank line endings

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


- Log -
commit b7822a55c40c5c42356b263c3d7bc1998fb1a7d3
Author: Jelmer Vernooij jel...@samba.org
Date:   Thu Sep 27 09:41:32 2012 -0700

samba4-tests: Move 'samba.tests.source' up.

We would like to run this as early as possible so we get a quick
failure when there is trailing whitespace.

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Thu Sep 27 20:26:27 CEST 2012 on sn-devel-104

commit 0883e174bfdec22a4ff373041afce396cfe7fd7b
Author: Jelmer Vernooij jel...@samba.org
Date:   Thu Sep 27 09:34:36 2012 -0700

sanba.upgradehelpers: Use standard functionality for getting temp dir.

commit 2a797f29aa12f6847844af504026be52db659fbb
Author: Jelmer Vernooij jel...@samba.org
Date:   Thu Sep 27 09:30:47 2012 -0700

s4-python: Various formatting fixes.

* Trailing whitespace
* use of == where is should be used
* double spaces

commit 6986f7bdda56d693c642945485006f9660053758
Author: Jelmer Vernooij jel...@samba.org
Date:   Thu Sep 27 09:30:26 2012 -0700

samba.tests.source: Check for trailing whitespace in Python files.

commit f8aab2f55fb552c6fd1fc51106cc237f9a1fc32a
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Sep 26 18:01:35 2012 -0700

smb.conf(5): Add basic documentation for 'dcerpc endpoint servers'.

---

Summary of changes:
 buildtools/wafsamba/nothreads.py   |6 +-
 buildtools/wafsamba/samba_abi.py   |2 +-
 buildtools/wafsamba/samba_autoconf.py  |   10 +-
 buildtools/wafsamba/samba_bundled.py   |2 +-
 buildtools/wafsamba/samba_deps.py  |8 +-
 buildtools/wafsamba/samba_dist.py  |4 +-
 buildtools/wafsamba/samba_headers.py   |1 -
 buildtools/wafsamba/samba_optimisation.py  |2 +-
 buildtools/wafsamba/samba_patterns.py  |2 +-
 buildtools/wafsamba/samba_utils.py |   10 +-
 buildtools/wafsamba/samba_version.py   |2 +-
 buildtools/wafsamba/stale_files.py |2 +-
 buildtools/wafsamba/wafsamba.py|4 +-
 .../smbdotconf/protocol/dcerpcendpointservers.xml  |   12 ++
 selftest/tests.py  |   23 
 selftest/wscript   |3 +-
 source4/scripting/bin/samba_dnsupdate  |   15 ++-
 source4/scripting/bin/samba_kcc|  117 +-
 source4/scripting/bin/samba_upgradeprovision   |   16 ++--
 source4/scripting/python/samba/__init__.py |2 +-
 source4/scripting/python/samba/dbchecker.py|8 +-
 source4/scripting/python/samba/drs_utils.py|2 +-
 source4/scripting/python/samba/kcc_utils.py|   46 
 source4/scripting/python/samba/ms_schema.py|   34 +++---
 source4/scripting/python/samba/netcmd/__init__.py  |2 +-
 .../scripting/python/samba/netcmd/delegation.py|6 +-
 source4/scripting/python/samba/netcmd/domain.py|   20 ++--
 source4/scripting/python/samba/netcmd/fsmo.py  |2 +-
 source4/scripting/python/samba/netcmd/gpo.py   |4 +-
 source4/scripting/python/samba/netcmd/ldapcmp.py   |7 +-
 source4/scripting/python/samba/netcmd/ntacl.py |   18 ++--
 source4/scripting/python/samba/netcmd/spn.py   |   14 +-
 source4/scripting/python/samba/ntacls.py   |   18 ++--
 .../scripting/python/samba/provision/__init__.py   |4 +-
 .../scripting/python/samba/provision/backend.py|2 +-
 source4/scripting/python/samba/schema.py   |8 +-
 source4/scripting/python/samba/tests/auth.py   |4 +-
 source4/scripting/python/samba/tests/core.py   |4 +-
 .../scripting/python/samba/tests/credentials.py|6 +-
 .../scripting/python/samba/tests/dcerpc/bare.py|   12 +-
 .../python/samba/tests/dcerpc/registry.py  |2 +-
 .../scripting/python/samba/tests/dcerpc/unix.py|2 +-
 source4/scripting/python/samba/tests/dns.py|4 +-
 source4/scripting/python/samba/tests/gensec.py |8 +-
 source4/scripting/python/samba/tests/provision.py  |2 +-
 source4/scripting/python/samba/tests/samba3.py |4 +-
 source4/scripting/python/samba/tests/samba3sam.py  |  132 ++--
 .../python/samba

[SCM] Samba Shared Repository - branch master updated

2012-09-26 Thread Jelmer Vernooij

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

[SCM] Samba Shared Repository - branch master updated

2012-09-26 Thread Jelmer Vernooij

The branch, master has been updated
   via  3bdca92 smb.conf(5): Add basic documentation for 'rpc bigendian'.
   via  0dd9654 smb.conf(5): Add basic documentation for 'kpasswd port'.
   via  879b3ad smb.conf(5): Add basic documentation for 'dgram port'.
   via  12ab467 smb.conf(5): Add basic documentation for 'unicode'.
   via  3ab03cc smb.conf(5): Add basic documentation for 'web port'.
   via  c66744a smb.conf(5): Add basic documentation for 'nbt port'.
   via  29a763a smb.conf(5): Add basic documentation for 'krb5 port'.
   via  7dd3cdc smb.conf(5): 'write ok' is a reverse synonym for 'read 
only'.
   via  6b9960e smb.conf(5): Distinguish parametric options.
   via  4192960 find_missing_doc: Convert to python.
   via  f2b2c10 find_missing_manpages: convert to python
   via  104c3df find_missing_manpages: Ignore make variables.
   via  90b1a94 netlogon: Per MS-NRPC, don't send unknown workstation flags 
back to the client.
  from  5022b3d s4: Fix a -Wunused-value warning

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


- Log -
commit 3bdca921cc9344d96f4aa3a18ba4aac971539b25
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Sep 26 13:07:54 2012 -0700

smb.conf(5): Add basic documentation for 'rpc bigendian'.

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Wed Sep 26 23:51:34 CEST 2012 on sn-devel-104

commit 0dd965492cb97e0b3711ab6380a5f9ae0be5ec8c
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Sep 26 12:59:32 2012 -0700

smb.conf(5): Add basic documentation for 'kpasswd port'.

commit 879b3ad0812a515e784a2623a035fd74369c8a9b
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Sep 26 12:58:02 2012 -0700

smb.conf(5): Add basic documentation for 'dgram port'.

commit 12ab467f8768a3e2218b3ebddf43fa15c6743d69
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Sep 26 12:55:15 2012 -0700

smb.conf(5): Add basic documentation for 'unicode'.

commit 3ab03ccd8420a4fc18c46a82a57d18e16cb75c22
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Sep 26 12:51:41 2012 -0700

smb.conf(5): Add basic documentation for 'web port'.

commit c66744a8c9f60862579bdfa23774d145ff30b406
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Sep 26 12:50:34 2012 -0700

smb.conf(5): Add basic documentation for 'nbt port'.

commit 29a763aa0f15faa5d6568ad853e8997f90fa924b
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Sep 26 12:46:37 2012 -0700

smb.conf(5): Add basic documentation for 'krb5 port'.

commit 7dd3cdc6739f0d0ae0a367b45860202e503b6d00
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Sep 26 12:41:20 2012 -0700

smb.conf(5): 'write ok' is a reverse synonym for 'read only'.

commit 6b9960e78aa860a163ef477701be43273164e4ba
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Sep 26 18:36:28 2012 +0200

smb.conf(5): Distinguish parametric options.

commit 4192960a9ee692f7c7c1aa3d4393518910ec7542
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Sep 26 02:37:01 2012 +0200

find_missing_doc: Convert to python.

commit f2b2c1028bcb5da2292c543e4419d258ec3d6b46
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Sep 26 02:05:39 2012 +0200

find_missing_manpages: convert to python

commit 104c3df6cf759a69eafd303fe8d5870ae5d34149
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Sep 26 01:24:04 2012 +0200

find_missing_manpages: Ignore make variables.

commit 90b1a94cb436d872148742eec1af56ba7c6dc9ef
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Sep 26 19:47:56 2012 +0200

netlogon: Per MS-NRPC, don't send unknown workstation flags back to the
client.

---

Summary of changes:
 docs-xml/scripts/find_missing_doc |  119 +++--
 docs-xml/scripts/find_missing_manpages|   90 +--
 docs-xml/smbdotconf/misc/rpcdaemon.xml|2 +-
 docs-xml/smbdotconf/misc/rpcserver.xml|2 +-
 docs-xml/smbdotconf/protocol/dgramport.xml|   11 +++
 docs-xml/smbdotconf/protocol/nbtport.xml  |   12 +++
 docs-xml/smbdotconf/protocol/rpcbigendian.xml |   16 
 docs-xml/smbdotconf/protocol/unicode.xml  |   13 +++
 docs-xml/smbdotconf/protocol/webport.xml  |   12 +++
 docs-xml/smbdotconf/security/kpasswdport.xml  |   12 +++
 docs-xml/smbdotconf/security/krb5port.xml |   11 +++
 docs-xml/smbdotconf/security/readonly.xml |1 +
 source4/rpc_server/netlogon/dcerpc_netlogon.c |3 +-
 source4/torture/rpc/netlogon.c|   28 +-
 14 files changed, 248 insertions(+), 84 deletions(-)
 create mode 100644 docs-xml/smbdotconf/protocol/dgramport.xml
 create mode 100644 docs-xml/smbdotconf/protocol/nbtport.xml
 create mode 100644 docs-xml/smbdotconf/protocol/rpcbigendian.xml
 create mode 100644 docs-xml/smbdotconf/protocol

[SCM] Samba Shared Repository - branch master updated

2012-09-26 Thread Jelmer Vernooij

The branch, master has been updated
   via  ee0012d samba-tool domain provision: DNS forwarder default
   via  ba70755 smb.conf(5): List 'protocol' as alias for 'server max 
protocol'.
   via  3dc6daf smb.conf(5): Add documentation for 'client max protocol'.
   via  60b93c3 smb.conf(5): Add basic documentation for 'client min 
protocol'.
   via  b6cb0b6 smb.conf(5): Document 'share backend' parameter.
   via  b97c257 smb.conf(5): Add basic documentation for 'server min 
protocol'.
   via  d184555 smb.conf(5): Extend 'server min protocol' description.
   via  bc9d5cb smb.conf(5): Consistent spelling of parameter names.
  from  4544c52 s3: For read-only shares, filter out write bits from 
conn-access_mask

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


- Log -
commit ee0012de1af1a3899856bcdb80033d1a82d5b174
Author: Ricky Nance ricky.na...@weaubleau.k12.mo.us
Date:   Wed Sep 26 17:24:40 2012 -0700

samba-tool domain provision: DNS forwarder default

Provision would break with an exception if there was no value given for the 
DNS forwarder, this simply sets a default to none.

Signed-off-by: Jelmer Vernooij jel...@samba.org

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Thu Sep 27 04:35:33 CEST 2012 on sn-devel-104

commit ba7075597e5c28f50f3695c59a5050d1c2c98ae4
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Sep 26 16:06:14 2012 -0700

smb.conf(5): List 'protocol' as alias for 'server max protocol'.

commit 3dc6daf6a950d7059daa8df40e31b51617310496
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Sep 26 16:11:05 2012 -0700

smb.conf(5): Add documentation for 'client max protocol'.

commit 60b93c314cc204ae0a4e2598100674cf2ff5bf51
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Sep 26 16:12:16 2012 -0700

smb.conf(5): Add basic documentation for 'client min protocol'.

commit b6cb0b65e08aee972321220ae54cdf2d181356a8
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Sep 26 15:44:46 2012 -0700

smb.conf(5): Document 'share backend' parameter.

commit b97c257f3af942d0767226793fa705940caad8dd
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Sep 26 15:55:04 2012 -0700

smb.conf(5): Add basic documentation for 'server min protocol'.

Conflicts:
docs-xml/smbdotconf/protocol/serverminprotocol.xml

commit d1845558e09fd227338d06831f1ea1cf68d2e6fa
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Sep 26 16:02:40 2012 -0700

smb.conf(5): Extend 'server min protocol' description.

Conflicts:
docs-xml/smbdotconf/protocol/serverminprotocol.xml

commit bc9d5cb13f51be7feac96b754f875d2b33775160
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Sep 26 13:20:42 2012 -0700

smb.conf(5): Consistent spelling of parameter names.

This includes spacing and casing.

Conflicts:
source4/scripting/python/samba/tests/docs.py

---

Summary of changes:
 docs-xml/smbdotconf/base/sharebackend.xml  |   18 +
 docs-xml/smbdotconf/misc/nishomedir.xml|2 +-
 docs-xml/smbdotconf/printing/addportcommand.xml|2 +-
 ...servermaxprotocol.xml = clientmaxprotocol.xml} |8 +++---
 docs-xml/smbdotconf/protocol/clientminprotocol.xml |   19 ++
 docs-xml/smbdotconf/protocol/rpcbigendian.xml  |2 +-
 docs-xml/smbdotconf/protocol/servermaxprotocol.xml |1 +
 docs-xml/smbdotconf/protocol/serverminprotocol.xml |   21 +--
 docs-xml/smbdotconf/security/clientntlmv2auth.xml  |2 +-
 source4/scripting/python/samba/netcmd/domain.py|2 +
 10 files changed, 54 insertions(+), 23 deletions(-)
 create mode 100644 docs-xml/smbdotconf/base/sharebackend.xml
 copy docs-xml/smbdotconf/protocol/{servermaxprotocol.xml = 
clientmaxprotocol.xml} (92%)
 create mode 100644 docs-xml/smbdotconf/protocol/clientminprotocol.xml


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/base/sharebackend.xml 
b/docs-xml/smbdotconf/base/sharebackend.xml
new file mode 100644
index 000..10958fa
--- /dev/null
+++ b/docs-xml/smbdotconf/base/sharebackend.xml
@@ -0,0 +1,18 @@
+samba:parameter name=share backend
+ context=G
+ type=choice
+ xmlns:samba=http://www.samba.org/samba/DTD/samba-doc;
+description
+   para
+   This option specifies the backend that will be used to access the 
configuration of
+   file shares.
+   /para
+
+   paraTraditionally, Samba file shares have been configured in the
+   optionsmb.conf/option file and this is still the default.
+   /para
+
+   paraAt the moment there are no other supported backends./para
+/description
+value type=defaultclassic/value
+/samba:parameter
diff --git a/docs-xml/smbdotconf/misc

[SCM] Samba Shared Repository - branch master updated

2012-09-25 Thread Jelmer Vernooij

The branch, master has been updated
   via  8090046 pyntdb: Fix init function for ntdb python module.
   via  fa332b7 s4-python: Override SIGINT handler in scripts only.
  from  c034ff7 s3: Slightly simplify is_stat_open

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


- Log -
commit 809004689a5ec60066d1ae26e9599ec09895c46c
Author: Pierre Lejeune superhe...@gmail.com
Date:   Tue Sep 25 20:56:37 2012 +0200

pyntdb: Fix init function for ntdb python module.

Signed-Off-By: Jelmer Vernooij jel...@samba.org

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Tue Sep 25 22:40:39 CEST 2012 on sn-devel-104

commit fa332b71dc71d23f1475ed6c25a6376934ab652a
Author: Jelmer Vernooij jel...@samba.org
Date:   Tue Sep 25 20:49:22 2012 +0200

s4-python: Override SIGINT handler in scripts only.

Override the SIGINT handler in a few select cases only, rather than
doing so in one of the samba Python modules. I've done this where it
matters most; we can add this code to other scripts too if necessary.

This means that importing the 'samba' module from a third party
application does not have side-effects on the state of the signal
handlers.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=9068

---

Summary of changes:
 lib/ntdb/pyntdb.c|4 ++--
 source4/scripting/bin/samba-tool |7 +++
 source4/scripting/bin/samba_upgradeprovision |6 ++
 source4/scripting/bin/smbstatus  |8 +++-
 source4/scripting/bin/subunitrun |6 ++
 source4/scripting/python/pyglue.c|7 ---
 6 files changed, 28 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/ntdb/pyntdb.c b/lib/ntdb/pyntdb.c
index 1037f3c..e4965fb 100644
--- a/lib/ntdb/pyntdb.c
+++ b/lib/ntdb/pyntdb.c
@@ -550,8 +550,8 @@ static PyMethodDef ntdb_methods[] = {
{ NULL }
 };
 
-void inittdb(void);
-void inittdb(void)
+void initntdb(void);
+void initntdb(void)
 {
PyObject *m;
 
diff --git a/source4/scripting/bin/samba-tool b/source4/scripting/bin/samba-tool
index 8ec6514..bb96626 100755
--- a/source4/scripting/bin/samba-tool
+++ b/source4/scripting/bin/samba-tool
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
 # Unix SMB/CIFS implementation.
+# Copyright (C) Jelmer Vernooij jel...@samba.org 2008-2012
 # Copyright (C) Amitay Isaacs ami...@gmail.com 2011
 # Copyright (C) Giampaolo Lauria laur...@yahoo.com 2011
 #
@@ -23,6 +24,12 @@ import sys
 # Find right direction when running from source tree
 sys.path.insert(0, bin/python)
 
+# make sure the script dies immediately when hitting control-C,
+# rather than raising KeyboardInterrupt. As we do all database
+# operations using transactions, this is safe.
+import signal
+signal.signal(signal.SIGINT, signal.SIG_DFL)
+
 from samba.netcmd.main import cmd_sambatool
 cmd = cmd_sambatool()
 subcommand = None
diff --git a/source4/scripting/bin/samba_upgradeprovision 
b/source4/scripting/bin/samba_upgradeprovision
index 344d7f5..54ffbea 100755
--- a/source4/scripting/bin/samba_upgradeprovision
+++ b/source4/scripting/bin/samba_upgradeprovision
@@ -66,6 +66,12 @@ from samba.upgradehelpers import (dn_sort, get_paths, 
newprovision,
  print_provision_ranges)
 from samba.xattr import copytree_with_xattrs
 
+# make sure the script dies immediately when hitting control-C,
+# rather than raising KeyboardInterrupt. As we do all database
+# operations using transactions, this is safe.
+import signal
+signal.signal(signal.SIGINT, signal.SIG_DFL)
+
 replace=2**FLAG_MOD_REPLACE
 add=2**FLAG_MOD_ADD
 delete=2**FLAG_MOD_DELETE
diff --git a/source4/scripting/bin/smbstatus b/source4/scripting/bin/smbstatus
index 055753b..7ff98df 100755
--- a/source4/scripting/bin/smbstatus
+++ b/source4/scripting/bin/smbstatus
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 #  provide information on connected users and open files
-#  Copyright ǒ Jelmer Vernooij 2008
+#  Copyright (c) Jelmer Vernooij 2008
 #
 #  Based on the original in EJS:
 #  Copyright Andrew Tridgell 2005
@@ -11,6 +11,12 @@
 
 import os, sys
 
+# make sure the script dies immediately when hitting control-C,
+# rather than raising KeyboardInterrupt. As we do all database
+# operations using transactions, this is safe.
+import signal
+signal.signal(signal.SIGINT, signal.SIG_DFL)
+
 sys.path.insert(0, bin/python)
 
 import optparse
diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index df46b08..15a78bf 100755
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -28,6 +28,12 @@
 
 import sys
 
+# make sure the script dies immediately when hitting control-C,
+# rather than raising KeyboardInterrupt. As we do all database

[SCM] build.samba.org - branch master updated

2012-09-24 Thread Jelmer Vernooij

The branch, master has been updated
   via  c13ed96 Fix encoding when updating platform.
  from  8976254 build: Fix build farm for hosts other than our coverage test

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


- Log -
commit c13ed9660cec49958b97efccdb751f23044e6eed
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Sep 24 20:46:07 2012 +0200

Fix encoding when updating platform.

---

Summary of changes:
 admin.py |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/admin.py b/admin.py
index 60679f8..b78fb32 100755
--- a/admin.py
+++ b/admin.py
@@ -89,7 +89,7 @@ elif op == modify:
 mod_op = platform
 if mod_op == platform:
 platform = raw_input(Enter new platform: )
-host.update_platform(platform)
+host.update_platform(platform.decode('utf-8'))
 buildfarm.commit()
 elif mod_op == owner:
 owner = raw_input(Enter new owner's name: )


-- 
build.samba.org

[SCM] Samba Shared Repository - branch master updated

2012-09-24 Thread Jelmer Vernooij

The branch, master has been updated
   via  f44ad36 samba-tool domain provision: DNS forwarder is not a boolean.
   via  78cb9fd Remove compatibility code for setproctitle() now moved to 
libreplace.
   via  fd8d4ec replace: Support setproctitle().
   via  6641d76 samba-tool domain-provision: Avoid python2.5-isms.
   via  61ce3e8 samba-tool domain-provision: Fix docstring.
  from  df48092 script/autobuild.py: set the default for --log-base to the 
current gitroot

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


- Log -
commit f44ad3671876802a42846597be901257633e8ca3
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Sep 24 23:02:05 2012 +0200

samba-tool domain provision: DNS forwarder is not a boolean.

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Tue Sep 25 00:48:43 CEST 2012 on sn-devel-104

commit 78cb9fd91bc1ac73ad1a1deb8c9423f88729b707
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Sep 24 09:42:15 2012 +0200

Remove compatibility code for setproctitle() now moved to libreplace.

commit fd8d4ec34785e71de3f8458222d196d454d0e723
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Sep 24 09:20:46 2012 +0200

replace: Support setproctitle().

This uses the setproctitle() from libc, libsetproctitle or libbsd.
If none is available it provides a dummy implementation.

commit 6641d76562db10e6289c5e819b1296d8f6df37bf
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Sep 24 08:26:12 2012 +0200

samba-tool domain-provision: Avoid python2.5-isms.

commit 61ce3e871a1fc1d16202d337d74c2e10f64b2c86
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Sep 24 08:21:27 2012 +0200

samba-tool domain-provision: Fix docstring.

---

Summary of changes:
 lib/replace/README  |1 +
 lib/replace/replace.c   |7 +++
 lib/replace/replace.h   |9 +
 lib/replace/wscript |2 ++
 source4/scripting/python/samba/netcmd/domain.py |   13 -
 source4/smbd/process_onefork.c  |   13 -
 source4/smbd/process_prefork.c  |   13 -
 source4/smbd/process_standard.c |   13 -
 8 files changed, 27 insertions(+), 44 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/README b/lib/replace/README
index 5399971..e960dc8 100644
--- a/lib/replace/README
+++ b/lib/replace/README
@@ -73,6 +73,7 @@ readlink
 symlink
 realpath
 poll
+setproctitle
 
 Types:
 bool
diff --git a/lib/replace/replace.c b/lib/replace/replace.c
index ebfe04d..a0aa788 100644
--- a/lib/replace/replace.c
+++ b/lib/replace/replace.c
@@ -894,3 +894,10 @@ int rep_usleep(useconds_t sec)
return 0;
 }
 #endif /* HAVE_USLEEP */
+
+#ifndef HAVE_SETPROCTITLE
+void rep_setproctitle(const char *fmt, ...)
+{
+   return 0;
+}
+#endif
diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index c7f9c71..bbea0fc 100644
--- a/lib/replace/replace.h
+++ b/lib/replace/replace.h
@@ -128,6 +128,10 @@
 #include sys/types.h
 #endif
 
+#ifdef HAVE_SETPROCTITLE_H
+#include setproctitle.h
+#endif
+
 #if STDC_HEADERS
 #include stdlib.h
 #include stddef.h
@@ -845,4 +849,9 @@ typedef long useconds_t;
 int usleep(useconds_t);
 #endif
 
+#ifndef HAVE_SETPROCTITLE
+#define setproctitle rep_setproctitle
+void rep_setproctitle(const char *fmt, ...) PRINTF_ATTRIBUTE(1, 2);
+#endif
+
 #endif /* _LIBREPLACE_REPLACE_H */
diff --git a/lib/replace/wscript b/lib/replace/wscript
index d5b2631..f1f1cef 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -193,6 +193,8 @@ struct foo bar = { .y = 'X', .x = 1 };
 checklibc=True)
 if not conf.CHECK_FUNCS('getpeereid'):
 conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h 
bsd/unistd.h')
+if not conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h 
bsd/unistd.h'):
+conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', 
headers='setproctitle.h')
 
 conf.CHECK_CODE('''
 struct ucred cred;
diff --git a/source4/scripting/python/samba/netcmd/domain.py 
b/source4/scripting/python/samba/netcmd/domain.py
index 0954f63..4c76f0b 100644
--- a/source4/scripting/python/samba/netcmd/domain.py
+++ b/source4/scripting/python/samba/netcmd/domain.py
@@ -137,9 +137,9 @@ class cmd_domain_info(Command):
 
 
 class cmd_domain_provision(Command):
-Promotes an existing domain member or NT4 PDC to an AD DC
+Provision a domain.
 
-synopsis = %prog dnsdomain [DC|RODC] [options]
+synopsis = %prog [options]
 
 takes_optiongroups = {
 sambaopts: options.SambaOptions,
@@ -265,7 +265,10 @@ class cmd_domain_provision(Command):
 
 creds.set_kerberos_state(DONT_USE_KERBEROS

[SCM] Samba Shared Repository - branch master updated

2012-09-24 Thread Jelmer Vernooij

The branch, master has been updated
   via  6749cfb replace: Avoid returning value in void setproctitle() 
replacement.
  from  322654d We now pass samba3.raw.acls.generic and 
samba3.smb2.acls.GENERIC with the max access change.

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


- Log -
commit 6749cfb418cd8e21df626c7144f1f4db3b6770e7
Author: Jelmer Vernooij jel...@samba.org
Date:   Tue Sep 25 01:22:56 2012 +0200

replace: Avoid returning value in void setproctitle() replacement.

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Tue Sep 25 06:38:40 CEST 2012 on sn-devel-104

---

Summary of changes:
 lib/replace/replace.c |1 -
 1 files changed, 0 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/replace.c b/lib/replace/replace.c
index a0aa788..e461471 100644
--- a/lib/replace/replace.c
+++ b/lib/replace/replace.c
@@ -898,6 +898,5 @@ int rep_usleep(useconds_t sec)
 #ifndef HAVE_SETPROCTITLE
 void rep_setproctitle(const char *fmt, ...)
 {
-   return 0;
 }
 #endif


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-09-16 Thread Jelmer Vernooij

The branch, master has been updated
   via  c0d4f24 s4-python: Formatting fixes, break lines.
   via  0ff2ea5 samba.netcmd: Formatting fixes, break lines.
   via  ebcb6a7 samba.provision.common: Fix formatting.
   via  cd7dcf4 samba.provision.sambadns: Fix formatting.
   via  8581359 samba.provision.backend: Fix formatting.
   via  fdb873a samba.provision: Fix formatting, NameErrors.
  from  520c9b0 replace: add some includes for poll.h

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


- Log -
commit c0d4f2462f75e0bc0545402b76984b4e6fcb13f1
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Sep 16 14:18:51 2012 +0200

s4-python: Formatting fixes, break lines.

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Sun Sep 16 15:58:04 CEST 2012 on sn-devel-104

commit 0ff2ea56d97cd8df7abeea8e819d7ec0bfd5b886
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Sep 16 14:18:39 2012 +0200

samba.netcmd: Formatting fixes, break lines.

commit ebcb6a744791478bfc4be0b94733ace540ab06bc
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Sep 16 00:34:14 2012 +0200

samba.provision.common: Fix formatting.

commit cd7dcf4571b321f39eda07c489dd16833d8d4185
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Sep 16 00:34:00 2012 +0200

samba.provision.sambadns: Fix formatting.

commit 858135920d54662a06252deac4dbf9191a251018
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Sep 16 00:33:09 2012 +0200

samba.provision.backend: Fix formatting.

commit fdb873a203695f0b208967a561424c0357374e5b
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Sep 16 00:32:52 2012 +0200

samba.provision: Fix formatting, NameErrors.

---

Summary of changes:
 source4/scripting/python/samba/idmap.py|2 -
 source4/scripting/python/samba/join.py |   51 +++---
 .../scripting/python/samba/netcmd/delegation.py|   20 ++-
 source4/scripting/python/samba/netcmd/dns.py   |  137 +++
 source4/scripting/python/samba/netcmd/domain.py|  164 +-
 source4/scripting/python/samba/netcmd/sites.py |5 +-
 source4/scripting/python/samba/netcmd/spn.py   |   31 ++--
 source4/scripting/python/samba/netcmd/testparm.py  |   20 ++-
 source4/scripting/python/samba/netcmd/time.py  |3 +-
 source4/scripting/python/samba/netcmd/user.py  |   23 ++-
 .../scripting/python/samba/provision/__init__.py   |  148 +---
 .../scripting/python/samba/provision/backend.py|1 +
 source4/scripting/python/samba/provision/common.py |2 -
 .../scripting/python/samba/provision/sambadns.py   |  183 ++--
 source4/scripting/python/samba/samba3/__init__.py  |5 +
 source4/scripting/python/samba/samdb.py|1 -
 source4/scripting/python/samba/sd_utils.py |9 +-
 source4/scripting/python/samba/tests/dns.py|5 +-
 source4/scripting/python/samba/tests/gensec.py |2 +-
 source4/scripting/python/samba/tests/hostconfig.py |4 +-
 source4/scripting/python/samba/tests/messaging.py  |2 +-
 source4/scripting/python/samba/tests/posixacl.py   |6 +-
 source4/scripting/python/samba/tests/provision.py  |   12 +-
 source4/scripting/python/samba/tests/registry.py   |2 +-
 source4/scripting/python/samba/tests/samba3.py |1 +
 source4/scripting/python/samba/upgrade.py  |   17 ++-
 26 files changed, 485 insertions(+), 371 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/idmap.py 
b/source4/scripting/python/samba/idmap.py
index b651b20..0cb729f 100644
--- a/source4/scripting/python/samba/idmap.py
+++ b/source4/scripting/python/samba/idmap.py
@@ -96,5 +96,3 @@ cn: %s
 
  % (sid, unixid, sid, type_string, sid)
 self.add(self.parse_ldif(mod).next()[1])
-
-
diff --git a/source4/scripting/python/samba/join.py 
b/source4/scripting/python/samba/join.py
index ac822fb..5ddc5db 100644
--- a/source4/scripting/python/samba/join.py
+++ b/source4/scripting/python/samba/join.py
@@ -44,7 +44,7 @@ class DCJoinException(Exception):
 
 
 class dc_join(object):
-'''perform a DC join'''
+Perform a DC join.
 
 def __init__(ctx, server=None, creds=None, lp=None, site=None,
  netbios_name=None, targetdir=None, domain=None,
@@ -166,7 +166,7 @@ class dc_join(object):
 pass
 
 def cleanup_old_join(ctx):
-'''remove any DNs from a previous join'''
+Remove any DNs from a previous join.
 try:
 # find the krbtgt link
 print(checking sAMAccountName)
@@ -219,7 +219,7 @@ class dc_join(object):
 pass
 
 def promote_possible(ctx):
-'''confirm that the account is just a bare NT4 BDC or a member server, 
so can be safely promoted'''
+confirm

[SCM] Samba Shared Repository - branch master updated

2012-07-16 Thread Jelmer Vernooij

The branch, master has been updated
   via  a7d5d08 Revert Remove XSLT script to generate image dependencies, 
instead rely on make
  from  c92a567 pytdb: Check if the database is closed before we touch it

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


- Log -
commit a7d5d08191550de3205699834164ec1f7ef8aa15
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Jul 16 14:26:50 2012 +0200

Revert Remove XSLT script to generate image dependencies, instead rely on 
make

This reverts commit c4493c22f129b2c94f361e6f8657adc7cd2dc1c6.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=7562

Conflicts:
docs-xml/Makefile

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Mon Jul 16 16:18:46 CEST 2012 on sn-devel-104

---

Summary of changes:
 docs-xml/Makefile   |   70 +++---
 docs-xml/xslt/generate-dependencies.xsl |   36 
 2 files changed, 89 insertions(+), 17 deletions(-)
 create mode 100644 docs-xml/xslt/generate-dependencies.xsl


Changeset truncated at 500 lines:

diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 40aa161..8cf05f7 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -53,10 +53,15 @@ release:: manpages3 htmlman3 html pdf
 clean::
@echo Cleaning up... 
rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)
-   rm -f $(patsubst %.svg,%.png,$(wildcard */images/*.svg)) \
- $(patsubst %.svg,%.eps,$(wildcard */images/*.svg)) \
- $(patsubst %.png,%.eps,$(wildcard */images/*.png))
rm -f *-attributions.xml
+   rm -f $(patsubst %.svg,%.png,$(foreach 
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \
+   $(patsubst %.svg,%.pdf,$(foreach 
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
+   $(patsubst %.svg,%.eps,$(foreach 
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
+   $(patsubst %.svg,%.png,$(foreach 
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg)))
+   rm -f *-attributions.xml *.d *.tpt *.tex *.loc *.toc *.lof *.glo *.idx 
*.aux
+   rm -f *-images-html*
+   rm -f *-images-latex-* $(LATEX_FIGURES)
+   rm -f xslt/figures/*pdf
rm -f $(SMBDOTCONFDOC)/parameters.*.xml
rm -f build/catalog.xml
 
@@ -104,7 +109,7 @@ $(HTMLDIR)/index.html: htmldocs.html
@mkdir -p $(@D)
cp $ $@

-$(HTMLDIR)/%/index.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/%/samba.css 
xslt/html-chunk.xsl
+$(HTMLDIR)/%/index.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/%/samba.css 
xslt/html-chunk.xsl %-images-html-chunks
@mkdir -p $(@D)
$(XSLTPROC) --stringparam base.dir $(HTMLDIR)/$*/ xslt/html-chunk.xsl 
$
 
@@ -113,16 +118,7 @@ $(OUTPUTDIR)/%/samba.css: xslt/html/samba.css
@mkdir -p $(@D)
cp $ $@
 
-$(patsubst %,$(HTMLDIR)/%.html,$(MAIN_DOCS)): $(HTMLDIR)/%.html: %-images-png
-
-define IMAGES_TEMPLATE
-$(1)-images-png:: $$(patsubst %.svg,%.png,$$(wildcard $(1)/images/*.svg)) ;
-$(1)-images-eps:: $$(patsubst %.svg,%.eps,$$(wildcard $(1)/images/*.svg)) ;
-$(1)-images-eps:: $$(patsubst %.png,%.eps,$$(wildcard $(1)/images/*.png)) ;
-
-endef
-
-$(eval $(foreach DOC, $(MAIN_DOCS),$(call IMAGES_TEMPLATE,$(DOC
+$(patsubst %,$(HTMLDIR)/%.html,$(MAIN_DOCS)): $(HTMLDIR)/%.html: 
%-images-html-single
 
 $(HTMLDIR)/%.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/samba.css xslt/html.xsl 
$(XSLTPROC) --output $@ xslt/html.xsl $
@@ -144,12 +140,47 @@ $(TXTDIR)/%.txt: $(HTMLDIR)/%.html
@mkdir -p $(@D)
@$(DBLATEX) $(DBLATEX_OPTIONS) -t tex -o $@ $
 
+# Dependency files
+%.d: $(DOCBOOKDIR)/%.xml xslt/generate-dependencies.xsl
+   @echo Generating dependency file for $* 
+   @$(XSLTPROC) --novalid \
+   --stringparam txtbasedir $(TXTDIR)/$*/ \
+   --stringparam target $* \
+   -o $@ xslt/generate-dependencies.xsl $
+   @echo $*-images-latex-svg = \$$(wildcard \$$(addsuffix .svg, 
\$$($*-images-latex)))  $@
+   @echo $*-images-latex-eps: \$$(addsuffix .eps, \$$($*-images-latex)) 
 $@
+   @echo $*-images-latex-pdf: \$$(patsubst %.svg, %.pdf, 
\$$($*-images-latex-svg))  $@
+   @echo $*-images-latex-png: \$$(filter-out \$$(patsubst 
%.svg,%.png,\$$($*-images-latex-svg)), \$$(addsuffix .png, 
\$$($*-images-latex)))  $@
+
+   @echo  $@
+   @echo \$$(HTMLDIR)/%: $*/%  $@
+   @echo  @mkdir -p \$$(@D)  $@
+   @echo  @cp \$$ \$$@  $@
+   @echo  $@
+   @echo \$$(HTMLDIR)/$*/%: $*/%  $@
+   @echo  @mkdir -p \$$(@D)  $@
+   @echo  @cp \$$ \$$@  $@
+   @echo  $@
+   @echo \$$(HTMLHELPDIR)/$*/%: $*/%  $@
+   @echo  @mkdir -p \$$(@D)  $@
+   @echo  @cp \$$ \$$@  $@
+   @echo  $@
+   @echo $*-images-html-single: \$$(addprefix \$$(HTMLDIR)/, 
\$$($*-images-html

[SCM] Samba Shared Repository - branch master updated

2012-06-21 Thread Jelmer Vernooij

The branch, master has been updated
   via  7b43053 Add --disable-ntdb option for building.
   via  cbd660d samdb: Accept a list of member variables rather than a 
comma-separated string.
  from  3c74117 s3:idmap_cache: also store negative entries for unknown sids

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


- Log -
commit 7b43053ad6d1ee00895f592e7524c8591894144b
Author: Jelmer Vernooij jel...@samba.org
Date:   Thu Jun 21 16:44:55 2012 +0200

Add --disable-ntdb option for building.

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Thu Jun 21 19:59:57 CEST 2012 on sn-devel-104

commit cbd660d01381465a35dc696b6a135de22f7682e6
Author: Jelmer Vernooij jel...@samba.org
Date:   Tue Jun 19 12:43:08 2012 +0200

samdb: Accept a list of member variables rather than a comma-separated 
string.

---

Summary of changes:
 lib/ntdb/wscript   |1 +
 source4/dsdb/tests/python/acl.py   |8 
 source4/dsdb/tests/python/dirsync.py   |   18 +-
 source4/dsdb/tests/python/sec_descriptor.py|8 
 source4/scripting/python/samba/netcmd/group.py |7 +--
 source4/scripting/python/samba/samdb.py|7 +++
 wscript|9 -
 wscript_build  |3 ++-
 8 files changed, 36 insertions(+), 25 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/ntdb/wscript b/lib/ntdb/wscript
index ff8f24e..f034631 100644
--- a/lib/ntdb/wscript
+++ b/lib/ntdb/wscript
@@ -27,6 +27,7 @@ def set_options(opt):
 opt.add_option('--valgrind-log',
help=(where to put the valgrind log),
action=store, dest='VALGRINDLOG', default=None)
+
 if opt.IN_LAUNCH_DIR():
 opt.add_option('--disable-python',
help=(disable the pyntdb module),
diff --git a/source4/dsdb/tests/python/acl.py b/source4/dsdb/tests/python/acl.py
index a624614..bbd4343 100755
--- a/source4/dsdb/tests/python/acl.py
+++ b/source4/dsdb/tests/python/acl.py
@@ -128,9 +128,9 @@ class AclAddTests(AclTests):
 self.ldb_admin.newuser(self.regular_user, self.user_pass)
 
 # add admins to the Domain Admins group
-self.ldb_admin.add_remove_group_members(Domain Admins, 
self.usr_admin_owner,
+self.ldb_admin.add_remove_group_members(Domain Admins, 
[self.usr_admin_owner],
add_members_operation=True)
-self.ldb_admin.add_remove_group_members(Domain Admins, 
self.usr_admin_not_owner,
+self.ldb_admin.add_remove_group_members(Domain Admins, 
[self.usr_admin_not_owner],
add_members_operation=True)
 
 self.ldb_owner = self.get_ldb_connection(self.usr_admin_owner, 
self.user_pass)
@@ -613,7 +613,7 @@ class AclSearchTests(AclTests):
 self.ldb_admin.newuser(self.u2, self.user_pass)
 self.ldb_admin.newuser(self.u3, self.user_pass)
 self.ldb_admin.newgroup(self.group1, 
grouptype=samba.dsdb.GTYPE_SECURITY_GLOBAL_GROUP)
-self.ldb_admin.add_remove_group_members(self.group1, self.u2,
+self.ldb_admin.add_remove_group_members(self.group1, [self.u2],
 add_members_operation=True)
 self.ldb_user = self.get_ldb_connection(self.u1, self.user_pass)
 self.ldb_user2 = self.get_ldb_connection(self.u2, self.user_pass)
@@ -1521,7 +1521,7 @@ class AclExtendedTests(AclTests):
 self.ldb_admin.newuser(self.u1, self.user_pass)
 self.ldb_admin.newuser(self.u2, self.user_pass)
 self.ldb_admin.newuser(self.u3, self.user_pass)
-self.ldb_admin.add_remove_group_members(Domain Admins, self.u3,
+self.ldb_admin.add_remove_group_members(Domain Admins, [self.u3],
 add_members_operation=True)
 self.ldb_user1 = self.get_ldb_connection(self.u1, self.user_pass)
 self.ldb_user2 = self.get_ldb_connection(self.u2, self.user_pass)
diff --git a/source4/dsdb/tests/python/dirsync.py 
b/source4/dsdb/tests/python/dirsync.py
index d6a21a9..f36a3c0 100755
--- a/source4/dsdb/tests/python/dirsync.py
+++ b/source4/dsdb/tests/python/dirsync.py
@@ -124,7 +124,7 @@ class SimpleDirsyncTests(DirsyncBaseTests):
 self.sd_utils.dacl_add_ace(self.base_dn, mod)
 
 # add admins to the Domain Admins group
-self.ldb_admin.add_remove_group_members(Domain Admins, 
self.admin_user,
+self.ldb_admin.add_remove_group_members(Domain Admins, 
[self.admin_user],
add_members_operation=True)
 
 def tearDown(self):
@@ -477,7 +477,7 @@ class SimpleDirsyncTests(DirsyncBaseTests):
 ctl[2] = 1
 ctl[3] = 1
 control1 = str(:.join

[SCM] Samba Shared Repository - branch master updated

2012-06-18 Thread Jelmer Vernooij

The branch, master has been updated
   via  85b8439 WHATSNEW: Fix typo.
   via  bf5934c tdb/wscript: Remove unecessary semicolons.
  from  59daf91 wafsamba/irixcc: add '-c99' option to cc

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


- Log -
commit 85b8439d4a4a8769a524fab2c78e46eb13b04c76
Author: Jelmer Vernooij jel...@samba.org
Date:   Tue Jun 19 01:01:17 2012 +0200

WHATSNEW: Fix typo.

dcerpc endpoint services - dcerpc endpoint servers

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Tue Jun 19 04:40:12 CEST 2012 on sn-devel-104

commit bf5934ca1b80930d8fd2f19ef12e32092b34fa4d
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon May 28 14:16:44 2012 +0200

tdb/wscript: Remove unecessary semicolons.

---

Summary of changes:
 WHATSNEW.txt|2 +-
 lib/tdb/wscript |8 
 2 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index b6c9523..6e1e98a 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -109,7 +109,7 @@ The default file server for EXISTING USERS has changed to 
s3fs.  To
 continue to use ntvfs, you must set in your smb.conf:
 
 server services = +smb -s3fs
-dcerpc endpoint services = +winreg +srvsvc
+dcerpc endpoint servers = +winreg +srvsvc
 
 samba-tool dbcheck will now upgrade older databases that are missing
 GUIDs in the schema partition.  
diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index d475204..e28e43a 100644
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -167,7 +167,7 @@ def build(bld):
 def testonly(ctx):
 '''run tdb testsuite'''
 import Utils, samba_utils, shutil
-ecode = 0;
+ecode = 0
 
 test_prefix = %s/st % (Utils.g_module.blddir)
 shutil.rmtree(test_prefix, ignore_errors=True)
@@ -192,15 +192,15 @@ def testonly(ctx):
 if ret != 0:
 print(%s failed: % f)
 samba_utils.RUN_COMMAND(cat  + os.path.join(testdir, 
'test-output'))
-ecode = ret;
-break;
+ecode = ret
+break
 
 if ecode == 0:
 cmd = os.path.join(Utils.g_module.blddir, 'tdbtorture')
 ret = samba_utils.RUN_COMMAND(cmd)
 print(testsuite returned %d % ret)
 if ret != 0:
-ecode = ret;
+ecode = ret
 sys.exit(ecode)
 
 # WAF doesn't build the unit tests for this, maybe because they don't link 
with tdb?


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-06-16 Thread Jelmer Vernooij

The branch, master has been updated
   via  8283d9e attr: Look for attr/attributes.h too.
  from  bd45745 heimdal:lib/krb5: don't name a struct 'token'

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


- Log -
commit 8283d9ec4a2d39b3d6f06ad9e98c22a26e78317f
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Jun 16 15:37:52 2012 +0200

attr: Look for attr/attributes.h too.

Fixes finding of ATTR_ROOT on GNU/kFreeBSD.

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Sat Jun 16 18:54:27 CEST 2012 on sn-devel-104

---

Summary of changes:
 lib/replace/system/filesys.h |2 ++
 lib/replace/wscript  |2 +-
 lib/replace/xattr.c  |2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/system/filesys.h b/lib/replace/system/filesys.h
index 493d87d..c8ac2b4 100644
--- a/lib/replace/system/filesys.h
+++ b/lib/replace/system/filesys.h
@@ -114,6 +114,8 @@
 
 #if HAVE_SYS_ATTRIBUTES_H
 #include sys/attributes.h
+#elif HAVE_ATTR_ATTRIBUTES_H
+#include attr/attributes.h
 #endif
 
 /* mutually exclusive (SuSE 8.2) */
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 7e4055b..68138cf 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -43,7 +43,7 @@ def configure(conf):
 conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h')
 conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h')
 conf.CHECK_HEADERS('shadow.h sys/acl.h')
-conf.CHECK_HEADERS('sys/attributes.h sys/capability.h sys/dir.h 
sys/epoll.h')
+conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h 
sys/dir.h sys/epoll.h')
 conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h 
sys/fs/vx/quota.h')
 conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h 
sys/ndir.h sys/priv.h')
 conf.CHECK_HEADERS('sys/resource.h sys/security.h sys/shm.h sys/statfs.h 
sys/statvfs.h sys/termio.h')
diff --git a/lib/replace/xattr.c b/lib/replace/xattr.c
index 07c130f..8e1c989 100644
--- a/lib/replace/xattr.c
+++ b/lib/replace/xattr.c
@@ -252,7 +252,7 @@ static ssize_t bsd_attr_list (int type, extattr_arg arg, 
char *list, size_t size
 
 #endif
 
-#if defined(HAVE_ATTR_LIST)  defined(HAVE_SYS_ATTRIBUTES_H)
+#if defined(HAVE_ATTR_LIST)  (defined(HAVE_SYS_ATTRIBUTES_H) || 
defined(HAVE_ATTR_ATTRIBUTES_H))
 static char attr_buffer[ATTR_MAX_VALUELEN];
 
 static ssize_t irix_attr_list(const char *path, int filedes, char *list, 
size_t size, int flags)


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-06-14 Thread Jelmer Vernooij

The branch, master has been updated
   via  98bd0d1 waf: Update to newer upstream snapshot.
   via  eacb77b update-waf.sh: make mktemp happy by including anything Xes.
   via  ce10a7a lib/util: Fix typo in comment.
  from  ec60944 make librpc/build_idl.sh more portable

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


- Log -
commit 98bd0d18db0ff6f08b38d409528a9e15b0d5b560
Author: Jelmer Vernooij jel...@samba.org
Date:   Thu Jun 14 23:02:28 2012 +0200

waf: Update to newer upstream snapshot.

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Fri Jun 15 03:12:35 CEST 2012 on sn-devel-104

commit eacb77bb927d1895525967eba154eaf76db8344c
Author: Jelmer Vernooij jel...@samba.org
Date:   Thu Jun 14 23:02:06 2012 +0200

update-waf.sh: make mktemp happy by including anything Xes.

commit ce10a7a673e8adf7cda0a136ea3421e3a0ca6033
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun May 13 03:29:48 2012 +0200

lib/util: Fix typo in comment.

---

Summary of changes:
 buildtools/update-waf.sh|2 +-
 buildtools/wafadmin/Tools/python.py |   20 +++-
 lib/util/charset/convert_string.c   |2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/update-waf.sh b/buildtools/update-waf.sh
index c368f5a..277111f 100755
--- a/buildtools/update-waf.sh
+++ b/buildtools/update-waf.sh
@@ -2,7 +2,7 @@
 # Update our copy of waf
 
 TARGETDIR=`dirname $0`
-WORKDIR=`mktemp -d -t update-waf`
+WORKDIR=`mktemp -d -t update-waf-XX`
 
 mkdir -p $WORKDIR
 
diff --git a/buildtools/wafadmin/Tools/python.py 
b/buildtools/wafadmin/Tools/python.py
index 4f73081..511cf09 100644
--- a/buildtools/wafadmin/Tools/python.py
+++ b/buildtools/wafadmin/Tools/python.py
@@ -6,9 +6,9 @@
 Python support
 
 import os, sys
-import TaskGen, Utils, Utils, Runner, Options, Build
+import TaskGen, Utils, Options
 from Logs import debug, warn, info
-from TaskGen import extension, taskgen, before, after, feature
+from TaskGen import extension, before, after, feature
 from Configure import conf
 
 EXT_PY = ['.py']
@@ -173,7 +173,7 @@ def check_python_headers(conf, mandatory=True):
(python_prefix, python_SO, python_SYSLIBS, python_LDFLAGS, 
python_SHLIBS,
 python_LIBDIR, python_LIBPL, INCLUDEPY, Py_ENABLE_SHARED,
 python_MACOSX_DEPLOYMENT_TARGET) = \
-   _get_python_variables(python, [get_config_var('%s') % 
x for x in v],
+   _get_python_variables(python, [get_config_var('%s') or 
'' % x for x in v],
  ['from distutils.sysconfig import 
get_config_var'])
except RuntimeError:
conf.fatal(Python development headers not found (-v for 
details).)
@@ -310,7 +310,7 @@ def check_python_version(conf, minver=None):
# Get python version string
cmd = [python, -c, import sys\nfor x in sys.version_info: 
print(str(x))]
debug('python: Running python command %r' % cmd)
-   proc = Utils.pproc.Popen(cmd, stdout=Utils.pproc.PIPE)
+   proc = Utils.pproc.Popen(cmd, stdout=Utils.pproc.PIPE, shell=False)
lines = proc.communicate()[0].split()
assert len(lines) == 5, found %i lines, expected 5: %r % (len(lines), 
lines)
pyver_tuple = (int(lines[0]), int(lines[1]), int(lines[2]), lines[3], 
int(lines[4]))
@@ -329,14 +329,14 @@ def check_python_version(conf, minver=None):
if sys.platform == 'win32':
(python_LIBDEST, pydir) = \
_get_python_variables(python,
-   
  [get_config_var('LIBDEST'),
-   
   get_python_lib(standard_lib=0, prefix=%r) % conf.env['PREFIX']],
+   
  [get_config_var('LIBDEST') or '',
+   
   get_python_lib(standard_lib=0, prefix=%r) or '' % 
conf.env['PREFIX']],

  ['from distutils.sysconfig import get_config_var, get_python_lib'])
else:
python_LIBDEST = None
(pydir,) = \
_get_python_variables(python,
-   
  [get_python_lib(standard_lib=0, prefix=%r) % conf.env['PREFIX

[SCM] Samba Shared Repository - branch master updated

2012-05-27 Thread Jelmer Vernooij

The branch, master has been updated
   via  bf38a5d Avoid all(), as it's not available in Python 2.4.
  from  39076c5 build: Remove all references to libuuid

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


- Log -
commit bf38a5df5b69d41e4fa5fff7cb4447a5155058ce
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun May 27 14:17:52 2012 +0200

Avoid all(), as it's not available in Python 2.4.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Sun May 27 16:13:34 CEST 2012 on sn-devel-104

---

Summary of changes:
 source4/scripting/python/samba/__init__.py |6 +-
 1 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/__init__.py 
b/source4/scripting/python/samba/__init__.py
index 6ffd2a3..23c6ed7 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -302,12 +302,16 @@ MAX_NETBIOS_NAME_LEN = 15
 def is_valid_netbios_char(c):
 return (c.isalnum() or c in  !#$%'()-.@^_{}~)
 
+
 def valid_netbios_name(name):
 Check whether a name is valid as a NetBIOS name. 
 # See crh's book (1.4.1.1)
 if len(name)  MAX_NETBIOS_NAME_LEN:
 return False
-return all([is_valid_netbios_char(x) for x in name])
+for x in name:
+if not is_valid_netbios_char(x):
+return False
+return True
 
 
 def import_bundled_package(modulename, location):


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-05-17 Thread Jelmer Vernooij

The branch, master has been updated
   via  01c502d pygensec: Fix init of variable if not specified.
  from  e0b924b Note that keepalive only applies to SMB1 connections.

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


- Log -
commit 01c502ddd41857e2dea9a01ac4afbe48e5ea1fdd
Author: Jelmer Vernooij jel...@samba.org
Date:   Thu May 17 23:48:26 2012 +0200

pygensec: Fix init of variable if not specified.

Thanks to Wolfgang Sourdeau for reporting this.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=8946

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Fri May 18 04:50:17 CEST 2012 on sn-devel-104

---

Summary of changes:
 source4/auth/gensec/pygensec.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/auth/gensec/pygensec.c b/source4/auth/gensec/pygensec.c
index 5a8744d..a991aef 100644
--- a/source4/auth/gensec/pygensec.c
+++ b/source4/auth/gensec/pygensec.c
@@ -81,7 +81,7 @@ static PyObject *py_gensec_start_client(PyTypeObject *type, 
PyObject *args, PyOb
pytalloc_Object *self;
struct gensec_settings *settings;
const char *kwnames[] = { settings, NULL };
-   PyObject *py_settings;
+   PyObject *py_settings = Py_None;
struct gensec_security *gensec;
 
if (!PyArg_ParseTupleAndKeywords(args, kwargs, |O, 
discard_const_p(char *, kwnames), py_settings))


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-05-15 Thread Jelmer Vernooij

The branch, master has been updated
   via  a66865d Use ENC_ values for proto_tree_add_item() calls.
  from  8588d10 s4:ntvfs/smb2: remove misleading comment regarding 
security=server

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


- Log -
commit a66865dd287073f21ce279d52450582ea290c7df
Author: Guy Harris g...@alum.mit.edu
Date:   Tue May 15 09:49:53 2012 +0200

Use ENC_ values for proto_tree_add_item() calls.

It appears that the integral value containing the bits in a bitmap should be
dissected according to the data representation, as the individual fields are
fetched by dissect_ndr_XXX, which is passed the data representation and
extracts the value appropriately for the data representation, so the patch
replaces TRUE (which meant always little-endian when the last argument to
proto_tree_add_item() was a byte-order Boolean) with DREP_ENC_INTEGER(drep)
(which means ENC_BIG_ENDIAN or ENC_LITTLE_ENDIAN, depending on the data
representation).

For structures, I'm just using ENC_NA.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=8942
Signed-off-by: Jelmer Vernooij jel...@samba.org

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Tue May 15 12:07:06 CEST 2012 on sn-devel-104

---

Summary of changes:
 pidl/lib/Parse/Pidl/Wireshark/NDR.pm |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/pidl/lib/Parse/Pidl/Wireshark/NDR.pm 
b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
index 46c9850..1aa44c3 100644
--- a/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
+++ b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
@@ -215,7 +215,7 @@ sub Bitmap()
 
$self-pidl_code(if (parent_tree) {);
$self-indent;
-   $self-pidl_code(item = proto_tree_add_item(parent_tree, hf_index, 
tvb, offset, $e-{ALIGN}, TRUE););
+   $self-pidl_code(item = proto_tree_add_item(parent_tree, hf_index, 
tvb, offset, $e-{ALIGN}, DREP_ENC_INTEGER(drep)););
$self-pidl_code(tree = 
proto_item_add_subtree(item,ett_$ifname\_$name););
$self-deindent;
$self-pidl_code(}\n);
@@ -648,7 +648,7 @@ sub Struct()
$self-pidl_code();
$self-pidl_code(if (parent_tree) {);
$self-indent;
-   $self-pidl_code(item = proto_tree_add_item(parent_tree, hf_index, 
tvb, offset, -1, TRUE););
+   $self-pidl_code(item = proto_tree_add_item(parent_tree, hf_index, 
tvb, offset, -1, ENC_NA););
$self-pidl_code(tree = proto_item_add_subtree(item, 
ett_$ifname\_$name););
$self-deindent;
$self-pidl_code(});


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-05-12 Thread Jelmer Vernooij

The branch, master has been updated
   via  cf67da7 libreplace: Fix symbol names for 
snprintf/asprintf/vasprintf.
  from  212e805 s3:smb2_ioctl: implement FSCTL_VALIDATE_NEGOTIATE_INFO

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


- Log -
commit cf67da70c9a63c4dc63f287059321d6c36d1e19e
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun May 13 03:21:34 2012 +0200

libreplace: Fix symbol names for snprintf/asprintf/vasprintf.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Sun May 13 05:16:28 CEST 2012 on sn-devel-104

---

Summary of changes:
 lib/replace/snprintf.c |   12 ++--
 1 files changed, 6 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/snprintf.c b/lib/replace/snprintf.c
index bca7742..877d2a1 100644
--- a/lib/replace/snprintf.c
+++ b/lib/replace/snprintf.c
@@ -1187,7 +1187,7 @@ static int add_cnk_list_entry(struct pr_chunk_x **list,
return max;
 }
 
- int vsnprintf (char *str, size_t count, const char *fmt, va_list args)
+ int rep_vsnprintf (char *str, size_t count, const char *fmt, va_list args)
 {
return dopr(str, count, fmt, args);
 }
@@ -1200,7 +1200,7 @@ static int add_cnk_list_entry(struct pr_chunk_x **list,
  * that doesn't work properly according to the autoconf test.
  */
 #if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_VSNPRINTF)
- int snprintf(char *str,size_t count,const char *fmt,...)
+ int rep_snprintf(char *str,size_t count,const char *fmt,...)
 {
size_t ret;
va_list ap;
@@ -1213,7 +1213,7 @@ static int add_cnk_list_entry(struct pr_chunk_x **list,
 #endif
 
 #ifndef HAVE_C99_VSNPRINTF
- int printf(const char *fmt, ...)
+ int rep_printf(const char *fmt, ...)
 {
va_list ap;
int ret;
@@ -1234,7 +1234,7 @@ static int add_cnk_list_entry(struct pr_chunk_x **list,
 #endif
 
 #ifndef HAVE_C99_VSNPRINTF
- int fprintf(FILE *stream, const char *fmt, ...)
+ int rep_fprintf(FILE *stream, const char *fmt, ...)
 {
va_list ap;
int ret;
@@ -1257,7 +1257,7 @@ static int add_cnk_list_entry(struct pr_chunk_x **list,
 #endif 
 
 #ifndef HAVE_VASPRINTF
- int vasprintf(char **ptr, const char *format, va_list ap)
+ int rep_vasprintf(char **ptr, const char *format, va_list ap)
 {
int ret;
va_list ap2;
@@ -1280,7 +1280,7 @@ static int add_cnk_list_entry(struct pr_chunk_x **list,
 
 
 #ifndef HAVE_ASPRINTF
- int asprintf(char **ptr, const char *format, ...)
+ int rep_asprintf(char **ptr, const char *format, ...)
 {
va_list ap;
int ret;


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-05-11 Thread Jelmer Vernooij

The branch, master has been updated
   via  61546b5 samba4: When running samba_dnsupdate during tests, use the 
test smb.conf.
  from  0fefe24 Fix bug #8922.

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


- Log -
commit 61546b5263d8363133e82c68ad823f9221120e9c
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri May 11 16:01:33 2012 +0200

samba4: When running samba_dnsupdate during tests, use the test
smb.conf.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Fri May 11 18:18:53 CEST 2012 on sn-devel-104

---

Summary of changes:
 selftest/target/Samba4.pm |   14 +++---
 1 files changed, 7 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index b52bc0e..1e53c21 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -587,17 +587,17 @@ sub provision_raw_step1($$)
log level = $ctx-{server_loglevel}
lanman auth = Yes
rndc command = true
-dns update command = 
$ENV{SRCDIR_ABS}/source4/scripting/bin/samba_dnsupdate --all-interfaces 
--use-file=$ctx-{dns_host_file}
-spn update command = 
$ENV{SRCDIR_ABS}/source4/scripting/bin/samba_spnupdate
-resolv:host file = $ctx-{dns_host_file}
+   dns update command = 
$ENV{SRCDIR_ABS}/source4/scripting/bin/samba_dnsupdate --all-interfaces 
--use-file=$ctx-{dns_host_file} -s $ctx-{smb_conf}
+   spn update command = 
$ENV{SRCDIR_ABS}/source4/scripting/bin/samba_spnupdate -s $ctx-{smb_conf}
+   resolv:host file = $ctx-{dns_host_file}
dreplsrv:periodic_startup_interval = 0
dsdb:schema update allowed = yes
 
-passdb backend = samba4
+   passdb backend = samba4
 
-# remove this again, when our smb2 client library
-# supports signin on compound related requests
-server signing = on
+   # remove this again, when our smb2 client library
+   # supports signin on compound related requests
+   server signing = on
 ;
 
if (defined($ctx-{sid_generator})  $ctx-{sid_generator} ne 
internal) {


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-05-07 Thread Jelmer Vernooij

The branch, master has been updated
   via  890485b heimdal: Cope with newer Heimdal versions accepting a 
keyset argument to hdb_enctype2key.
  from  4754743 s3:registry: let reg_values_need_update() return true if 
the backend does not implement the method

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


- Log -
commit 890485bd17142ac9bbaf71c24d3d3ec1fa4a6724
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon May 7 16:43:17 2012 +0200

heimdal: Cope with newer Heimdal versions accepting a keyset argument to
hdb_enctype2key.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Mon May  7 18:33:10 CEST 2012 on sn-devel-104

---

Summary of changes:
 source4/heimdal_build/wscript_configure |   26 ++
 source4/kdc/pac-glue.c  |4 
 2 files changed, 26 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/heimdal_build/wscript_configure 
b/source4/heimdal_build/wscript_configure
index a350a8b..619944d 100755
--- a/source4/heimdal_build/wscript_configure
+++ b/source4/heimdal_build/wscript_configure
@@ -213,15 +213,33 @@ check_system_heimdal_lib(gssapi, gss_oid_to_name, 
gssapi.h,
 onlyif=hcrypto asn1 roken krb5 com_err wind)
 check_system_heimdal_lib(heimntlm, heim_ntlm_ntlmv2_key, heimntlm.h,
 onlyif=roken hcrypto krb5)
-check_system_heimdal_lib(hdb, hdb_db_dir, krb5.h hdb.h,
-onlyif=roken krb5 hcrypto com_err wind)
+if check_system_heimdal_lib(hdb, hdb_db_dir, krb5.h hdb.h,
+onlyif=roken krb5 hcrypto com_err wind):
+CCDEFINES = list(conf.env.CCDEFINES)
+conf.undefine(HAVE_CONFIG_H)
+while HAVE_CONFIG_H=1 in conf.env.CCDEFINES:
+conf.env.CCDEFINES.remove(HAVE_CONFIG_H=1)
+try:
+conf.CHECK_CODE('''
+#include hdb.h
+int main(void) { hdb_enctype2key(NULL, NULL, NULL, 0, NULL); }
+''',
+define='HDB_ENCTYPE2KEY_TAKES_KEYSET',
+addmain=False,
+lib='hdb',
+msg='Checking whether hdb_enctype2key takes a keyset argument',
+local_include=False)
+finally:
+conf.env.CCDEFINES = CCDEFINES
+conf.define(HAVE_CONFIG_H, 1)
+
 check_system_heimdal_lib(kdc, kdc_log, kdc.h,
 onlyif=roken krb5 hdb asn1 heimntlm hcrypto com_err wind heimbase)
 
 
 # With the proper checks in place we should be able to build against the 
system libtommath.
-# conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', 
headers='tommath.h')
-# conf.define('USING_SYSTEM_TOMMATH', 1)
+#if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', 
headers='tommath.h'):
+#conf.define('USING_SYSTEM_TOMMATH', 1)
 
 check_system_heimdal_binary(compile_et)
 check_system_heimdal_binary(asn1_compile)
diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c
index d654dc3..cca74d8 100644
--- a/source4/kdc/pac-glue.c
+++ b/source4/kdc/pac-glue.c
@@ -482,7 +482,11 @@ int kdc_check_pac(krb5_context context,
}
}
 
+#if HDB_ENCTYPE2KEY_TAKES_KEYSET
+   ret = hdb_enctype2key(context, ent-entry, NULL, etype, key);
+#else
ret = hdb_enctype2key(context, ent-entry, etype, key);
+#endif
 
if (ret != 0) {
return ret;


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-05-03 Thread Jelmer Vernooij

The branch, master has been updated
   via  1077337 torture: Suggest torture_fail() / torture_result().
   via  7ed9eba provision: remove reference to no longer existing template 
files.
  from  86b1dd8 s4-samba-tool: make new samba-tool group listmembers use 
samAccountName

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


- Log -
commit 1077337afb7fd62b8d9aa4bfb1b95e7a1104e3da
Author: Jelmer Vernooij jel...@samba.org
Date:   Thu May 3 13:42:57 2012 +0200

torture: Suggest torture_fail() / torture_result().

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Thu May  3 15:31:06 CEST 2012 on sn-devel-104

commit 7ed9ebab83f1883d09bee742d81e8d2308da1bfe
Author: Jelmer Vernooij jel...@samba.org
Date:   Thu Apr 26 20:08:04 2012 +0200

provision: remove reference to no longer existing template files.

---

Summary of changes:
 lib/torture/torture.c  |3 ++-
 .../scripting/python/samba/provision/__init__.py   |   12 +---
 source4/setup/wscript_build|3 +--
 3 files changed, 8 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/torture/torture.c b/lib/torture/torture.c
index cee6bdb..a2799ef 100644
--- a/lib/torture/torture.c
+++ b/lib/torture/torture.c
@@ -443,7 +443,8 @@ static bool internal_torture_run_test(struct 
torture_context *context,
 
if (!success  context-last_result == TORTURE_OK) {
if (context-last_reason == NULL)
-   context-last_reason = talloc_strdup(context, 
Unknown error/failure);
+   context-last_reason = talloc_strdup(context,
+   Unknown error/failure. Missing 
torture_fail() or torture_result() call?);
context-last_result = TORTURE_ERROR;
}
}
diff --git a/source4/scripting/python/samba/provision/__init__.py 
b/source4/scripting/python/samba/provision/__init__.py
index d84a0f8..a60c05a 100644
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -1796,12 +1796,10 @@ def provision(logger, session_info, credentials, 
smbconf=None,
 
 if serverrole == domain controller:
 if paths.netlogon is None:
-raise MissingShareError(netlogon, paths.smbconf,
-setup_path(provision.smb.conf.dc))
+raise MissingShareError(netlogon, paths.smbconf)
 
 if paths.sysvol is None:
-raise MissingShareError(sysvol, paths.smbconf,
-setup_path(provision.smb.conf.dc))
+raise MissingShareError(sysvol, paths.smbconf)
 
 if not os.path.isdir(paths.netlogon):
 os.makedirs(paths.netlogon, 0755)
@@ -1947,8 +1945,8 @@ class InvalidNetbiosName(Exception):
 
 class MissingShareError(ProvisioningError):
 
-def __init__(self, name, smbconf, smbconf_template):
+def __init__(self, name, smbconf):
 super(MissingShareError, self).__init__(
 Existing smb.conf does not have a [%s] share, but you are 
-configuring a DC. Please either remove %s or see the template 
-at %s % (name, smbconf, smbconf_template))
+configuring a DC. Please remove %s or add the share manually. %
+(name, smbconf))
diff --git a/source4/setup/wscript_build b/source4/setup/wscript_build
index 3558682..2513f28 100644
--- a/source4/setup/wscript_build
+++ b/source4/setup/wscript_build
@@ -13,7 +13,6 @@ bld.INSTALL_FILES('${SETUPDIR}', 'dns_update_list')
 bld.INSTALL_FILES('${SETUPDIR}', 'spn_update_list')
 
 for p in '''schema-map-* DB_CONFIG *.inf *.ldif *.reg *.zone *.conf *.php *.txt
-named.conf named.conf.update named.conf.dlz provision.smb.conf.dc
-provision.smb.conf.member provision.smb.conf.standalone'''.split():
+named.conf named.conf.update named.conf.dlz'''.split():
 bld.INSTALL_WILDCARD('${SETUPDIR}', p)
 


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-05-03 Thread Jelmer Vernooij

The branch, master has been updated
   via  d3b4c2c UTIL_TDB: lowercase name.
   via  a38e2cb libtorture: Improve suggestion to mention 
torture_assert_*() rather than torture_result().
  from  027f2b3 s4:torture: add a new smb2.session.reauth3 test - getting 
security descriptor

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


- Log -
commit d3b4c2c7714091a588f6aeaf784380cea54e73cf
Author: Jelmer Vernooij jel...@samba.org
Date:   Thu May 3 18:26:35 2012 +0200

UTIL_TDB: lowercase name.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Thu May  3 20:18:22 CEST 2012 on sn-devel-104

commit a38e2cbbb31866c4af3b352a9dbbfcabb41ab4b8
Author: Jelmer Vernooij jel...@samba.org
Date:   Thu May 3 16:38:31 2012 +0200

libtorture: Improve suggestion to mention torture_assert_*() rather than
torture_result().

---

Summary of changes:
 lib/torture/torture.c   |2 +-
 lib/util/wscript_build  |4 ++--
 libcli/auth/wscript_build   |2 +-
 source3/wscript_build   |6 +++---
 source4/lib/messaging/wscript_build |2 +-
 source4/ntvfs/common/wscript_build  |2 +-
 source4/param/wscript_build |2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/torture/torture.c b/lib/torture/torture.c
index a2799ef..1b0a956 100644
--- a/lib/torture/torture.c
+++ b/lib/torture/torture.c
@@ -444,7 +444,7 @@ static bool internal_torture_run_test(struct 
torture_context *context,
if (!success  context-last_result == TORTURE_OK) {
if (context-last_reason == NULL)
context-last_reason = talloc_strdup(context,
-   Unknown error/failure. Missing 
torture_fail() or torture_result() call?);
+   Unknown error/failure. Missing 
torture_fail() or torture_assert_*() call?);
context-last_result = TORTURE_ERROR;
}
}
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 79b9f02..d50592b 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -47,11 +47,11 @@ bld.SAMBA_LIBRARY('wrap_xattr',
)
 
 
-bld.SAMBA_LIBRARY('UTIL_TDB',
+bld.SAMBA_LIBRARY('util_tdb',
source='util_tdb.c',
local_include=False,
public_deps='tdb_compat talloc',
-  private_library=True
+   private_library=True
)
 
 bld.SAMBA_LIBRARY('tevent-util',
diff --git a/libcli/auth/wscript_build b/libcli/auth/wscript_build
index 893cfd9..092d5e4 100755
--- a/libcli/auth/wscript_build
+++ b/libcli/auth/wscript_build
@@ -25,7 +25,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_AUTH',
 
 bld.SAMBA_SUBSYSTEM('COMMON_SCHANNEL',
source='schannel_state_tdb.c schannel_sign.c',
-   deps='tdb-wrap UTIL_TDB samba-hostconfig NDR_NETLOGON'
+   deps='tdb-wrap util_tdb samba-hostconfig NDR_NETLOGON'
)
 
 
diff --git a/source3/wscript_build b/source3/wscript_build
index dc01750..91ea293 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -749,7 +749,7 @@ bld.SAMBA3_SUBSYSTEM('REG_API_REGF',
 
 bld.SAMBA3_LIBRARY('smbregistry',
source=REG_BASE_SRC,
-   deps='''smbd_shim tdb-wrap3 NDR_SECURITY UTIL_TDB talloc
+   deps='''smbd_shim tdb-wrap3 NDR_SECURITY util_tdb talloc
replace util_reg samba-util security
errors3 dbwrap samba3-util''',
allow_undefined_symbols=True,
@@ -783,7 +783,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
 
 bld.SAMBA3_SUBSYSTEM('samba3util',
source=LIB_UTIL_SRC,
-   deps='ndr security NDR_SECURITY samba-util UTIL_TDB ccan',
+   deps='ndr security NDR_SECURITY samba-util util_tdb ccan',
vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('pidfile',
@@ -1063,7 +1063,7 @@ bld.SAMBA3_SUBSYSTEM('tdb-wrap3',
 
 bld.SAMBA3_LIBRARY('dbwrap',
source='lib/dbwrap/dbwrap.c lib/dbwrap/dbwrap_util.c 
lib/dbwrap/dbwrap_rbt.c lib/dbwrap/dbwrap_cache.c lib/dbwrap/dbwrap_tdb.c',
-   deps='samba-util UTIL_TDB errors tdb tdb-wrap',
+   deps='samba-util util_tdb errors tdb tdb-wrap',
private_library=True)
 
 bld.SAMBA3_LIBRARY('samba3-util',
diff --git a/source4/lib/messaging/wscript_build 
b/source4/lib/messaging/wscript_build
index b7d4fed..38f1fab 100644
--- a/source4/lib/messaging/wscript_build
+++ b/source4/lib/messaging/wscript_build
@@ -3,7 +3,7 @@
 
 bld.SAMBA_SUBSYSTEM('MESSAGING',
source='messaging.c',
-   public_deps='samba-util tdb-wrap NDR_IRPC UNIX_PRIVS UTIL_TDB cluster 
ndr samba_socket dcerpc'
+   public_deps='samba-util tdb-wrap NDR_IRPC UNIX_PRIVS util_tdb

[SCM] Samba Shared Repository - branch master updated

2012-04-16 Thread Jelmer Vernooij

The branch, master has been updated
   via  1e949f3 provision: Simplify handling of default for --server-role.
   via  8cd7cc3 provision: Simplify handling of default for 
--function-level.
   via  efa5948 provision: Simplify handling of default for --dns-backend 
option.
   via  dd0b879 s3/selftest: Fix reference to knownfail file.
  from  8405fee build: rebuild idl if the pidl compiler is changed

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


- Log -
commit 1e949f3cd173fbf86d9b14a6d6e43c81fdc9cc57
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Apr 15 23:36:54 2012 +0200

provision: Simplify handling of default for --server-role.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Mon Apr 16 18:12:24 CEST 2012 on sn-devel-104

commit 8cd7cc33d944699ef8e9d34d31254f80035c0763
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Apr 15 23:35:41 2012 +0200

provision: Simplify handling of default for --function-level.

commit efa594820ad8be86148b8e36f5a623f8346edea0
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Apr 15 23:35:07 2012 +0200

provision: Simplify handling of default for --dns-backend option.

commit dd0b8792a0cb1b5f659bab8163bc1e71d9a4b3c9
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Apr 15 23:33:22 2012 +0200

s3/selftest: Fix reference to knownfail file.

---

Summary of changes:
 source3/selftest/tests.py |2 +-
 source4/setup/provision   |   27 +--
 2 files changed, 10 insertions(+), 19 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index fb1eaae..70c8fe0 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -8,7 +8,7 @@
 
 # The idea is that this script outputs all of the tests of Samba 3, not 
 # just those that are known to pass, and list those that should be skipped 
-# or are known to fail in selftest/skip or selftest/samba4-knownfail. This 
makes it 
+# or are known to fail in selftest/skip or selftest/samba3-knownfail. This 
makes it 
 # very easy to see what functionality is still missing in Samba 3 and makes 
 # it possible to run the testsuite against other servers, such as Samba 4 or 
 # Windows that have a different set of features.
diff --git a/source4/setup/provision b/source4/setup/provision
index 523b082..f254fa7 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -86,7 +86,8 @@ parser.add_option(--dns-backend, type=choice, 
metavar=NAMESERVER-BACKEND,
 help=The DNS server backend. SAMBA_INTERNAL is the builtin name 
server,  \
  BIND9_FLATFILE uses bind9 text database to store zone 
information,  \
  BIND9_DLZ uses samba4 AD to store zone information (default),  \
- NONE skips the DNS setup entirely (not recommended))
+ NONE skips the DNS setup entirely (not recommended),
+default=BIND9_DLZ)
 parser.add_option(--dnspass, type=string, metavar=PASSWORD,
 help=choose dns password (otherwise random))
 parser.add_option(--ldapadminpass, type=string, metavar=PASSWORD,
@@ -107,10 +108,12 @@ parser.add_option(--ldap-backend-type, type=choice, 
metavar=LDAP-BACKEND-TY
 choices=[fedora-ds, openldap])
 parser.add_option(--server-role, type=choice, metavar=ROLE,
   choices=[domain controller, dc, member server, member, 
standalone],
-help=The server role (domain controller | dc | member server | member 
| standalone). Default is dc.)
+help=The server role (domain controller | dc | member server | member 
| standalone). Default is dc.,
+default=domain controller)
 parser.add_option(--function-level, type=choice, metavar=FOR-FUN-LEVEL,
   choices=[2000, 2003, 2008, 2008_R2],
-help=The domain and forest function level (2000 | 2003 | 2008 | 
2008_R2 - always native). Default is (Windows) 2003 Native.)
+help=The domain and forest function level (2000 | 2003 | 2008 | 
2008_R2 - always native). Default is (Windows) 2003 Native.,
+default=2003)
 parser.add_option(--next-rid, type=int, metavar=NEXTRID, default=1000,
 help=The initial nextRid value (only needed for upgrades).  Default 
is 1000.)
 parser.add_option(--partitions-only,
@@ -194,14 +197,7 @@ if not opts.adminpass:
 lp = sambaopts.get_loadparm()
 smbconf = lp.configfile
 
-server_role = opts.server_role
-
-if server_role is None:
-server_role = domain controller
-
-if opts.function_level is None:
-dom_for_fun_level = DS_DOMAIN_FUNCTION_2003
-elif opts.function_level == 2000:
+if opts.function_level == 2000:
 dom_for_fun_level = DS_DOMAIN_FUNCTION_2000
 elif opts.function_level == 2003:
 dom_for_fun_level = DS_DOMAIN_FUNCTION_2003
@@ -210,11 +206,6 @@ elif opts.function_level == 2008:
 elif opts.function_level

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

2012-04-09 Thread Jelmer Vernooij

Hi Jeremy,

Am 09/04/12 21:41, schrieb Jeremy Allison:
 The branch, master has been updated
via  5701a4d Move blksize_t and blkcnt_t to replace.h from includes.h. 
 Should help with platforms that don't have these.
   from  5184f41 libreplace: We have a poll replacement based on select

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


 - Log -
 commit 5701a4d8611ad1e310b76b00b146b0902c9b34ff
 Author: Jeremy Allison j...@samba.org
 Date:   Mon Apr 9 11:04:07 2012 -0700

 Move blksize_t and blkcnt_t to replace.h from includes.h. Should help 
 with platforms that don't have these.
 
Thanks for moving these to libreplace. It'd be great if you can also
move the relevant tests from configure.in / wscript to the equivalent
files in lib/replace, so libreplace stays self-contained.

Cheers,

Jelmer



signature.asc
Description: OpenPGP digital signature

[SCM] Samba Shared Repository - branch master updated

2012-04-09 Thread Jelmer Vernooij

The branch, master has been updated
   via  7cf7890 wafsamba: Parse Python versions as integers separated by 
dots.
  from  5701a4d Move blksize_t and blkcnt_t to replace.h from includes.h. 
Should help with platforms that don't have these.

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


- Log -
commit 7cf78902dc63ec0db1f2310aa0e32d884ca96491
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Apr 9 20:05:06 2012 +0200

wafsamba: Parse Python versions as integers separated by dots.

This causes tdb 1.2.10 to no longer be considered older than 1.2.9.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Mon Apr  9 23:16:17 CEST 2012 on sn-devel-104

---

Summary of changes:
 buildtools/wafsamba/samba_bundled.py |5 -
 1 files changed, 4 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_bundled.py 
b/buildtools/wafsamba/samba_bundled.py
index 7fc0fb9..6df7454 100644
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -209,6 +209,9 @@ def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0',
 return False
 
 
+def tuplize_version(version_string):
+return tuple([int(x) for x in version.split(.)])
+
 @runonce
 @conf
 def CHECK_BUNDLED_SYSTEM_PYTHON(conf, libname, modulename, minversion='0.0.0'):
@@ -233,7 +236,7 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, libname, modulename, 
minversion='0.0.0'):
 except AttributeError:
 found = False
 else:
-found = tuple(version.split(.)) = tuple(minversion.split(.))
+found = tuplize_version(version) = tuplize_version(minversion)
 if not found and not conf.LIB_MAY_BE_BUNDLED(libname):
 Logs.error('ERROR: Python module %s of version %s not found, and 
bundling disabled' % (libname, minversion))
 sys.exit(1)


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-04-09 Thread Jelmer Vernooij

The branch, master has been updated
   via  800a9d8 wafsamba/bundled: Fix typo in tuplize_version.
  from  7cf7890 wafsamba: Parse Python versions as integers separated by 
dots.

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


- Log -
commit 800a9d8bc3d6805dd297e65c8d32efc74a1329b3
Author: Jelmer Vernooij jel...@samba.org
Date:   Tue Apr 10 00:45:20 2012 +0200

wafsamba/bundled: Fix typo in tuplize_version.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Tue Apr 10 02:21:39 CEST 2012 on sn-devel-104

---

Summary of changes:
 buildtools/wafsamba/samba_bundled.py   |2 +-
 buildtools/wafsamba/tests/__init__.py  |1 +
 .../tests/{__init__.py = test_bundled.py} |   23 +++-
 3 files changed, 10 insertions(+), 16 deletions(-)
 copy buildtools/wafsamba/tests/{__init__.py = test_bundled.py} (67%)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_bundled.py 
b/buildtools/wafsamba/samba_bundled.py
index 6df7454..c5b4022 100644
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -209,7 +209,7 @@ def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0',
 return False
 
 
-def tuplize_version(version_string):
+def tuplize_version(version):
 return tuple([int(x) for x in version.split(.)])
 
 @runonce
diff --git a/buildtools/wafsamba/tests/__init__.py 
b/buildtools/wafsamba/tests/__init__.py
index c9f2fb6..ae27418 100644
--- a/buildtools/wafsamba/tests/__init__.py
+++ b/buildtools/wafsamba/tests/__init__.py
@@ -24,6 +24,7 @@ from unittest import (
 def test_suite():
 names = [
 'abi',
+'bundled',
 'utils',
 ]
 module_names = ['wafsamba.tests.test_' + name for name in names]
diff --git a/buildtools/wafsamba/tests/__init__.py 
b/buildtools/wafsamba/tests/test_bundled.py
similarity index 67%
copy from buildtools/wafsamba/tests/__init__.py
copy to buildtools/wafsamba/tests/test_bundled.py
index c9f2fb6..c5f0db6 100644
--- a/buildtools/wafsamba/tests/__init__.py
+++ b/buildtools/wafsamba/tests/test_bundled.py
@@ -14,21 +14,14 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-Tests for wafsamba.
+from wafsamba.tests import TestCase
 
-from unittest import (
-TestCase,
-TestLoader,
+from wafsamba.samba_bundled import (
+tuplize_version,
 )
 
-def test_suite():
-names = [
-'abi',
-'utils',
-]
-module_names = ['wafsamba.tests.test_' + name for name in names]
-loader = TestLoader()
-result = loader.suiteClass()
-suite = loader.loadTestsFromNames(module_names)
-result.addTests(suite)
-return result
+
+class TuplizeVersionTests(TestCase):
+
+def test_simple(self):
+self.assertEquals((1, 2, 10), tuplize_version(1.2.10))


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-04-07 Thread Jelmer Vernooij

The branch, master has been updated
   via  4a3da81 wafsamba: Return missing libs rather than last syslib.
  from  5138b1f s3: Compile fix for dbwrap_file.c

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


- Log -
commit 4a3da81edb708c4652652226559989e764577634
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Apr 8 03:56:24 2012 +0200

wafsamba: Return missing libs rather than last syslib.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Sun Apr  8 05:31:15 CEST 2012 on sn-devel-104

---

Summary of changes:
 buildtools/wafsamba/samba_bundled.py |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_bundled.py 
b/buildtools/wafsamba/samba_bundled.py
index e13da9f..7fc0fb9 100644
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -89,7 +89,7 @@ def CHECK_PREREQUISITES(conf, prereqs):
 f = 'FOUND_SYSTEMLIB_%s' % syslib
 if not f in conf.env:
 missing.append(syslib)
-return syslib
+return missing
 
 
 @runonce


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-04-03 Thread Jelmer Vernooij

The branch, master has been updated
   via  5d10b49 wafsamba: Avoid NameError when printing error about missing 
system deps.
  from  22a6497 s3: Enhance the dbwrap needed x attempts msg

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


- Log -
commit 5d10b499bf206ca3f04219d17d88849182eb06f5
Author: Jelmer Vernooij jel...@samba.org
Date:   Tue Apr 3 16:12:54 2012 +0200

wafsamba: Avoid NameError when printing error about missing system deps.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Tue Apr  3 17:46:42 CEST 2012 on sn-devel-104

---

Summary of changes:
 buildtools/wafsamba/samba_bundled.py |   15 +--
 1 files changed, 9 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_bundled.py 
b/buildtools/wafsamba/samba_bundled.py
index a29bfa3..e13da9f 100644
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -84,11 +84,12 @@ def LIB_MUST_BE_BUNDLED(conf, libname):
 
 @conf
 def CHECK_PREREQUISITES(conf, prereqs):
+missing = []
 for syslib in TO_LIST(prereqs):
 f = 'FOUND_SYSTEMLIB_%s' % syslib
 if not f in conf.env:
-return False
-return True
+missing.append(syslib)
+return syslib
 
 
 @runonce
@@ -109,9 +110,10 @@ def CHECK_BUNDLED_SYSTEM_PKG(conf, libname, 
minversion='0.0.0',
 # system version is found. That prevents possible use of mixed library
 # versions
 if onlyif:
-if not conf.CHECK_PREREQUISITES(onlyif):
+missing = conf.CHECK_PREREQUISITES(onlyif)
+if missing:
 if not conf.LIB_MAY_BE_BUNDLED(libname):
-Logs.error('ERROR: Use of system library %s depends on missing 
system library %s' % (libname, onlyif))
+Logs.error('ERROR: Use of system library %s depends on missing 
system library/libraries %r' % (libname, missing))
 sys.exit(1)
 conf.env[found] = False
 return False
@@ -169,9 +171,10 @@ def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0',
 # system version is found. That prevents possible use of mixed library
 # versions
 if onlyif:
-if not conf.CHECK_PREREQUISITES(onlyif):
+missing = conf.CHECK_PREREQUISITES(onlyif)
+if missing:
 if not conf.LIB_MAY_BE_BUNDLED(libname):
-Logs.error('ERROR: Use of system library %s depends on missing 
system library %s' % (libname, syslib))
+Logs.error('ERROR: Use of system library %s depends on missing 
system library/libraries %r' % (libname, missing))
 sys.exit(1)
 conf.env[found] = False
 return False


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-03-26 Thread Jelmer Vernooij

The branch, master has been updated
   via  a9da040 ndr: Update ABI.
   via  acd63fd wafsamba: Cope with slight differences in gdb output 
regarding incomplete sequences.
   via  9c5723a Add ABI file for libndr.
  from  fa6f61e s3: Pass filters explicitly through vfs notify watch

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


- Log -
commit a9da0409ba0e859533acea83c5c85798705cb5eb
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Mar 26 18:25:37 2012 +0200

ndr: Update ABI.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Mon Mar 26 19:58:25 CEST 2012 on sn-devel-104

commit acd63fdb86769ff4328ccb6a4096181e65e4d30f
Author: Jelmer Vernooij jel...@samba.org
Date:   Tue Mar 20 02:31:02 2012 +0100

wafsamba: Cope with slight differences in gdb output regarding incomplete 
sequences.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=8820

commit 9c5723ab7aa0db9c239027b4783bb1f3986b1dbf
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Mar 24 15:42:22 2012 +0100

Add ABI file for libndr.

---

Summary of changes:
 buildtools/wafsamba/samba_abi.py  |4 +
 buildtools/wafsamba/tests/__init__.py |1 +
 buildtools/wafsamba/tests/test_abi.py |   53 +++
 librpc/ABI/ndr-0.0.1.sigs |  245 +
 librpc/wscript_build  |6 +-
 source4/selftest/tests.py |2 +-
 6 files changed, 308 insertions(+), 3 deletions(-)
 create mode 100644 buildtools/wafsamba/tests/test_abi.py
 create mode 100644 librpc/ABI/ndr-0.0.1.sigs


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py
index 990e1e5..76c2d8b 100644
--- a/buildtools/wafsamba/samba_abi.py
+++ b/buildtools/wafsamba/samba_abi.py
@@ -18,6 +18,7 @@ def normalise_signature(sig):
 sig = re.sub('^\$[0-9]+\s=\s\{*', '', sig)
 sig = re.sub('\}(\s0x[0-9a-f]+\s\w+)?$', '', sig)
 sig = re.sub('0x[0-9a-f]+', '0x', sig)
+sig = re.sub(', incomplete sequence ([a-z0-9]+)', r'\1', sig)
 
 for t in abi_type_maps:
 # we need to cope with non-word characters in mapped types
@@ -30,11 +31,13 @@ def normalise_signature(sig):
 sig = re.sub(m, abi_type_maps[t], sig)
 return sig
 
+
 def normalise_varargs(sig):
 '''cope with older versions of gdb'''
 sig = re.sub(',\s\.\.\.', '', sig)
 return sig
 
+
 def parse_sigs(sigs, abi_match):
 '''parse ABI signatures file'''
 abi_match = samba_utils.TO_LIST(abi_match)
@@ -54,6 +57,7 @@ def parse_sigs(sigs, abi_match):
 break
 if not matched:
 continue
+print %s - %s % (sa[1], normalise_signature(sa[1]))
 ret[sa[0]] = normalise_signature(sa[1])
 return ret
 
diff --git a/buildtools/wafsamba/tests/__init__.py 
b/buildtools/wafsamba/tests/__init__.py
index 7678880..c9f2fb6 100644
--- a/buildtools/wafsamba/tests/__init__.py
+++ b/buildtools/wafsamba/tests/__init__.py
@@ -23,6 +23,7 @@ from unittest import (
 
 def test_suite():
 names = [
+'abi',
 'utils',
 ]
 module_names = ['wafsamba.tests.test_' + name for name in names]
diff --git a/buildtools/wafsamba/tests/test_abi.py 
b/buildtools/wafsamba/tests/test_abi.py
new file mode 100644
index 000..0aa0d56
--- /dev/null
+++ b/buildtools/wafsamba/tests/test_abi.py
@@ -0,0 +1,53 @@
+# Copyright (C) 2012 Jelmer Vernooij jel...@samba.org
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+from wafsamba.tests import TestCase
+
+from wafsamba.samba_abi import (
+normalise_signature,
+)
+
+
+class NormaliseSignatureTests(TestCase):
+
+def test_function_simple(self):
+self.assertEquals(int (const struct GUID *, const struct GUID *),
+normalise_signature($2 = {int (const struct GUID *, const struct 
GUID *)} 0xe871 GUID_compare))
+
+def test_maps_Bool(self):
+# Some types have different internal names
+self.assertEquals(bool (const struct GUID *),
+normalise_signature($1 = {_Bool (const struct GUID *)} 0xe75b 
GUID_all_zero))
+
+def test_function_keep(self

[SCM] Samba Shared Repository - branch master updated

2012-03-26 Thread Jelmer Vernooij

The branch, master has been updated
   via  95ebb11 selftest.py: Add get_interface.
  from  a9da040 ndr: Update ABI.

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


- Log -
commit 95ebb111ba7e5fbc1e8ca6c560c473d24c5d6c2d
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 25 21:38:59 2012 +0100

selftest.py: Add get_interface.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Tue Mar 27 00:32:48 CEST 2012 on sn-devel-104

---

Summary of changes:
 selftest/target/samba.py |   34 ++
 selftest/tests/test_samba.py |   15 +++
 2 files changed, 45 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/target/samba.py b/selftest/target/samba.py
index 1ea156c..666d223 100644
--- a/selftest/target/samba.py
+++ b/selftest/target/samba.py
@@ -119,3 +119,37 @@ def cleanup_child(pid, name, outf=None):
 else:
 outf.write(%s child process %d exited with value %d.\n % (name, 
childpid, status  8))
 return childpid
+
+
+def get_interface(netbiosname):
+Return interface id for a particular server.
+
+netbiosname = netbiosname.lower()
+
+interfaces = {
+locals3dc2: 2,
+localmember3: 3,
+localshare4: 4,
+localserver5: 5,
+localktest6: 6,
+maptoguest: 7,
+
+# 11-16 used by selftest.pl for client interfaces
+localdc: 21,
+localvampiredc: 22,
+s4member: 23,
+localrpcproxy: 24,
+dc5: 25,
+dc6: 26,
+dc7: 27,
+rodc: 28,
+localadmember: 29,
+plugindc: 30,
+localsubdc: 31,
+chgdcpass: 32,
+}
+
+# update lib/socket_wrapper/socket_wrapper.c
+#  #define MAX_WRAPPED_INTERFACES 32
+# if you wish to have more than 32 interfaces
+return interfaces[netbiosname]
diff --git a/selftest/tests/test_samba.py b/selftest/tests/test_samba.py
index f06d846..b49463e 100644
--- a/selftest/tests/test_samba.py
+++ b/selftest/tests/test_samba.py
@@ -19,16 +19,13 @@
 
 Tests for selftest.target.samba.
 
-import os
-import sys
-
 from cStringIO import StringIO
 
 from selftest.tests import TestCase
 
 from selftest.target.samba import (
 bindir_path,
-cleanup_child,
+get_interface,
 mk_realms_stanza,
 write_krb5_conf,
 )
@@ -107,3 +104,13 @@ class WriteKrb5ConfTests(TestCase):
  }
 
 ''', f.getvalue())
+
+
+class GetInterfaceTests(TestCase):
+
+def test_get_interface(self):
+self.assertEquals(21, get_interface(localdc))
+self.assertEquals(4, get_interface(localshare4))
+
+def test_unknown(self):
+self.assertRaises(KeyError, get_interface, unknown)


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-03-25 Thread Jelmer Vernooij

The branch, master has been updated
   via  8ad52f6 s3-make: Fix build with new smb2_session file.
   via  d9975a1 LIBCLI_SMB2: Depend on cli_smb_common rather than libsmb.
   via  a8c066b smb2: Move smb2cli session setup code to cli_smb_common.
   via  5283aa5 libcli/smb: Stop generating unused proto file.
  from  3c9b32b replace: Avoid DEBUG(), which is not available in 
libreplace.

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


- Log -
commit 8ad52f63863a677bdec1a543c1ed23e9e9ddfa65
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 25 23:18:52 2012 +0200

s3-make: Fix build with new smb2_session file.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Mon Mar 26 00:56:13 CEST 2012 on sn-devel-104

commit d9975a13fdd2c4b41414619780c3428ce1d3af3b
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 25 17:15:42 2012 +0200

LIBCLI_SMB2: Depend on cli_smb_common rather than libsmb.

The latter pulls in a fair number of other libraries, including popt and 
the Samba registry library.

commit a8c066b0230ebe40c0586973cc1eec1018255708
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 25 17:14:56 2012 +0200

smb2: Move smb2cli session setup code to cli_smb_common.

commit 5283aa5356382256fc5336a468be414e8e33fc3b
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 25 17:14:14 2012 +0200

libcli/smb: Stop generating unused proto file.

---

Summary of changes:
 .../smb2cli_session.c = libcli/smb/smb2_session.c |  109 +--
 libcli/smb/wscript_build   |2 +-
 source3/Makefile.in|1 +
 source3/libsmb/smb2cli_session.c   |  207 
 source4/libcli/smb2/wscript_build  |2 +-
 5 files changed, 6 insertions(+), 315 deletions(-)
 copy source3/libsmb/smb2cli_session.c = libcli/smb/smb2_session.c (71%)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/smb2cli_session.c b/libcli/smb/smb2_session.c
similarity index 71%
copy from source3/libsmb/smb2cli_session.c
copy to libcli/smb/smb2_session.c
index 13412d1..b69f0a2 100644
--- a/source3/libsmb/smb2cli_session.c
+++ b/libcli/smb/smb2_session.c
@@ -18,14 +18,10 @@
 */
 
 #include includes.h
-#include client.h
-#include async_smb.h
-#include smb2cli.h
+#include system/network.h
+#include ../lib/util/tevent_ntstatus.h
+#include ../libcli/smb/smb_common.h
 #include ../libcli/smb/smbXcli_base.h
-#include libsmb/proto.h
-#include lib/util/tevent_ntstatus.h
-#include ../libcli/auth/spnego.h
-#include ../auth/ntlmssp/ntlmssp.h
 
 struct smb2cli_session_setup_state {
struct smbXcli_session *session;
@@ -234,103 +230,4 @@ NTSTATUS smb2cli_session_setup_recv(struct tevent_req 
*req,
return status;
 }
 
-struct smb2cli_logoff_state {
-   struct cli_state *cli;
-   uint8_t fixed[4];
-};
-
-static void smb2cli_logoff_done(struct tevent_req *subreq);
-
-struct tevent_req *smb2cli_logoff_send(TALLOC_CTX *mem_ctx,
-  struct tevent_context *ev,
-  struct cli_state *cli)
-{
-   struct tevent_req *req, *subreq;
-   struct smb2cli_logoff_state *state;
-
-   req = tevent_req_create(mem_ctx, state,
-   struct smb2cli_logoff_state);
-   if (req == NULL) {
-   return NULL;
-   }
-   state-cli = cli;
-   SSVAL(state-fixed, 0, 4);
-
-   subreq = smb2cli_req_send(state, ev,
- cli-conn, SMB2_OP_LOGOFF,
- 0, 0, /* flags */
- cli-timeout,
- cli-smb2.pid,
- 0, /* tid */
- cli-smb2.session,
- state-fixed, sizeof(state-fixed),
- NULL, 0);
-   if (tevent_req_nomem(subreq, req)) {
-   return tevent_req_post(req, ev);
-   }
-   tevent_req_set_callback(subreq, smb2cli_logoff_done, req);
-   return req;
-}
-
-static void smb2cli_logoff_done(struct tevent_req *subreq)
-{
-   struct tevent_req *req =
-   tevent_req_callback_data(subreq,
-   struct tevent_req);
-   struct smb2cli_logoff_state *state =
-   tevent_req_data(req,
-   struct smb2cli_logoff_state);
-   NTSTATUS status;
-   struct iovec *iov;
-   static const struct smb2cli_req_expected_response expected[] = {
-   {
-   .status = NT_STATUS_OK,
-   .body_size = 0x04
-   }
-   };
 
-   status = smb2cli_req_recv(subreq, state, iov,
- expected, ARRAY_SIZE(expected));
-   TALLOC_FREE(subreq

[SCM] Samba Shared Repository - branch master updated

2012-03-24 Thread Jelmer Vernooij

The branch, master has been updated
   via  55bd279 lib/util: Allow calloc use in util.c, too.
   via  85aa077 adt_tree: Fix return types.
   via  456abea replace: Work around socket wrapper.
   via  10dd5f1 replace: Add system/network.h for ucred struct.
   via  5ba8ada s3-waf: Use samba3-util library instead of lots of tiny 
libs.
   via  6f1b735 adt_tree: Avoid WERROR.
   via  71d41a0 libreplace: Add getpeereid implementation.
   via  76bb68f util_malloc: Remove unused constant.
   via  32fd6d6 lib/util: Remove dummy wrapper for getgrgid().
   via  2a82c45 lib/util: Remove dummy wrapper for getgrnam().
   via  43f2750 lib/util: Remove dummy wrapper for getpwuid().
   via  818e072 lib/util: Remove dummy wrapper for getpwnam().
   via  3be6258 lib/util: Remove dummy wrappers for 
setpwent/getpwent/endpwent.
   via  14fdc1c lib/util: Move calloc_array and memalign_array to top-level 
libutil.
   via  c0c52ac lib/util: Remove prototype for removed sys_memalign.
   via  2d5275f lib/util: Remove trivial wrapper sys_connect() around 
connect().
   via  2c94446 cli_pipe: Avoid sys_connect.
   via  e7cd529 sock_exec: Avoid sys_connect.
   via  a9c22de util_sock: Avoid sys_connect.
   via  eb3617c ctdb_conn: Avoid sys_connect.
   via  d4c4cb0 replace: Move memalign() from lib/util/system.c to 
libreplace.
  from  1080483 Improve the Makefile. Use a standard make macro, not a 
shell command.

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


- Log -
commit 55bd27935fe0bf31945d0137a1673499e7fcb1ad
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Mar 24 17:16:26 2012 +0100

lib/util: Allow calloc use in util.c, too.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Sat Mar 24 18:50:32 CET 2012 on sn-devel-104

commit 85aa07761abbbf1212e244c8b0a835e41834ae16
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Mar 24 17:11:11 2012 +0100

adt_tree: Fix return types.

commit 456abea8941dfb6dab6e69a760532426a781d9ba
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Mar 24 17:05:29 2012 +0100

replace: Work around socket wrapper.

It's fine to ignore socket wrapper here, as it doesn't deal with unix 
domain sockets.

commit 10dd5f186fa31b3abfb8c65bfe3c1b31215106e3
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Mar 24 16:50:37 2012 +0100

replace: Add system/network.h for ucred struct.

commit 5ba8adadd3fdeb00658cdfc071d8499e58e39e3b
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Mar 24 16:42:47 2012 +0100

s3-waf: Use samba3-util library instead of lots of tiny libs.

The smaller libraries are currently all trivial in size and don't have
any dependencies other than samba-util.

Having lots of small private libraries is a pain for packaging,
and there isn't much advantage in this.

commit 6f1b735cc2972ecd3d2acb30ff834273f08628fe
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Mar 24 16:41:35 2012 +0100

adt_tree: Avoid WERROR.

commit 71d41a015add73e0fb355dd9713e99febd71d46f
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Mar 24 16:00:36 2012 +0100

libreplace: Add getpeereid implementation.

commit 76bb68fd2b9e09eb4c033417f0f1174f18c04797
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Mar 24 15:44:33 2012 +0100

util_malloc: Remove unused constant.

commit 32fd6d639a5f51f1cc5fb0e81356009a2c9df359
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Mar 24 15:26:36 2012 +0100

lib/util: Remove dummy wrapper for getgrgid().

commit 2a82c45f02b9f5683351ccfa1acdf2622938abc9
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Mar 24 15:25:48 2012 +0100

lib/util: Remove dummy wrapper for getgrnam().

commit 43f275008f1d68c6adee461c531d73c65b6b7483
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Mar 24 15:25:05 2012 +0100

lib/util: Remove dummy wrapper for getpwuid().

commit 818e0722e1a730cfa30d911be510641ef23dc446
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Mar 24 15:24:15 2012 +0100

lib/util: Remove dummy wrapper for getpwnam().

commit 3be6258912939fb538d7bcb492483ae2ab52391b
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Mar 24 15:23:02 2012 +0100

lib/util: Remove dummy wrappers for setpwent/getpwent/endpwent.

commit 14fdc1c5cd4ca0b3f88b2d407d40ba5be7218085
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Mar 24 15:19:09 2012 +0100

lib/util: Move calloc_array and memalign_array to top-level libutil.

commit c0c52ac1a40db70d8b19cb8d73ed4759b0a4f905
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Mar 24 15:00:22 2012 +0100

lib/util: Remove prototype for removed sys_memalign.

commit 2d5275fae0fd4ea73fba78242185a88845bd0666
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Mar 24 14:58:09 2012 +0100

lib/util: Remove trivial wrapper sys_connect() around connect().

commit

[SCM] Samba Shared Repository - branch master updated

2012-03-24 Thread Jelmer Vernooij

The branch, master has been updated
   via  c0288e0 lib/util: Remove obsolete sys_getpid() and sys_fork().
  from  55bd279 lib/util: Allow calloc use in util.c, too.

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


- Log -
commit c0288e0612187ecbfc4a81d071fd504ea8737b7a
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Mar 24 20:17:08 2012 +0100

lib/util: Remove obsolete sys_getpid() and sys_fork().

The performance of these is minimal (these days) and they can return
invalid results when used as part of applications that do not use
sys_fork().

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Sat Mar 24 21:55:41 CET 2012 on sn-devel-104

---

Summary of changes:
 lib/util/become_daemon.c |2 +-
 lib/util/fault.c |2 +-
 lib/util/samba_util.h|   10 
 lib/util/system.c|   31 --
 source3/auth/pass_check.c|4 +-
 source3/client/client.c  |4 +-
 source3/include/rpc_misc.h   |4 +-
 source3/lib/ctdbd_conn.c |4 +-
 source3/lib/pidfile.c|2 +-
 source3/lib/server_prefork.c |4 +-
 source3/lib/smbldap.c|4 +-
 source3/lib/smbrun.c |4 +-
 source3/lib/substitute.c |2 +-
 source3/lib/system.c |2 +-
 source3/lib/tdb_validate.c   |2 +-
 source3/lib/util.c   |8 +++---
 source3/libsmb/clientgen.c   |2 +-
 source3/libsmb/libsmb_context.c  |2 +-
 source3/modules/vfs_aio_fork.c   |2 +-
 source3/modules/vfs_notify_fam.c |2 +-
 source3/modules/vfs_preopen.c|2 +-
 source3/nmbd/asyncdns.c  |2 +-
 source3/nmbd/nmbd.c  |2 +-
 source3/nmbd/nmbd_packets.c  |2 +-
 source3/nmbd/nmbd_synclists.c|2 +-
 source3/nmbd/nmbd_winsserver.c   |4 +-
 source3/passdb/pdb_smbpasswd.c   |2 +-
 source3/passdb/secrets.c |2 +-
 source3/printing/print_cups.c|2 +-
 source3/printing/printing.c  |   20 
 source3/printing/printing_db.c   |2 +-
 source3/printing/queue_process.c |2 +-
 source3/printing/spoolssd.c  |2 +-
 source3/rpc_server/epmd.c|2 +-
 source3/rpc_server/lsasd.c   |2 +-
 source3/rpc_server/rpc_handles.c |2 +-
 source3/rpc_server/samr/srv_samr_chgpasswd.c |2 +-
 source3/rpc_server/svcctl/srv_svcctl_nt.c|2 +-
 source3/smbd/files.c |2 +-
 source3/smbd/negprot.c   |   28 +++---
 source3/smbd/oplock_irix.c   |2 +-
 source3/smbd/process.c   |   22 +-
 source3/smbd/server.c|6 ++--
 source3/smbd/service.c   |2 +-
 source3/smbd/session.c   |2 +-
 source3/smbd/utmp.c  |2 +-
 source3/winbindd/winbindd.c  |2 +-
 source3/winbindd/winbindd_cm.c   |4 +-
 source3/winbindd/winbindd_dual.c |6 ++--
 49 files changed, 95 insertions(+), 136 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/become_daemon.c b/lib/util/become_daemon.c
index 4c1d29e..92a7586 100644
--- a/lib/util/become_daemon.c
+++ b/lib/util/become_daemon.c
@@ -75,7 +75,7 @@ _PUBLIC_ void close_low_fds(bool stdin_too, bool stdout_too, 
bool stderr_too)
 _PUBLIC_ void become_daemon(bool do_fork, bool no_process_group, bool 
log_stdout)
 {
if (do_fork) {
-   if (sys_fork()) {
+   if (fork()) {
_exit(0);
}
}
diff --git a/lib/util/fault.c b/lib/util/fault.c
index b3527bb..d0b34e5 100644
--- a/lib/util/fault.c
+++ b/lib/util/fault.c
@@ -70,7 +70,7 @@ static void fault_report(int sig)
counter++;
 
DEBUGSEP(0);
-   DEBUG(0,(INTERNAL ERROR: Signal %d in pid %d 
(%s),sig,(int)sys_getpid(),SAMBA_VERSION_STRING));
+   DEBUG(0,(INTERNAL ERROR: Signal %d in pid %d 
(%s),sig,(int)getpid(),SAMBA_VERSION_STRING));
DEBUG(0,(\nPlease read the Trouble-Shooting section of the Samba 
HOWTO\n));
DEBUGSEP(0);
 
diff --git a/lib/util/samba_util.h b/lib/util/samba_util.h
index f989231..6096722 100644
--- a/lib/util/samba_util.h
+++ b/lib/util/samba_util.h
@@ -113,16 +113,6 @@ void

[SCM] Samba Shared Repository - branch master updated

2012-03-24 Thread Jelmer Vernooij

The branch, master has been updated
   via  3c9b32b replace: Avoid DEBUG(), which is not available in 
libreplace.
   via  49eca29 libreplace: Add usleep implementation.
   via  c9fb336 use usleep rather than sys_usleep in various places, in 
anticipation of usleep moving to libreplace.
  from  c0288e0 lib/util: Remove obsolete sys_getpid() and sys_fork().

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


- Log -
commit 3c9b32b5eb1220b8521f768bab8dc07a40de93f5
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Mar 24 21:18:55 2012 +0100

replace: Avoid DEBUG(), which is not available in libreplace.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Sun Mar 25 00:13:59 CET 2012 on sn-devel-104

commit 49eca290d37ad7564a3be3332ee76020ddb5a03f
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Mar 24 21:17:56 2012 +0100

libreplace: Add usleep implementation.

commit c9fb33697db1bdc1967a0cca557ad323ebe4ea22
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Mar 24 20:43:07 2012 +0100

use usleep rather than sys_usleep in various places, in anticipation of 
usleep moving to libreplace.

---

Summary of changes:
 lib/replace/replace.c   |   16 -
 lib/replace/replace.h   |6 
 source3/include/proto.h |1 -
 source3/lib/system.c|   34 ---
 source3/passdb/pdb_smbpasswd.c  |2 +-
 source3/rpc_server/spoolss/srv_spoolss_nt.c |2 +-
 source3/utils/net_rpc_service.c |2 +-
 source3/utils/status_profile.c  |2 +-
 8 files changed, 25 insertions(+), 40 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/replace.c b/lib/replace/replace.c
index 03fae90..c076ba1 100644
--- a/lib/replace/replace.c
+++ b/lib/replace/replace.c
@@ -851,7 +851,7 @@ void *rep_memalign( size_t align, size_t size )
size_t pagesize = (size_t)-1;
 #endif
if (pagesize == (size_t)-1) {
-   DEBUG(0,(memalign functionality not available on this 
platform!\n));
+   errno = ENOSYS;
return NULL;
}
if (size  pagesize) {
@@ -890,3 +890,17 @@ int rep_getpeereid(int s, uid_t *uid, gid_t *gid)
 #endif
 }
 #endif
+
+#ifndef HAVE_USLEEP
+int rep_usleep(useconds_t sec)
+{
+   struct timeval tval;
+   /*
+* Fake it with select...
+*/
+   tval.tv_sec = 0;
+   tval.tv_usec = usecs/1000;
+   select(0,NULL,NULL,NULL,tval);
+   return 0;
+}
+#endif /* HAVE_USLEEP */
diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index f2b1952..776da8a 100644
--- a/lib/replace/replace.h
+++ b/lib/replace/replace.h
@@ -835,4 +835,10 @@ char *rep_getpass(const char *prompt);
 int rep_getpeereid(int s, uid_t *uid, gid_t *gid);
 #endif
 
+#ifndef HAVE_USLEEP
+#define usleep rep_usleep
+typedef long useconds_t;
+int usleep(useconds_t);
+#endif
+
 #endif /* _LIBREPLACE_REPLACE_H */
diff --git a/source3/include/proto.h b/source3/include/proto.h
index a4fb496..779745a 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -318,7 +318,6 @@ int sys_set_nfs_quota(const char *path, const char *bdev,
 
 /* The following definitions come from lib/system.c  */
 
-int sys_usleep(long usecs);
 ssize_t sys_read(int fd, void *buf, size_t count);
 ssize_t sys_write(int fd, const void *buf, size_t count);
 ssize_t sys_writev(int fd, const struct iovec *iov, int iovcnt);
diff --git a/source3/lib/system.c b/source3/lib/system.c
index 92e244f..238f84b 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -52,40 +52,6 @@
 
 
 /***
- A wrapper for usleep in case we don't have one.
-/
-
-int sys_usleep(long usecs)
-{
-#ifndef HAVE_USLEEP
-   struct timeval tval;
-#endif
-
-   /*
-* We need this braindamage as the glibc usleep
-* is not SPEC1170 complient... grumble... JRA.
-*/
-
-   if(usecs  0 || usecs  99) {
-   errno = EINVAL;
-   return -1;
-   }
-
-#if HAVE_USLEEP
-   usleep(usecs);
-   return 0;
-#else /* HAVE_USLEEP */
-   /*
-* Fake it with select...
-*/
-   tval.tv_sec = 0;
-   tval.tv_usec = usecs/1000;
-   select(0,NULL,NULL,NULL,tval);
-   return 0;
-#endif /* HAVE_USLEEP */
-}
-
-/***
 A read wrapper that will deal with EINTR.
 /
 
diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c
index 4d5bed4..c1dabc4 100644
--- a/source3/passdb/pdb_smbpasswd.c
+++ b/source3

[SCM] Samba Shared Repository - branch master updated

2012-03-23 Thread Jelmer Vernooij

The branch, master has been updated
   via  ae9b5ad selftest.py: Add cleanup_pid.
   via  99b4d52 selftest.py: Add write_krb5_conf.
   via  289632f selftest.py: Add mk_realms_stanza function.
   via  f18d9e1 selftest.py: Add selftest.target.samba with bindir_path 
function.
  from  a15aefe Make it possible for developers of out-of-tree modules to 
use the same names as in-tree modules.

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


- Log -
commit ae9b5add1e4c64b578915f35fc23110b686262fb
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Mar 24 00:40:49 2012 +0100

selftest.py: Add cleanup_pid.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Sat Mar 24 04:52:59 CET 2012 on sn-devel-104

commit 99b4d52633a9c099c31254b6ed59122261414a67
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Mar 23 23:46:34 2012 +0100

selftest.py: Add write_krb5_conf.

commit 289632f85eefe987b429f6ca8500b3a17e42ebbb
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Mar 23 23:46:19 2012 +0100

selftest.py: Add mk_realms_stanza function.

commit f18d9e147d4a242cdfb31a816d91d277b99badae
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Mar 23 23:46:02 2012 +0100

selftest.py: Add selftest.target.samba with bindir_path function.

---

Summary of changes:
 selftest/target/samba.py |  121 ++
 selftest/tests/__init__.py   |2 +-
 selftest/tests/test_samba.py |  109 +
 3 files changed, 231 insertions(+), 1 deletions(-)
 create mode 100644 selftest/target/samba.py
 create mode 100644 selftest/tests/test_samba.py


Changeset truncated at 500 lines:

diff --git a/selftest/target/samba.py b/selftest/target/samba.py
new file mode 100644
index 000..1ea156c
--- /dev/null
+++ b/selftest/target/samba.py
@@ -0,0 +1,121 @@
+#!/usr/bin/perl
+# Bootstrap Samba and run a number of tests against it.
+# Copyright (C) 2005-2012 Jelmer Vernooij jel...@samba.org
+# Published under the GNU GPL, v3 or later.
+
+import os
+import sys
+
+
+def bindir_path(binary_mapping, bindir, path):
+Find the executable to use.
+
+:param binary_mapping: Dictionary mapping binary names
+:param bindir: Directory with binaries
+:param path: Name of the executable to run
+:return: Full path to the executable to run
+
+path = binary_mapping.get(path, path)
+valpath = os.path.join(bindir, path)
+if os.path.isfile(valpath):
+return valpath
+return path
+
+
+def mk_realms_stanza(realm, dnsname, domain, kdc_ipv4):
+Create a realms stanza for use in a krb5.conf file.
+
+:param realm: Real name
+:param dnsname: DNS name matching the realm
+:param domain: Domain name
+:param kdc_ipv4: IPv4 address of the KDC
+:return: String with stanza
+
+return \
+ %(realm)s = {
+  kdc = %(kdc_ipv4)s:88
+  admin_server = %(kdc_ipv4)s:88
+  default_domain = %(dnsname)s
+ }
+ %(dnsname)s = {
+  kdc = %(kdc_ipv4)s:88
+  admin_server = %(kdc_ipv4)s:88
+  default_domain = %(dnsname)s
+ }
+ %(domain)s = {
+  kdc = %(kdc_ipv4)s:88
+  admin_server = %(kdc_ipv4)s:88
+  default_domain = %(dnsname)s
+ }
+
+ % {
+kdc_ipv4: kdc_ipv4, dnsname: dnsname, realm: realm, domain: domain}
+
+
+def write_krb5_conf(f, realm, dnsname, domain, kdc_ipv4, tlsdir=None,
+other_realms_stanza=None):
+Write a krb5.conf file.
+
+:param f: File-like object to write to
+:param realm: Realm
+:param dnsname: DNS domain name
+:param domain: Domain name
+:param kdc_ipv4: IPv4 address of KDC
+:param tlsdir: Optional TLS directory
+:param other_realms_stanza: Optional extra raw text for [realms] section
+
+f.write(\
+#Generated krb5.conf for %(realm)s
+
+[libdefaults]
+\tdefault_realm = %(realm)s
+\tdns_lookup_realm = false
+\tdns_lookup_kdc = false
+\tticket_lifetime = 24h
+\tforwardable = yes
+\tallow_weak_crypto = yes
+ % {realm: realm})
+
+f.write(\n[realms]\n)
+f.write(mk_realms_stanza(realm, dnsname, domain, kdc_ipv4))
+if other_realms_stanza:
+f.write(other_realms_stanza)
+
+if tlsdir:
+f.write(
+[appdefaults]
+   pkinit_anchors = FILE:%(tlsdir)s/ca.pem
+
+[kdc]
+   enable-pkinit = true
+   pkinit_identity = FILE:%(tlsdir)s/kdc.pem,%(tlsdir)s/key.pem
+   pkinit_anchors = FILE:%(tlsdir)s/ca.pem
+
+ % {tlsdir: tlsdir})
+
+
+def cleanup_child(pid, name, outf=None):
+Cleanup a child process.
+
+:param pid: Parent pid process to be passed to waitpid()
+:param name: Name to use when referring to process
+:param outf: File-like object to write to (defaults to stderr)
+:return: Child pid
+
+if outf is None:
+outf = sys.stderr
+(childpid, status) = os.waitpid(pid, os.WNOHANG)
+if childpid == 0:
+pass

[SCM] Samba Shared Repository - branch master updated

2012-03-20 Thread Jelmer Vernooij

The branch, master has been updated
   via  7639ebe librpc/wscript_build: Fix formatting.
   via  d875327 Move NS_GUID_string and NS_GUID_from_string to dsdb-common.
   via  0b6dea9 libndr: Define trivial is_valid_policy_hnd as macro.
   via  b4d35be libndr: Rename policy_handle_empty to 
ndr_policy_handle_empty.
   via  f92b05b libndr: Rename policy_handle_equal to 
ndr_policy_handle_equal.
   via  95ca5fb libndr: Rename ndr64_transfer_syntax and null_ndr_syntax_id 
so they have a ndr_ prefix.
   via  6058977 librpc/wscript_build: Santizize formatting.
  from  0902392 s3-winbindd Only use SamLogonEx when we can get unencrypted 
session keys

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


- Log -
commit 7639ebe1ef6535ae1ffb4c9db8810c089136f434
Author: Jelmer Vernooij jel...@samba.org
Date:   Tue Mar 20 13:50:18 2012 +0100

librpc/wscript_build: Fix formatting.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Tue Mar 20 15:26:14 CET 2012 on sn-devel-104

commit d875327b10ca0fd3d548b4e9088ffcc7ef421baf
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 18 18:46:18 2012 +0100

Move NS_GUID_string and NS_GUID_from_string to dsdb-common.

commit 0b6dea9d664841d505acd75ac5449e953f60db74
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 18 18:04:17 2012 +0100

libndr: Define trivial is_valid_policy_hnd as macro.

This makes the NDR namespace a bit clearer, in preparation of ABI checking.

commit b4d35bee38a4cfd0eba26956dde2c5bb23cdb1c3
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 18 17:44:24 2012 +0100

libndr: Rename policy_handle_empty to ndr_policy_handle_empty.

This makes the NDR namespace a bit clearer, in preparation of ABI checking.

commit f92b05b95575d45e91dcd2885fb4e2d202deb9ae
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 18 16:54:21 2012 +0100

libndr: Rename policy_handle_equal to ndr_policy_handle_equal.

This makes the NDR namespace a bit clearer, in preparation of ABI checking.

commit 95ca5fbadd390fe056ee2e8f9716ee478904458e
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 18 16:46:57 2012 +0100

libndr: Rename ndr64_transfer_syntax and null_ndr_syntax_id so they have a 
ndr_ prefix.

This makes the NDR namespace a bit clearer, in preparation of ABI checking.

commit 6058977f900c513eafe20201d0b1b0d13727ba13
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 18 02:21:24 2012 +0100

librpc/wscript_build: Santizize formatting.

---

Summary of changes:
 librpc/ndr/libndr.h  |   14 +-
 librpc/ndr/ndr.c |   15 +-
 librpc/ndr/uuid.c|   61 +--
 librpc/rpc/binding.c |6 +-
 librpc/wscript_build |  771 +++---
 source3/lib/netapi/samr.c|6 +-
 source3/rpc_client/cli_pipe.c|6 +-
 source3/rpc_server/epmapper/srv_epmapper.c   |8 +-
 source3/rpc_server/rpc_ncacn_np.c|4 +-
 source3/rpc_server/srv_pipe.c|6 +-
 source4/dsdb/common/util.c   |   52 ++
 source4/dsdb/common/util.h   |   10 +
 source4/dsdb/samdb/ldb_modules/simple_ldap_map.c |1 +
 source4/dsdb/samdb/ldb_modules/wscript_build |2 +-
 source4/libnet/libnet_domain.c   |2 +-
 source4/libnet/prereq_domain.c   |8 +-
 source4/librpc/rpc/dcerpc_auth.c |4 +-
 source4/librpc/rpc/pyrpc.c   |5 +-
 source4/rpc_server/dcerpc_server.c   |   12 +-
 source4/rpc_server/epmapper/rpc_epmapper.c   |4 +-
 source4/rpc_server/handles.c |2 +-
 source4/torture/rpc/epmapper.c   |   12 +-
 source4/torture/rpc/samr.c   |   13 +-
 23 files changed, 516 insertions(+), 508 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h
index 36adae9..37a3145 100644
--- a/librpc/ndr/libndr.h
+++ b/librpc/ndr/libndr.h
@@ -353,9 +353,9 @@ typedef void (*ndr_print_function_t)(struct ndr_print *, 
const char *, int, cons
 #include ../libcli/util/error.h
 #include librpc/gen_ndr/misc.h
 
-extern const struct ndr_syntax_id ndr_transfer_syntax;
-extern const struct ndr_syntax_id ndr64_transfer_syntax;
-extern const struct ndr_syntax_id null_ndr_syntax_id;
+extern const struct ndr_syntax_id ndr_transfer_syntax_ndr;
+extern const struct ndr_syntax_id ndr_transfer_syntax_ndr64;
+extern const struct ndr_syntax_id ndr_syntax_id_null;
 
 struct ndr_interface_call_pipe {
const char *name;
@@ -555,9 +555,9 @@ NDR_SCALAR_PROTO(double, double)
 enum ndr_err_code

[SCM] Samba Shared Repository - branch master updated

2012-03-16 Thread Jelmer Vernooij

The branch, master has been updated
   via  0c06eb4 Stop installing popt_common.h as its symbols are in a 
private library.
  from  cbe27b3 build: Do not use --export-dynamic flag on OpenBSD 5.x

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


- Log -
commit 0c06eb48ab5a7e053b5dd162210f85a6611abd0f
Author: Jelmer Vernooij jel...@samba.org
Date:   Fri Mar 16 15:02:20 2012 +0100

Stop installing popt_common.h as its symbols are in a private library.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Fri Mar 16 17:39:31 CET 2012 on sn-devel-104

---

Summary of changes:
 source4/lib/cmdline/wscript_build |1 -
 1 files changed, 0 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/cmdline/wscript_build 
b/source4/lib/cmdline/wscript_build
index fb8b306..9b6f6e5 100644
--- a/source4/lib/cmdline/wscript_build
+++ b/source4/lib/cmdline/wscript_build
@@ -9,7 +9,6 @@ bld.SAMBA_LIBRARY('cmdline-credentials',
 bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
source='popt_common.c',
public_deps='popt',
-   public_headers='popt_common.h:popt.h',
header_path='samba',
deps='talloc samba-hostconfig'
)


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-03-15 Thread Jelmer Vernooij

The branch, master has been updated
   via  0affe19 Remove more unnecessary shebang lines in python files.
   via  3530ac0 samba.tests.source: Verify that only executable python 
files (and only executable files) have a shebang line.
   via  fa806eb wafsamba: Remove shebang lines from non-executable files.
  from  6589e02 Make reinit_after_fork_pipe_handler code with reads being 
interrupted by a signal.

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


- Log -
commit 0affe19304b96332c5c1ff36373203216a35ec07
Author: Jelmer Vernooij jel...@samba.org
Date:   Thu Mar 15 16:03:57 2012 +0100

Remove more unnecessary shebang lines in python files.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Fri Mar 16 02:48:52 CET 2012 on sn-devel-104

commit 3530ac01492727d64b7f7d10d7a1ef21bb590c5d
Author: Jelmer Vernooij jel...@samba.org
Date:   Thu Mar 15 16:03:36 2012 +0100

samba.tests.source: Verify that only executable python files (and only 
executable files) have a shebang line.

commit fa806eb7c666ec795fa4f8309f939c4e9bfb7b36
Author: Jelmer Vernooij jel...@samba.org
Date:   Thu Mar 15 15:56:27 2012 +0100

wafsamba: Remove shebang lines from non-executable files.

---

Summary of changes:
 buildtools/wafsamba/gccdeps.py |1 -
 buildtools/wafsamba/nothreads.py   |1 -
 buildtools/wafsamba/samba_wildcard.py  |2 --
 buildtools/wafsamba/stale_files.py |1 -
 lib/socket_wrapper/socket.py   |2 --
 source4/librpc/rpc/dcerpc.py   |2 --
 source4/scripting/python/samba/tests/source.py |   21 -
 7 files changed, 20 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/gccdeps.py b/buildtools/wafsamba/gccdeps.py
index 2f09083..2da42e6 100644
--- a/buildtools/wafsamba/gccdeps.py
+++ b/buildtools/wafsamba/gccdeps.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 # Thomas Nagy, 2008-2010 (ita)
 
diff --git a/buildtools/wafsamba/nothreads.py b/buildtools/wafsamba/nothreads.py
index b39aeb5..90babf4 100644
--- a/buildtools/wafsamba/nothreads.py
+++ b/buildtools/wafsamba/nothreads.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 # Thomas Nagy, 2005-2008 (ita)
 
diff --git a/buildtools/wafsamba/samba_wildcard.py 
b/buildtools/wafsamba/samba_wildcard.py
index a0a10a3..84503b8 100644
--- a/buildtools/wafsamba/samba_wildcard.py
+++ b/buildtools/wafsamba/samba_wildcard.py
@@ -1,5 +1,3 @@
-#! /usr/bin/env python
-
 # based on playground/evil in the waf svn tree
 
 import os, datetime
diff --git a/buildtools/wafsamba/stale_files.py 
b/buildtools/wafsamba/stale_files.py
index 1ee1ff9..5a91367 100644
--- a/buildtools/wafsamba/stale_files.py
+++ b/buildtools/wafsamba/stale_files.py
@@ -1,4 +1,3 @@
-#! /usr/bin/env python
 # encoding: utf-8
 # Thomas Nagy, 2006-2010 (ita)
 
diff --git a/lib/socket_wrapper/socket.py b/lib/socket_wrapper/socket.py
index bba9665..ccbb820 100644
--- a/lib/socket_wrapper/socket.py
+++ b/lib/socket_wrapper/socket.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-#
 # Wrapper for socket wrapper (based on python socket wrapper)
 # Copyright (C) Amitay Isaacs 2011
 #
diff --git a/source4/librpc/rpc/dcerpc.py b/source4/librpc/rpc/dcerpc.py
index 73db9e3..830720c 100644
--- a/source4/librpc/rpc/dcerpc.py
+++ b/source4/librpc/rpc/dcerpc.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 # Unix SMB/CIFS implementation.
 # Copyright (C) Jelmer Vernooij jel...@samba.org 2008
 #
diff --git a/source4/scripting/python/samba/tests/source.py 
b/source4/scripting/python/samba/tests/source.py
index 06e8739..0876b04 100644
--- a/source4/scripting/python/samba/tests/source.py
+++ b/source4/scripting/python/samba/tests/source.py
@@ -33,7 +33,6 @@ from samba.tests import (
 )
 
 
-
 def get_python_source_files():
 Iterate over all Python source files.
 library_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), 
.., .., samba))
@@ -184,6 +183,26 @@ class TestSource(TestCase):
 self.fail(self._format_message(illegal_newlines,
 'Non-unix newlines were found in the following source files:'))
 
+def test_shebang_lines(self):
+Check that files with shebang lines and only those are 
executable.
+files_with_shebang = {}
+files_without_shebang= {}
+for fname, line_no, line in self._iter_source_files_lines():
+if line_no = 1:
+continue
+executable = (os.stat(fname).st_mode  0111)
+has_shebang = line.startswith(#!)
+if has_shebang and not executable:
+self._push_file(files_with_shebang, fname, line_no)
+if not has_shebang and executable:
+self._push_file(files_without_shebang, fname

[SCM] Samba Shared Repository - branch master updated

2012-03-14 Thread Jelmer Vernooij

The branch, master has been updated
   via  26d68c3 samba3util: Add ccan to dependency list now that 
str_checksum() uses a ccan function.
  from  a5ddc2d s3:smb2_server: fix a compiler warning

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


- Log -
commit 26d68c3c288195cfc152915dede47d505bd30b1d
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Mar 14 14:30:50 2012 +0100

samba3util: Add ccan to dependency list now that str_checksum() uses a ccan 
function.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Wed Mar 14 17:55:51 CET 2012 on sn-devel-104

---

Summary of changes:
 source3/wscript_build |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript_build b/source3/wscript_build
index 807b1a2..61093a4 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -813,7 +813,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
 
 bld.SAMBA3_SUBSYSTEM('samba3util',
source=LIB_UTIL_SRC,
-   deps='ndr security NDR_SECURITY samba-util UTIL_TDB',
+   deps='ndr security NDR_SECURITY samba-util UTIL_TDB ccan',
vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('samba3core',


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-03-14 Thread Jelmer Vernooij

The branch, master has been updated
   via  48c2f80 libsmbclient-raw: Install smb_composite.h.
  from  180b3a3 build: Do not build with utmp when we do not have utmp.h

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


- Log -
commit 48c2f803e8550a1d321d7312563a6f08bb89f096
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Mar 14 23:20:07 2012 +0100

libsmbclient-raw: Install smb_composite.h.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Thu Mar 15 02:57:59 CET 2012 on sn-devel-104

---

Summary of changes:
 source4/libcli/smb2/wscript_build |3 ++-
 source4/libcli/wscript_build  |3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/libcli/smb2/wscript_build 
b/source4/libcli/smb2/wscript_build
index d2478a4..2af1a02 100644
--- a/source4/libcli/smb2/wscript_build
+++ b/source4/libcli/smb2/wscript_build
@@ -4,6 +4,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_SMB2',
source='transport.c request.c session.c tcon.c create.c close.c 
connect.c getinfo.c write.c read.c setinfo.c find.c ioctl.c logoff.c tdis.c 
flush.c lock.c notify.c cancel.c keepalive.c break.c util.c signing.c 
lease_break.c',
autoproto='smb2_proto.h',
deps='tevent-util libsmb',
-   public_deps='smbclient-raw LIBPACKET gensec tevent'
+   public_deps='smbclient-raw LIBPACKET gensec tevent',
+   public_headers='smb2.h',
)
 
diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build
index 1d59e69..89a4a92 100644
--- a/source4/libcli/wscript_build
+++ b/source4/libcli/wscript_build
@@ -27,7 +27,8 @@ bld.SAMBA_SUBSYSTEM('cli_composite',
 bld.SAMBA_SUBSYSTEM('LIBCLI_SMB_COMPOSITE',
source='smb_composite/loadfile.c smb_composite/savefile.c 
smb_composite/connect.c smb_composite/sesssetup.c smb_composite/fetchfile.c 
smb_composite/appendacl.c smb_composite/fsinfo.c smb_composite/smb2.c',
deps='LIBCLI_SMB2 tevent-util',
-   public_deps='cli_composite samba-credentials gensec LIBCLI_RESOLVE 
tevent'
+   public_deps='cli_composite samba-credentials gensec LIBCLI_RESOLVE 
tevent',
+   public_headers='smb_composite/smb_composite.h',
)
 
 bld.SAMBA_PYTHON('pysmb',


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-03-13 Thread Jelmer Vernooij

The branch, master has been updated
   via  85f128e nbench: Fix typo.
   via  58b205d samba.8: Fix typo: deamon - daemon.
   via  441c214 samba_dnsupdate: Mention contents of invalid line when 
encountering parsing error.
   via  8b42801 samba_dnsupdate: Raise proper exception when getting 
unexpected DNS reply.
   via  d87a24f samba_dnsupdate: Use docstrings, which show up nicely in 
API docs.
  from  7d4ed89 s3-rpc: Decrypt with the proper session key in 
CreateTrustedDomainEx2.

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


- Log -
commit 85f128e8f3b8cd86926dc9097e96c31b66ab0f61
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Mar 12 19:36:51 2012 +0100

nbench: Fix typo.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Tue Mar 13 14:53:07 CET 2012 on sn-devel-104

commit 58b205d48690498e3595ba16bb5521efcaa83ad4
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Mar 12 19:34:43 2012 +0100

samba.8: Fix typo: deamon - daemon.

commit 441c214dda2ca93980461c03115b094a1e606d4a
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Mar 12 19:29:34 2012 +0100

samba_dnsupdate: Mention contents of invalid line when encountering parsing 
error.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=8809

commit 8b42801609c82b5745a61a70149a41039973cfa1
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Mar 12 19:25:39 2012 +0100

samba_dnsupdate: Raise proper exception when getting unexpected DNS reply.

commit d87a24fe171139d2b3bab12bcc9266318e22107b
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Mar 12 19:23:50 2012 +0100

samba_dnsupdate: Use docstrings, which show up nicely in API docs.

---

Summary of changes:
 source4/scripting/bin/samba_dnsupdate |   48 +++-
 source4/smbd/samba.8.xml  |2 +-
 source4/torture/nbench/nbench.c   |2 +-
 3 files changed, 25 insertions(+), 27 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/bin/samba_dnsupdate 
b/source4/scripting/bin/samba_dnsupdate
index 86af6d8..d21496c 100755
--- a/source4/scripting/bin/samba_dnsupdate
+++ b/source4/scripting/bin/samba_dnsupdate
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# vim: expandtab
 #
 # update our DNS names using TSIG-GSS
 #
@@ -104,9 +105,9 @@ for i in IPs:
 if opts.verbose:
 print IPs: %s % IPs
 
-
-# get credentials if we haven't got them already
+
 def get_credentials(lp):
+# get credentials if we haven't got them already.
 from samba import credentials
 global ccachename, creds
 if creds is not None:
@@ -119,11 +120,13 @@ def get_credentials(lp):
 creds.get_named_ccache(lp, ccachename)
 
 
-#
-# an object to hold a parsed DNS line
 class dnsobj(object):
+an object to hold a parsed DNS line
+
 def __init__(self, string_form):
 list = string_form.split()
+if len(list)  3:
+raise Exception(Invalid DNS entry %r % string_form)
 self.dest = None
 self.port = None
 self.ip = None
@@ -132,6 +135,8 @@ class dnsobj(object):
 self.type = list[0]
 self.name = list[1].lower()
 if self.type == 'SRV':
+if len(list)  4:
+raise Exception(Invalid DNS entry %r % string_form)
 self.dest = list[2].lower()
 self.port = list[3]
 elif self.type in ['A', '']:
@@ -141,8 +146,7 @@ class dnsobj(object):
 elif self.type == 'NS':
 self.dest = list[2].lower()
 else:
-print Received unexpected DNS reply of type %s % self.type
-raise
+raise Exception(Received unexpected DNS reply of type %s % 
self.type)
 
 def __str__(self):
 if d.type == A: return %s %s %s % (self.type, self.name, 
self.ip)
@@ -152,38 +156,35 @@ class dnsobj(object):
 if d.type == NS:return %s %s %s % (self.type, self.name, 
self.dest)
 
 
-
-# parse a DNS line from
 def parse_dns_line(line, sub_vars):
+parse a DNS line from.
 if line.startswith(SRV _ldap._tcp.pdc._msdcs.) and not samdb.am_pdc():
 if opts.verbose:
 print Skipping PDC entry (%s) as we are not a PDC % line
 return None
 subline = samba.substitute_var(line, sub_vars)
-d = dnsobj(subline)
-return d
+return dnsobj(subline)
+
 
-
-# see if two hostnames match
 def hostname_match(h1, h2):
+see if two hostnames match.
 h1 = str(h1)
 h2 = str(h2)
 return h1.lower().rstrip('.') == h2.lower().rstrip('.')
 
 
-
-# check that a DNS entry exists
 def check_dns_name(d

[SCM] Samba Shared Repository - branch master updated

2012-03-11 Thread Jelmer Vernooij

The branch, master has been updated
   via  8af7dad selftest.run: Use subunit version of iso8601.
   via  ed32df6 selftest.py: Remove some unnecessary checks.
   via  6f9c333 selftest.py: Move some infrastructure for running commands 
to selftest.run, with tests.
   via  f5bb26e upgradedns: Remove unused import.
   via  9068115 samba-tool: Write diagnostics to stderr rather than stdout.
  from  a57d7ad s4:upgradeprovision - fix some output messages

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


- Log -
commit 8af7dadca2c820e125c6059eef62e2a4c76f7ff3
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 11 23:56:56 2012 +0100

selftest.run: Use subunit version of iso8601.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Mon Mar 12 01:36:25 CET 2012 on sn-devel-104

commit ed32df61f8d447735546b3b7b78fe8d112313287
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 11 21:46:00 2012 +0100

selftest.py: Remove some unnecessary checks.

commit 6f9c333f95956138fbd8245a4cf3f285ca601181
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 11 20:58:00 2012 +0100

selftest.py: Move some infrastructure for running commands to selftest.run, 
with tests.

commit f5bb26edb36936b08dc2384cf6aa1dee73a355c8
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 11 19:58:47 2012 +0100

upgradedns: Remove unused import.

commit 90681153ad3af45aa4c09ced28effd2beb2881f1
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 11 19:58:23 2012 +0100

samba-tool: Write diagnostics to stderr rather than stdout.

---

Summary of changes:
 selftest/run.py   |   55 
 selftest/selftest.py  |   58 --
 selftest/tests/test_run.py|   93 +
 source4/scripting/bin/samba_upgradedns|1 -
 source4/scripting/python/samba/netcmd/__init__.py |2 +-
 5 files changed, 164 insertions(+), 45 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/run.py b/selftest/run.py
index 20ede65..222ac8b 100644
--- a/selftest/run.py
+++ b/selftest/run.py
@@ -15,7 +15,14 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see http://www.gnu.org/licenses/.
 
+Test command running.
+
+import datetime
+from subunit import iso8601
 import os
+import subprocess
+import subunit
+import sys
 import tempfile
 import warnings
 
@@ -77,3 +84,51 @@ def exported_envvars_str(vars, names):
 continue
 out += %s=%s\n % (n, vars[n])
 return out
+
+
+def now():
+Return datetime instance for current time in UTC.
+
+return datetime.datetime.utcnow().replace(tzinfo=iso8601.Utc())
+
+
+def run_testsuite_command(name, cmd, subunit_ops, env=None, outf=None):
+Run a testsuite command.
+
+:param name: Name of the testsuite
+:param cmd: Command to run
+:param subunit_ops: Subunit ops to use for reporting results
+:param env: Environment the test is run in
+:param outf: File-like object to write standard out to (defaults to 
sys.stdout)
+:return: Exit code or None if the test failed to run completely
+
+if outf is None:
+outf = sys.stdout
+subunit_ops.start_testsuite(name)
+subunit_ops.progress(None, subunit.PROGRESS_PUSH)
+subunit_ops.time(now())
+try:
+exitcode = subprocess.call(cmd, shell=True, stdout=outf)
+except Exception, e:
+subunit_ops.time(now())
+subunit_ops.progress(None, subunit.PROGRESS_POP)
+subunit_ops.end_testsuite(name, error, Unable to run %r: %s % 
(cmd, e))
+return None
+
+subunit_ops.time(now())
+subunit_ops.progress(None, subunit.PROGRESS_POP)
+
+if env is not None:
+envlog = env.get_log()
+if envlog != :
+outf.write(envlog: %s\n % envlog)
+
+outf.write(command: %s\n % cmd)
+outf.write(expanded command: %s\n % expand_environment_strings(cmd, 
os.environ))
+
+if exitcode == 0:
+subunit_ops.end_testsuite(name, success)
+else:
+subunit_ops.end_testsuite(name, failure, Exit code was %d % 
exitcode)
+
+return exitcode
diff --git a/selftest/selftest.py b/selftest/selftest.py
index 1b20441..af2e552 100755
--- a/selftest/selftest.py
+++ b/selftest/selftest.py
@@ -18,8 +18,6 @@
 
 import atexit
 from cStringIO import StringIO
-import datetime
-import iso8601
 import os
 import sys
 import signal
@@ -39,10 +37,11 @@ from selftest import (
 )
 from selftest.client import write_clientconf
 from selftest.run import (
-expand_environment_strings,
 expand_command_list,
 expand_command_run,
 exported_envvars_str,
+now,
+run_testsuite_command,
 )
 from selftest.target import

[SCM] build.samba.org - branch master updated

2012-03-10 Thread Jelmer Vernooij

The branch, master has been updated
   via  a5112ec Print 404 page if build is not found.
  from  87b42eb Add tdb2 build

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


- Log -
commit a5112ec54a329d996a9772cdfad5f5357296bfc2
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Mar 10 18:53:43 2012 +0100

Print 404 page if build is not found.

---

Summary of changes:
 buildfarm/web/__init__.py |8 +++-
 1 files changed, 7 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index c4972dc..f6444dc 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -1030,7 +1030,13 @@ class BuildFarmApp(object):
 yield .join(self.html_page(form, page.render_html(myself, 
wsgiref.util.shift_path_info(environ
 elif fn == build:
 build_checksum = wsgiref.util.shift_path_info(environ)
-build = self.buildfarm.builds.get_by_checksum(build_checksum)
+try:
+build = 
self.buildfarm.builds.get_by_checksum(build_checksum)
+except NoSuchBuildError:
+start_response('404 Page Not Found', [
+('Content-Type', 'text/html; charset=utf8')])
+yield No build with checksum %s found % build_checksum
+return
 page = ViewBuildPage(self.buildfarm)
 subfn = wsgiref.util.shift_path_info(environ)
 if subfn == +plain:


-- 
build.samba.org

[SCM] Samba Shared Repository - branch master updated

2012-03-10 Thread Jelmer Vernooij

The branch, master has been updated
   via  ce4531e tdb_wrap: Move to specific directory.
   via  f076186 samba.tests.blackbox.samba_tool_drs: Remove unused import.
   via  af08762 wscript: Include talloc, tdb and ldb in pydoctor output.
   via  adcdee8 samba.samdb: Fix formatting of arguments in docstring.
   via  d8a624a pydoctor: Specify --project-name.
   via  a0db69d python: samba: Use relative import for _glue.
   via  4c292c8 tevent: Install tevent.py into PYTHONARCHDIR rather than 
PYTHONDIR for consistency with other Samba scripts.
  from  16ecda3 selftest: fix running additional smbclient test for 
non-spnego session setup

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


- Log -
commit ce4531ee312c1171fcffcdbe9e214ae43384cdfd
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Mar 10 21:33:11 2012 +0100

tdb_wrap: Move to specific directory.

It's a bit confusing to mix low-level and high-level libraries.  We had
multiple libraries in one directory, and there were have circular
dependencies with other libraries outside that directory (in this case,
samba-hostconfig).

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Sat Mar 10 23:13:01 CET 2012 on sn-devel-104

commit f076186d3ab95c4d4c4d3d7b66f283881ac1fbbb
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Mar 7 10:30:34 2012 +0100

samba.tests.blackbox.samba_tool_drs: Remove unused import.

commit af087626531a9510c9b897cd520364ee746825b4
Author: Jelmer Vernooij jel...@samba.org
Date:   Tue Mar 6 23:40:39 2012 +0100

wscript: Include talloc, tdb and ldb in pydoctor output.

commit adcdee89335eba2a5b982900ab3c796a4003751a
Author: Jelmer Vernooij jel...@samba.org
Date:   Tue Mar 6 23:31:55 2012 +0100

samba.samdb: Fix formatting of arguments in docstring.

commit d8a624a71f86486ee3d8db41925bde5ff59b8b8f
Author: Jelmer Vernooij jel...@samba.org
Date:   Tue Mar 6 23:21:44 2012 +0100

pydoctor: Specify --project-name.

commit a0db69dd79c90a7a77e627b56ec3b854b7350537
Author: Jelmer Vernooij jel...@samba.org
Date:   Tue Mar 6 23:20:12 2012 +0100

python: samba: Use relative import for _glue.

For some reason, using an absolute import breaks pydoctor.

commit 4c292c8e622ba293c10a4dc4e5799b588699810a
Author: Jelmer Vernooij jel...@samba.org
Date:   Tue Mar 6 18:07:20 2012 +0100

tevent: Install tevent.py into PYTHONARCHDIR rather than PYTHONDIR for 
consistency with other Samba scripts.

---

Summary of changes:
 lib/{util = tdb_wrap}/tdb_wrap.c  |2 +-
 lib/{util = tdb_wrap}/tdb_wrap.h  |0
 lib/tdb_wrap/wscript_build |8 
 lib/tevent/wscript |2 +-
 lib/util/wscript_build |7 ---
 libcli/auth/schannel_state_tdb.c   |2 +-
 source3/Makefile.in|2 +-
 source3/lib/dbwrap/dbwrap_ctdb.c   |2 +-
 source3/lib/dbwrap/dbwrap_tdb.c|2 +-
 source3/lib/messages_local.c   |2 +-
 source3/lib/server_mutex.c |2 +-
 source3/lib/serverid.c |2 +-
 source3/smbd/notify_internal.c |2 +-
 source4/cluster/local.c|2 +-
 source4/dsdb/samdb/ldb_modules/partition.h |2 +-
 source4/lib/messaging/messaging.c  |2 +-
 source4/ntvfs/common/brlock_tdb.c  |2 +-
 source4/ntvfs/common/notify.c  |2 +-
 source4/ntvfs/common/opendb_tdb.c  |2 +-
 source4/ntvfs/posix/python/pyxattr_tdb.c   |2 +-
 source4/ntvfs/posix/vfs_posix.c|2 +-
 source4/ntvfs/posix/xattr_tdb.c|2 +-
 source4/param/secrets.c|2 +-
 source4/scripting/python/samba/__init__.py |2 +-
 source4/scripting/python/samba/samdb.py|8 
 .../python/samba/tests/blackbox/samba_tool_drs.py  |1 -
 source4/torture/local/dbspeed.c|2 +-
 wscript|   11 ++-
 wscript_build  |1 +
 29 files changed, 45 insertions(+), 35 deletions(-)
 rename lib/{util = tdb_wrap}/tdb_wrap.c (99%)
 rename lib/{util = tdb_wrap}/tdb_wrap.h (100%)
 create mode 100644 lib/tdb_wrap/wscript_build


Changeset truncated at 500 lines:

diff --git a/lib/util/tdb_wrap.c b/lib/tdb_wrap/tdb_wrap.c
similarity index 99%
rename from lib/util/tdb_wrap.c
rename to lib/tdb_wrap/tdb_wrap.c
index 7c3318b..0994b1b 100644
--- a/lib/util/tdb_wrap.c
+++ b/lib/tdb_wrap/tdb_wrap.c
@@ -21,7 +21,7 @@
 
 #include includes.h

[SCM] Samba Shared Repository - branch master updated

2012-03-09 Thread Jelmer Vernooij

The branch, master has been updated
   via  7320a5c samba.tests.samba_tool.base: Avoid unnecessary call to 
testtools.matchers.Contains.
   via  b703267 samba.tests.samba_tool.user: Remove unused imports.
  from  981e977 Ensure the right tsocket.h is included.

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


- Log -
commit 7320a5c900a263794cf1a4de55ce786e0f8fa317
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Mar 10 00:23:40 2012 +0100

samba.tests.samba_tool.base: Avoid unnecessary call to 
testtools.matchers.Contains.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Sat Mar 10 05:27:51 CET 2012 on sn-devel-104

commit b703267dfc731d659453e56aa54e49cc4e442f98
Author: Jelmer Vernooij jel...@samba.org
Date:   Sat Mar 10 00:23:18 2012 +0100

samba.tests.samba_tool.user: Remove unused imports.

---

Summary of changes:
 .../python/samba/tests/samba_tool/base.py  |3 +--
 .../python/samba/tests/samba_tool/user.py  |2 --
 2 files changed, 1 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/tests/samba_tool/base.py 
b/source4/scripting/python/samba/tests/samba_tool/base.py
index 628fd6c..489d6b5 100644
--- a/source4/scripting/python/samba/tests/samba_tool/base.py
+++ b/source4/scripting/python/samba/tests/samba_tool/base.py
@@ -28,7 +28,6 @@ from samba.samdb import SamDB
 from cStringIO import StringIO
 from samba.netcmd.main import cmd_sambatool
 import samba.tests
-from testtools.matchers import Contains
 
 class SambaToolCmdTest(samba.tests.TestCase):
 
@@ -89,7 +88,7 @@ class SambaToolCmdTest(samba.tests.TestCase):
 self.assertIsNotNone(val, msg)
 
 def assertMatch(self, base, string, msg=):
-self.assertThat(base, Contains(string), msg)
+self.assertTrue(string in base, msg)
 
 def randomName(self, count=8):
 Create a random name, cap letters and numbers, and always starting 
with a letter
diff --git a/source4/scripting/python/samba/tests/samba_tool/user.py 
b/source4/scripting/python/samba/tests/samba_tool/user.py
index 4fe43e5..2e7c2b9 100644
--- a/source4/scripting/python/samba/tests/samba_tool/user.py
+++ b/source4/scripting/python/samba/tests/samba_tool/user.py
@@ -18,8 +18,6 @@
 #
 
 import os
-import sys
-import pprint
 import time
 import ldb
 from samba.tests.samba_tool.base import SambaToolCmdTest


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-03-05 Thread Jelmer Vernooij

The branch, master has been updated
   via  f033c22 policy/python: Move python binding tests to standard 
location.
   via  aaffd99 selftest/tests.py: Fix name of selftest.py for benefit of 
--load-list.
   via  b9ac1f4 selftest.py: Only run teardown_all when actually relevant.
  from  074ee6f s3-rpc_server: Remove remaining code for embedded endpoint 
mapper

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


- Log -
commit f033c221f8f459759aee259be8f52a79fd7e8f3f
Author: Jelmer Vernooij jel...@samba.org
Date:   Tue Mar 6 00:46:55 2012 +0100

policy/python: Move python binding tests to standard location.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Tue Mar  6 02:26:29 CET 2012 on sn-devel-104

commit aaffd996abd9404bb942570f49ca01598ebe0fc3
Author: Jelmer Vernooij jel...@samba.org
Date:   Tue Mar 6 00:39:11 2012 +0100

selftest/tests.py: Fix name of selftest.py for benefit of --load-list.

commit b9ac1f45a14b9783602fe4508b1f450dd2676bb6
Author: Jelmer Vernooij jel...@samba.org
Date:   Tue Mar 6 00:38:54 2012 +0100

selftest.py: Only run teardown_all when actually relevant.

---

Summary of changes:
 selftest/selftest.py   |4 +---
 .../python/samba/tests/policy.py}  |0
 source4/selftest/tests.py  |4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)
 rename source4/{lib/policy/tests/python/bindings.py = 
scripting/python/samba/tests/policy.py} (100%)


Changeset truncated at 500 lines:

diff --git a/selftest/selftest.py b/selftest/selftest.py
index 26c409a..1b20441 100755
--- a/selftest/selftest.py
+++ b/selftest/selftest.py
@@ -538,12 +538,10 @@ else:
 
 if opts.resetup_environment:
 env_manager.teardown_env(envname)
+env_manager.teardown_all()
 
 sys.stdout.write(\n)
 
-if not opts.list:
-env_manager.teardown_all()
-
 # if there were any valgrind failures, show them
 for fn in os.listdir(prefix):
 if fn.startswith(valgrind.log):
diff --git a/source4/lib/policy/tests/python/bindings.py 
b/source4/scripting/python/samba/tests/policy.py
similarity index 100%
rename from source4/lib/policy/tests/python/bindings.py
rename to source4/scripting/python/samba/tests/policy.py
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index bc8bf12..d49f253 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -402,7 +402,7 @@ def planoldpythontestsuite(env, module, name=None, 
extra_path=[], environ={}, ex
 name = module
 plantestsuite(name, env, args)
 
-planpythontestsuite(none, selftest.tests.test_suite, 
name=selftest.py.tests, extra_path=[srcdir()])
+planpythontestsuite(none, selftest.tests.test_suite, extra_path=[srcdir()])
 planpythontestsuite(none, api, name=ldb.python, 
extra_path=['lib/ldb/tests/python'])
 planpythontestsuite(none, samba.tests.credentials)
 planoldpythontestsuite(dc:local, samba.tests.gensec, 
extra_args=['-U$USERNAME%$PASSWORD'])
@@ -466,7 +466,7 @@ planpythontestsuite(none, samba.tests.ntacls)
 plantestsuite(samba4.deletetest.python(dc), dc, 
['PYTHONPATH=$PYTHONPATH:%s/lib/subunit/python:%s/lib/testtools' % (srcdir(), 
srcdir()),
  python, 
os.path.join(samba4srcdir, dsdb/tests/python/deletetest.py),
  '$SERVER', 
'-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'])
-planpythontestsuite(none, bindings, 
extra_path=[%s/lib/policy/tests/python % samba4srcdir], 
name=samba4.policy.python)
+planpythontestsuite(none, samba.tests.policy)
 plantestsuite(samba4.blackbox.samba3dump, none, [python, 
os.path.join(samba4srcdir, scripting/bin/samba3dump), 
os.path.join(samba4srcdir, ../testdata/samba3)], allow_empty_output=True)
 plantestsuite(samba4.blackbox.upgrade, none, [PYTHON=%s % python, 
os.path.join(samba4srcdir, setup/tests/blackbox_s3upgrade.sh), 
'$PREFIX/provision'])
 plantestsuite(samba4.blackbox.provision.py, none, [PYTHON=%s % python, 
os.path.join(samba4srcdir, setup/tests/blackbox_provision.sh), 
'$PREFIX/provision'])


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-03-04 Thread Jelmer Vernooij

The branch, master has been updated
   via  c9d3807 selftest.py: Use testtools TestCase class.
   via  82af4a7 selftest.py: Add dummy init file (required to run tests).
   via  e7d6d67 selftest.pl: Remove unused --verbose option.
   via  01ba5cf selftest.py: Remove unused --verbose option.
   via  8ae7615 selftest.py: Remove unused code, reconcile signal handlers.
   via  b5d9cd1 selftest.py: Fix handling of boolean options.
   via  aaa7cf6 selftest.py: Fix signal handling.
   via  570dbf2 Run selftest.py tests.
   via  7e5d98c selftest: Now runs again for tests that use environment 
'none'.
   via  3a6e4cf selftest.target: Add NoneTarget.
   via  cd9cf47 selftest.py: Finish conversion to python - now loads 
without syntax errors.
   via  11c7ce3 selftest.testlist: Add RestrictedTestManager.from_path.
   via  48155d1 selftest: More work on conversion to Python.
   via  d400619 selftest.testlist: Add docstrings.
   via  a50def8 selftest.testlist: Add manager for restricted test lists.
   via  616139c Add TestListFilter definition.
   via  4802561 selftest.testlist: Add read_testlist.
   via  7a614ac selftest.testlist: Add read_test_regexes.
   via  8b583dc selftest: Add testlist management module.
   via  4d602fb selftest.target: Add Environment.get_vars.
   via  646f6b2 selftest: Add tests for trying to reuse an environment that 
has gone down.
   via  7060d68 selftest: Add tests for NoneEnvironment.
   via  aa7fa63 selftest.target: Test that environments are reused.
   via  75eb57c selftest.target: Add tests for get_running_env.
   via  0d50c4c selftest.target: Add tests for getlog_env.
   via  e7633d8 selftest.target: Add tests for check.
   via  c57ab7b selftest.target: Add tests for setup.
   via  5f74fa3 selftest: Add base classes for Target/Environment and their 
management.
   via  164d3f6 selftest.socket_wrapper: interface is an integer.
   via  0cfb8e0 selftest.socket_wrapper: Add basic unit tests.
   via  adbd55e selftest.socket_wrapper: Add docstrings.
   via  1d71ca9 Add test infrastructure for selftest.
   via  a6056e0 selftest: Add python version of socket wrapper utilities.
   via  fc7f494 selftest: Add selftest.py.
   via  122374e kcc: Improve formatting of Python code to be more 
consistent with our other code.
  from  4a8dfa4 libcli:smb: define SMB2_HDR_FLAG_REPLAY_OPERATION

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


- Log -
commit c9d380702cb8d1b2d393d7c369ec27adf4bb1060
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 4 18:00:54 2012 +0100

selftest.py: Use testtools TestCase class.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Sun Mar  4 19:38:25 CET 2012 on sn-devel-104

commit 82af4a79b9c86c5c055158ab629a243e41c53249
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 4 16:53:59 2012 +0100

selftest.py: Add dummy init file (required to run tests).

commit e7d6d67bee048109105b0ab0d865d7746934c332
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 4 16:50:28 2012 +0100

selftest.pl: Remove unused --verbose option.

commit 01ba5cf689d1aea8fd19ac809767319cd0c1d401
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 4 16:50:21 2012 +0100

selftest.py: Remove unused --verbose option.

commit 8ae7615cf36b449fae39790d43c66f3cdf39f876
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 4 16:49:30 2012 +0100

selftest.py: Remove unused code, reconcile signal handlers.

commit b5d9cd1740dfcd766e5c62c35acfc56265dd7f6a
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 4 16:39:43 2012 +0100

selftest.py: Fix handling of boolean options.

commit aaa7cf67abe2d11b2a7de98964f25f17ce172705
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 4 16:32:56 2012 +0100

selftest.py: Fix signal handling.

commit 570dbf2ee0864c963c27108b4527fabe2f1b31d3
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 4 16:30:26 2012 +0100

Run selftest.py tests.

commit 7e5d98c22cfe9107209176a9124e23ab16d80857
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 4 16:22:34 2012 +0100

selftest: Now runs again for tests that use environment 'none'.

commit 3a6e4cf2b1a88f3ab6631e75ca2e1be5273b2f8f
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 4 16:01:18 2012 +0100

selftest.target: Add NoneTarget.

commit cd9cf4797204f307defda7482360580558c5ee44
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 4 15:11:36 2012 +0100

selftest.py: Finish conversion to python - now loads without syntax errors.

commit 11c7ce35c0d3d645e26177351776d599083dfd9a
Author: Jelmer Vernooij jel...@samba.org
Date:   Sun Mar 4 14:55:39 2012 +0100

selftest.testlist: Add RestrictedTestManager.from_path.

commit 48155d189aaf2ac8d4ddabf909fcae44e9321e13
Author: Jelmer Vernooij jel

[SCM] Samba Shared Repository - branch master updated

2012-03-04 Thread Jelmer Vernooij

The branch, master has been updated
   via  53a147d selftest.run: Factor out read_testlist_file and 
open_file_or_pipe.
   via  f26b40a selftest.run: Factor out exported_envvars_str.
   via  a6a8456 selfclient.client: Factor out write_clientconf.
   via  f3f6b8e selftest.run: Factor out expand_command_run.
   via  d6924f8 selftest.run: Factor out expand_command_list.
   via  1741e64 selftest: Factor out expand_environment_strings.
  from  5c5111c s3-ctdb: Enable CTDB readonly support only if CTDB supports 
it

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


- Log -
commit 53a147d1c0c54fe94ac21f25088fd874d1300102
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Mar 5 04:05:35 2012 +0100

selftest.run: Factor out read_testlist_file and open_file_or_pipe.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Mon Mar  5 05:42:19 CET 2012 on sn-devel-104

commit f26b40a92553863bc0da39918ff19bf21199c608
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Mar 5 03:49:50 2012 +0100

selftest.run: Factor out exported_envvars_str.

commit a6a84566466a59fc954268ebd616ef1af4b347b1
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Mar 5 03:45:57 2012 +0100

selfclient.client: Factor out write_clientconf.

commit f3f6b8eafa07b8d9e815e023adb8825ce89ef8da
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Mar 5 03:39:57 2012 +0100

selftest.run: Factor out expand_command_run.

commit d6924f803904d25a7f9cac2ec69f421d7a5bdeab
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Mar 5 03:27:40 2012 +0100

selftest.run: Factor out expand_command_list.

commit 1741e6486dbae821aaac8bc4bd52938e4034f870
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Mar 5 03:20:13 2012 +0100

selftest: Factor out expand_environment_strings.

---

Summary of changes:
 selftest/client.py  |   80 ++
 selftest/run.py |   79 ++
 selftest/selftest.py|  142 +++
 selftest/testlist.py|   33 +
 selftest/tests/__init__.py  |2 +-
 selftest/tests/test_run.py  |   94 ++
 selftest/tests/test_testlist.py |   46 +
 7 files changed, 357 insertions(+), 119 deletions(-)
 create mode 100644 selftest/client.py
 create mode 100644 selftest/run.py
 create mode 100644 selftest/tests/test_run.py


Changeset truncated at 500 lines:

diff --git a/selftest/client.py b/selftest/client.py
new file mode 100644
index 000..81a9889
--- /dev/null
+++ b/selftest/client.py
@@ -0,0 +1,80 @@
+#!/usr/bin/python -u
+# Bootstrap Samba and run a number of tests against it.
+# Copyright (C) 2012 Jelmer Vernooij jel...@samba.org
+
+# 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
+import shutil
+
+def write_clientconf(conffile, clientdir, vars):
+if not os.path.isdir(clientdir):
+os.mkdir(clientdir, 0777)
+
+for n in [private, lockdir, statedir, cachedir]:
+p = os.path.join(clientdir, n)
+if os.path.isdir(p):
+shutil.rmtree(p)
+os.mkdir(p, 0777)
+
+# this is ugly, but the ncalrpcdir needs exactly 0755
+# otherwise tests fail.
+mask = os.umask(0022)
+
+for n in [ncalrpcdir, ncalrpcdir/np]:
+p = os.path.join(clientdir, n)
+if os.path.isdir(p):
+shutil.rmtree(p)
+os.mkdir(p, 0777)
+os.umask(mask)
+
+settings = {
+netbios name: client,
+private dir: os.path.join(clientdir, private),
+lock dir: os.path.join(clientdir, lockdir),
+state directory: os.path.join(clientdir, statedir),
+cache directory: os.path.join(clientdir, cachedir),
+ncalrpc dir: os.path.join(clientdir, ncalrpcdir),
+name resolve order: file bcast,
+panic action: os.path.join(os.path.dirname(__file__), gdb_backtrace 
\%d),
+max xmit: 32K,
+notify:inotify: false,
+ldb:nosync: true,
+system:anonymous: true,
+client lanman auth: Yes,
+log level: 1,
+torture:basedir: clientdir,
+# We don't want to pass our self-tests if the PAC code is wrong
+gensec:require_pac: true

1 2 3 4 5 6 7 8 9 10 >

1 - 100 of 2420 matches

Mail list logo