[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Fri Sep 28 01:58:02 UTC 2018
The branch, master has been updated
via 9c0a9c6 s4/web_server: fix panic from wrong type extracted from conn
via f08ba3a add new gitlab CI job for building pure python3
via de1e6d7 script: add new autobuild task for building pure python3
via 47634a2 PY3: We support python3 now, remove error when python3 detected
via 6400c8c buildtools/wafsamba: Finally fix reference to basestring PY3 error.
from 8c754b4 dlz_bind9: torture tests exploring rndc reload behaviour
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 9c0a9c697f2ebce25de693573c0124addd5755fd
Author: Noel Power <noel.power at suse.com>
Date: Wed Sep 19 10:20:02 2018 +0200
s4/web_server: fix panic from wrong type extracted from conn
enabling
server services = +web
and we get a panic
web_server.c:251: Type mismatch: name[struct web_server_data] expected[struct task_server]
smb_panic_default: PANIC (pid 29137): ../source4/web_server/web_server.c:251: Type mismatch: name[struct web_server_data] expected[struct task_server]
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Fri Sep 28 03:57:47 CEST 2018 on sn-devel-144
commit f08ba3a4a3f0df8653d025372972f237fa0ade13
Author: Noel Power <noel.power at suse.com>
Date: Thu Sep 27 10:22:44 2018 +0100
add new gitlab CI job for building pure python3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit de1e6d7856130112cf7b877cb610c917d70afe0f
Author: Noel Power <noel.power at suse.com>
Date: Thu Sep 27 10:22:07 2018 +0100
script: add new autobuild task for building pure python3
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 47634a25a03b44a5212f9552fb72115f1c1436d0
Author: Noel Power <noel.power at suse.com>
Date: Tue Jul 31 18:00:36 2018 +0100
PY3: We support python3 now, remove error when python3 detected
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 6400c8c695cc7db8cc680b87932c68fced086a50
Author: Noel Power <noel.power at suse.com>
Date: Thu Sep 27 11:39:44 2018 +0100
buildtools/wafsamba: Finally fix reference to basestring PY3 error.
While a previous attempt squashed the error on the config & make
phase, make install threw up this error again.
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci.yml | 4 ++++
buildtools/wafsamba/samba_version.py | 7 +++++--
script/autobuild.py | 8 ++++++++
source4/web_server/web_server.c | 3 +--
wscript | 3 ---
5 files changed, 18 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90dd321..010608b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -102,3 +102,7 @@ build_others:
- python script/autobuild.py tdb --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
- python script/autobuild.py tevent --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+build_samba_buildpy3_only:
+ <<: *shared_template
+ script:
+ - python3 script/autobuild.py samba-buildpy3-only --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
diff --git a/buildtools/wafsamba/samba_version.py b/buildtools/wafsamba/samba_version.py
index 6a8ffb6..670001e 100644
--- a/buildtools/wafsamba/samba_version.py
+++ b/buildtools/wafsamba/samba_version.py
@@ -1,4 +1,4 @@
-import os
+import os, sys
from waflib import Utils, Context
import samba_utils
from samba_git import find_git
@@ -198,7 +198,10 @@ also accepted as dictionary entries here
for name in sorted(self.vcs_fields.keys()):
string+="#define SAMBA_VERSION_%s " % name
value = self.vcs_fields[name]
- if isinstance(value, str) or isinstance(value, basestring):
+ string_types = str
+ if sys.version_info[0] < 3:
+ string_types = basestring
+ if isinstance(value, string_types):
string += "\"%s\"" % value
elif type(value) is int:
string += "%d" % value
diff --git a/script/autobuild.py b/script/autobuild.py
index 1dbdf8c..e53f49e 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -54,6 +54,7 @@ builddirs = {
"samba-ad-dc-2-py3": ".",
"samba-systemkrb5": ".",
"samba-nopython": ".",
+ "samba-buildpy3-only": ".",
"ldb": "lib/ldb",
"tdb": "lib/tdb",
"talloc": "lib/talloc",
@@ -399,6 +400,13 @@ tasks = {
("check-clean-tree", "../script/clean-source-tree.sh", "text/plain"),
("clean", "make clean", "text/plain")],
+ "samba-buildpy3-only": [("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ ("configure", "PYTHON='python3' ./configure.developer --with-selftest-prefix=./bin/ab " + samba_configure_params, "text/plain"),
+ ("make", "PYTHON='python3' make -j", "text/plain"),
+ ("install", "PYTHON='python3' make install", "text/plain"),
+ ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
+ ("clean", "PYTHON='python3' make clean", "text/plain")],
+
# these are useful for debugging autobuild
'pass': [("pass", 'echo passing && /bin/true', "text/plain")],
'fail': [("fail", 'echo failing && /bin/false', "text/plain")]
diff --git a/source4/web_server/web_server.c b/source4/web_server/web_server.c
index c351689..9c4da2c 100644
--- a/source4/web_server/web_server.c
+++ b/source4/web_server/web_server.c
@@ -248,8 +248,7 @@ static void websrv_send(struct stream_connection *conn, uint16_t flags)
*/
static void websrv_accept(struct stream_connection *conn)
{
- struct task_server *task = talloc_get_type_abort(conn->private_data, struct task_server);
- struct web_server_data *wdata = talloc_get_type_abort(task->private_data, struct web_server_data);
+ struct web_server_data *wdata = talloc_get_type_abort(conn->private_data, struct web_server_data);
struct websrv_context *web;
struct socket_context *tls_socket;
diff --git a/wscript b/wscript
index ae1b929..c5d8e5b 100644
--- a/wscript
+++ b/wscript
@@ -157,9 +157,6 @@ def configure(conf):
if sys.platform == 'darwin':
conf.ADD_LDFLAGS('-framework CoreFoundation')
- if int(conf.env['PYTHON_VERSION'][0]) >= 3:
- raise Errors.WafError('Python version 3.x is not supported by Samba yet')
-
conf.RECURSE('dynconfig')
conf.RECURSE('selftest')
--
Samba Shared Repository
More information about the samba-cvs
mailing list