The branch, master has been updated via f0cdcd9 web_server: Build as module. via f5fbba7 kcc/drepl: Build as service. via f6c8bc6 winbind: Build as shared module. via bee3b66 Build wrepl server as service by default. via 6d1d146 Add myself as maintainer for pytevent, pytalloc, pytdb and pyldb. via 6e762f9 Re-enable ldb-cmdline for the moment, as it is used by oLschema2ldif. via d2dfa86 Don't build ldb tools when there is a system provided ldb. from c52e6db s3: string_to_sid does thorough syntax checking
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit f0cdcd940e20bf049ccb19ca68a101a29d2ee8d1 Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Nov 14 17:36:51 2010 +0100 web_server: Build as module. Autobuild-User: Jelmer Vernooij <jel...@samba.org> Autobuild-Date: Sun Nov 14 17:58:05 UTC 2010 on sn-devel-104 commit f5fbba76c8743d6c4f25b9850e2c2c4353730cdf Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Nov 14 17:31:26 2010 +0100 kcc/drepl: Build as service. commit f6c8bc6a7bfac1cb13fdf2a4dc76c3d1234de73f Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Nov 14 17:26:29 2010 +0100 winbind: Build as shared module. commit bee3b665a882b03ae6c65de6b9440e1b00994080 Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Nov 14 17:09:34 2010 +0100 Build wrepl server as service by default. commit 6d1d146e8987f515f97b1fa1ef6f726f2c60a884 Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Nov 14 14:49:03 2010 +0100 Add myself as maintainer for pytevent, pytalloc, pytdb and pyldb. commit 6e762f90030b214a24bfae5cf048fad9893f53c8 Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Nov 14 14:32:13 2010 +0100 Re-enable ldb-cmdline for the moment, as it is used by oLschema2ldif. commit d2dfa868fd7e77879ff40b7bbe3b52a0ceece277 Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Nov 14 13:40:58 2010 +0100 Don't build ldb tools when there is a system provided ldb. ----------------------------------------------------------------------- Summary of changes: MAINTAINERS.txt | 9 ++++++++- source4/dsdb/wscript_build | 12 +++++++----- source4/kdc/wscript_build | 2 +- source4/lib/ldb/wscript | 18 +++++++++--------- source4/ntp_signd/wscript_build | 3 ++- source4/web_server/web_server.h | 11 +++++++++-- source4/web_server/wscript_build | 3 +-- source4/web_server/wsgi.c | 8 ++++---- source4/winbind/wscript_build | 5 +++-- source4/wrepl_server/wscript_build | 3 ++- 10 files changed, 46 insertions(+), 28 deletions(-) Changeset truncated at 500 lines: diff --git a/MAINTAINERS.txt b/MAINTAINERS.txt index cab674e..08e7626 100644 --- a/MAINTAINERS.txt +++ b/MAINTAINERS.txt @@ -38,8 +38,15 @@ policy: and review by all maintainers. +files: lib/tevent/py*, lib/talloc/py*, source4/lib/ldb/py*, lib/tdb/py* +maintainers: + Jelmer Vernooij <jel...@samba.org> +policy: + Larger commits require pre-push review by the maintainer or + one of the maintainers of the containing subsystem. - + Other non-trivial (typo, etc) commits require pre- or post-push review by the + maintainer or one of the maintainers of the containing subsystem. ======================================================================= diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build index 199555b..3a09fc4 100644 --- a/source4/dsdb/wscript_build +++ b/source4/dsdb/wscript_build @@ -26,25 +26,27 @@ bld.SAMBA_SUBSYSTEM('SAMDB_SCHEMA', ) -bld.SAMBA_MODULE('DREPL_SRV', +bld.SAMBA_MODULE('service_drepl', source='repl/drepl_service.c repl/drepl_periodic.c repl/drepl_partitions.c repl/drepl_out_pull.c repl/drepl_out_helpers.c repl/drepl_notify.c repl/drepl_ridalloc.c repl/drepl_extended.c repl/drepl_fsmo.c repl/drepl_secret.c repl/drepl_replica.c', autoproto='repl/drepl_service_proto.h', subsystem='service', init_function='server_service_drepl_init', - deps='samdb process_model RPC_NDR_DRSUAPI' + deps='samdb process_model RPC_NDR_DRSUAPI', + internal_module=False, ) -bld.SAMBA_MODULE('KCC_SRV', +bld.SAMBA_MODULE('service_kcc', source='kcc/kcc_service.c kcc/kcc_connection.c kcc/kcc_topology.c kcc/kcc_deleted.c kcc/kcc_periodic.c kcc/kcc_drs_replica_info.c', autoproto='kcc/kcc_service_proto.h', subsystem='service', init_function='server_service_kcc_init', - deps='samdb process_model RPC_NDR_IRPC RPC_NDR_DRSUAPI' + deps='samdb process_model RPC_NDR_IRPC RPC_NDR_DRSUAPI', + internal_module=False, ) -bld.SAMBA_MODULE('dns_update_srv', +bld.SAMBA_MODULE('service_dns_update', source='dns/dns_update.c', subsystem='service', init_function='server_service_dnsupdate_init', diff --git a/source4/kdc/wscript_build b/source4/kdc/wscript_build index 9028683..9e2c50e 100644 --- a/source4/kdc/wscript_build +++ b/source4/kdc/wscript_build @@ -1,6 +1,6 @@ #!/usr/bin/env python -bld.SAMBA_MODULE('KDC', +bld.SAMBA_MODULE('service_kdc', source='kdc.c kpasswdd.c proxy.c', subsystem='service', init_function='server_service_kdc_init', diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index 28373b5..5c4054a 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -208,20 +208,20 @@ def build(bld): includes='include', cflags='-DLDB_MODULESDIR=\"%s\"' % modules_dir) + LDB_TOOLS='ldbadd ldbsearch ldbdel ldbmodify ldbedit ldbrename' + for t in LDB_TOOLS.split(): + bld.SAMBA_BINARY(t, 'tools/%s.c' % t, deps='ldb-cmdline ldb', + manpages='man/%s.1' % t) + + # ldbtest doesn't get installed + bld.SAMBA_BINARY('ldbtest', 'tools/ldbtest.c', deps='ldb-cmdline ldb', + install=False) + bld.SAMBA_LIBRARY('ldb-cmdline', source='tools/ldbutil.c tools/cmdline.c', deps='ldb dl popt', private_library=True) - LDB_TOOLS='ldbadd ldbsearch ldbdel ldbmodify ldbedit ldbrename' - for t in LDB_TOOLS.split(): - bld.SAMBA_BINARY(t, 'tools/%s.c' % t, deps='ldb-cmdline ldb', - manpages='man/%s.1' % t) - - # ldbtest doesn't get installed - bld.SAMBA_BINARY('ldbtest', 'tools/ldbtest.c', deps='ldb-cmdline ldb', - install=False) - def test(ctx): '''run ldb testsuite''' diff --git a/source4/ntp_signd/wscript_build b/source4/ntp_signd/wscript_build index f320b4a..1b82bc6 100644 --- a/source4/ntp_signd/wscript_build +++ b/source4/ntp_signd/wscript_build @@ -4,6 +4,7 @@ bld.SAMBA_MODULE('NTP_SIGND', source='ntp_signd.c', subsystem='service', init_function='server_service_ntp_signd_init', - deps='samdb NDR_NTP_SIGND LIBTSOCKET LIBSAMBA_TSOCKET' + deps='samdb NDR_NTP_SIGND LIBTSOCKET LIBSAMBA_TSOCKET', + internal_module=False, ) diff --git a/source4/web_server/web_server.h b/source4/web_server/web_server.h index 3b02fea..aa4d83c 100644 --- a/source4/web_server/web_server.h +++ b/source4/web_server/web_server.h @@ -17,6 +17,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifndef __WEB_SERVER_H__ +#define __WEB_SERVER_H__ + #include "smbd/process_model.h" struct websrv_context; @@ -60,6 +63,10 @@ struct websrv_context { struct session_data *session; }; +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); +NTSTATUS http_parse_header(struct websrv_context *web, const char *line); -#include "web_server/proto.h" - +#endif /* __WEB_SERVER_H__ */ diff --git a/source4/web_server/wscript_build b/source4/web_server/wscript_build index e586355..de12ece 100644 --- a/source4/web_server/wscript_build +++ b/source4/web_server/wscript_build @@ -10,10 +10,9 @@ bld.SAMBA_SUBSYSTEM('WEB_WSGI', bld.SAMBA_MODULE('WEB', source='web_server.c', - autoproto='proto.h', - autoproto_extra_source='wsgi.c', subsystem='service', init_function='server_service_web_init', deps='LIBTLS process_model LIBPYTHON WEB_WSGI', pyembed=True, + internal_module=False, ) diff --git a/source4/web_server/wsgi.c b/source4/web_server/wsgi.c index bc55850..e1e2118 100644 --- a/source4/web_server/wsgi.c +++ b/source4/web_server/wsgi.c @@ -5,17 +5,17 @@ Implementation of the WSGI interface described in PEP0333 (http://www.python.org/dev/peps/pep-0333) - + 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/>. */ @@ -189,7 +189,7 @@ static PyObject *py_input_read(PyObject *_self, PyObject *args, PyObject *kwargs ret = PyString_FromStringAndSize((char *)self->web->input.partial.data+self->offset, size); self->offset += size; - + return ret; } diff --git a/source4/winbind/wscript_build b/source4/winbind/wscript_build index 8ef1fd3..5ba9c2a 100644 --- a/source4/winbind/wscript_build +++ b/source4/winbind/wscript_build @@ -1,12 +1,13 @@ #!/usr/bin/env python -bld.SAMBA_MODULE('WINBIND', +bld.SAMBA_MODULE('service_winbind', source='wb_server.c wb_irpc.c wb_samba3_protocol.c wb_samba3_cmd.c wb_init_domain.c wb_dom_info.c wb_dom_info_trusted.c wb_sid2domain.c wb_name2domain.c wb_sids2xids.c wb_xids2sids.c wb_gid2sid.c wb_sid2uid.c wb_sid2gid.c wb_uid2sid.c wb_connect_lsa.c wb_connect_sam.c wb_cmd_lookupname.c wb_cmd_lookupsid.c wb_cmd_getdcname.c wb_cmd_getgrnam.c wb_cmd_getgrgid.c wb_cmd_getpwnam.c wb_cmd_getpwuid.c wb_cmd_userdomgroups.c wb_cmd_usersids.c wb_cmd_list_groups.c wb_cmd_list_trustdom.c wb_cmd_list_users.c wb_cmd_setpwent.c wb_cmd_getpwent.c wb_cmd_getgrent.c wb_cmd_setgrent.c wb_cmd_getgroups.c wb_pam_auth.c wb_sam_logon.c wb_update_rodc_dns.c', autoproto='wb_proto.h', subsystem='service', init_function='server_service_winbind_init', - deps='WB_HELPER IDMAP NDR_WINBIND process_model RPC_NDR_LSA dcerpc-samr PAM_ERRORS cli-ldap samba-net LIBSAMBA_TSOCKET' + deps='WB_HELPER IDMAP NDR_WINBIND process_model RPC_NDR_LSA dcerpc-samr PAM_ERRORS cli-ldap samba-net LIBSAMBA_TSOCKET', + internal_module=False, ) diff --git a/source4/wrepl_server/wscript_build b/source4/wrepl_server/wscript_build index 55e0b55..79b1a8c 100644 --- a/source4/wrepl_server/wscript_build +++ b/source4/wrepl_server/wscript_build @@ -1,10 +1,11 @@ #!/usr/bin/env python -bld.SAMBA_MODULE('WREPL_SRV', +bld.SAMBA_MODULE('service_wrepl', source='wrepl_server.c wrepl_in_connection.c wrepl_in_call.c wrepl_apply_records.c wrepl_periodic.c wrepl_scavenging.c wrepl_out_pull.c wrepl_out_push.c wrepl_out_helpers.c', autoproto='wrepl_server_proto.h', subsystem='service', init_function='server_service_wrepl_init', + internal_module=False, deps='LIBCLI_WREPL WINSDB process_model RPC_NDR_IRPC' ) -- Samba Shared Repository