[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 4c6bfac s3:lib/util: make sure panic action can attach a debugger on ubuntu (=10.10) via f2b795e lib/util: make sure panic action can attach a debugger on ubuntu (=10.10) via 1ff61f1 s3:param: use ROLE_DOMAIN_CONTROLLER for an AD domain controller from 6b5d8e0 s4-subdomain: create trust record with forest root DC http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 4c6bfac12a274b0bbcdb54681a817b704839222d Author: Stefan Metzmacher me...@samba.org Date: Tue Oct 4 10:47:46 2011 +0200 s3:lib/util: make sure panic action can attach a debugger on ubuntu (=10.10) By default user processes can't attach a debugger to a process. So explicitly allow that for all child processes, before calling the panic action script. metze Autobuild-User: Stefan Metzmacher me...@samba.org Autobuild-Date: Tue Oct 4 12:51:35 CEST 2011 on sn-devel-104 commit f2b795e9cf3ddb0f6bf0929bd0e423d39d6d239a Author: Stefan Metzmacher me...@samba.org Date: Tue Oct 4 10:47:46 2011 +0200 lib/util: make sure panic action can attach a debugger on ubuntu (=10.10) By default user processes can't attach a debugger to a process. So explicitly allow that for all child processes, before calling the panic action script. metze commit 1ff61f1223f36a7cfa7acfc9da500b2684e5282b Author: Stefan Metzmacher me...@samba.org Date: Tue Oct 4 09:21:23 2011 +0200 s3:param: use ROLE_DOMAIN_CONTROLLER for an AD domain controller metze --- Summary of changes: lib/util/fault.c |7 +++ source3/lib/util.c | 11 +++ source3/param/loadparm_server_role.c |2 +- 3 files changed, 19 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/util/fault.c b/lib/util/fault.c index ed7684a..7fe081d 100644 --- a/lib/util/fault.c +++ b/lib/util/fault.c @@ -116,6 +116,13 @@ static void smb_panic_default(const char *why) { int result; +#if defined(HAVE_PRCTL) defined(PR_SET_PTRACER) + /* +* Make sure all children can attach a debugger. +*/ + prctl(PR_SET_PTRACER, getpid(), 0, 0, 0); +#endif + if (panic_action *panic_action) { char pidstr[20]; char cmdstring[200]; diff --git a/source3/lib/util.c b/source3/lib/util.c index 689d41e..887d184 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -31,6 +31,10 @@ #include ccan/hash/hash.h #include libcli/security/security.h +#ifdef HAVE_SYS_PRCTL_H +#include sys/prctl.h +#endif + /* Max allowable allococation - 256mb - 0x1000 */ #define MAX_ALLOC_SIZE (1024*1024*256) @@ -778,6 +782,13 @@ void smb_panic_s3(const char *why) (unsigned long long)sys_getpid(), why)); log_stack_trace(); +#if defined(HAVE_PRCTL) defined(PR_SET_PTRACER) + /* +* Make sure all children can attach a debugger. +*/ + prctl(PR_SET_PTRACER, getpid(), 0, 0, 0); +#endif + cmd = lp_panic_action(); if (cmd *cmd) { DEBUG(0, (smb_panic(): calling panic action [%s]\n, cmd)); diff --git a/source3/param/loadparm_server_role.c b/source3/param/loadparm_server_role.c index 3cc8f35..1f18b4f 100644 --- a/source3/param/loadparm_server_role.c +++ b/source3/param/loadparm_server_role.c @@ -79,7 +79,7 @@ void set_server_role(void) break; case SEC_ADS: if (lp_domain_logons()) { - server_role = ROLE_DOMAIN_PDC; + server_role = ROLE_DOMAIN_CONTROLLER; break; } server_role = ROLE_DOMAIN_MEMBER; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via e30e7a6 s3-waf: remove explicit linking to SMBLDAP subsystem. via ea50207 s3-smbldap: remove an obsolete prototype. from 4c6bfac s3:lib/util: make sure panic action can attach a debugger on ubuntu (=10.10) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit e30e7a6ec02700234f73671c113743e1572efa01 Author: Günther Deschner g...@samba.org Date: Tue Oct 4 12:53:38 2011 +0200 s3-waf: remove explicit linking to SMBLDAP subsystem. Guenther Autobuild-User: Günther Deschner g...@samba.org Autobuild-Date: Tue Oct 4 14:39:57 CEST 2011 on sn-devel-104 commit ea50207230ea221deadbcf6ad6ca2a8525c27254 Author: Günther Deschner g...@samba.org Date: Tue Oct 4 12:53:09 2011 +0200 s3-smbldap: remove an obsolete prototype. Guenther --- Summary of changes: source3/include/smbldap.h |1 - source3/wscript_build | 18 +- 2 files changed, 9 insertions(+), 10 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/smbldap.h b/source3/include/smbldap.h index 7bb9895..4ae8476 100644 --- a/source3/include/smbldap.h +++ b/source3/include/smbldap.h @@ -219,7 +219,6 @@ struct ldapsam_privates { /* Functions shared between pdb_ldap.c and pdb_nds.c. */ struct pdb_methods; NTSTATUS pdb_init_ldapsam_compat( struct pdb_methods **pdb_method, const char *location); -void private_data_free_fn(void **result); int ldapsam_search_suffix_by_name(struct ldapsam_privates *ldap_state, const char *user, LDAPMessage ** result, diff --git a/source3/wscript_build b/source3/wscript_build index f80e115..d105f1f 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -665,7 +665,7 @@ if not bld.env.toplevel_build: bld.SAMBA3_LIBRARY('netapi', source=LIBNETAPI_SRC, public_deps='''talloc tdb_compat cap wbclient smbd_shim libsmb KRBCLIENT -pdb SMBLDAP param samba-util +pdb param samba-util LIBMSRPC_GEN msrpc3 ads LIBNET DCUTIL NDR_LIBNETAPI RPC_CLIENT_SCHANNEL smbconf REG_SMBCONF LIBCLI_SAMR libcli_lsa3 LIBRPCCLI_NETLOGON @@ -678,7 +678,7 @@ bld.SAMBA3_LIBRARY('netapi', bld.SAMBA3_LIBRARY('smbclient', source=LIBSMBCLIENT_SRC, -public_deps='''talloc tdb_compat wbclient cap param smbd_shim libsmb KRBCLIENT pdb SMBLDAP +public_deps='''talloc tdb_compat wbclient cap param smbd_shim libsmb KRBCLIENT pdb LIBMSRPC_GEN msrpc3 libcli_lsa3 RPC_NDR_SRVSVC popt_samba3''', public_headers='include/libsmbclient.h', vnum='0', @@ -1233,21 +1233,21 @@ bld.SAMBA3_BINARY('smbcontrol', bld.SAMBA3_BINARY('smbtree', source=SMBTREE_SRC, deps='''talloc tdb_compat tevent cap wbclient param smbd_shim - libsmb LIBSMB_ERR popt_samba3 KRBCLIENT pdb SMBLDAP LIBMSRPC_GEN msrpc3 PROFILE + libsmb LIBSMB_ERR popt_samba3 KRBCLIENT pdb LIBMSRPC_GEN msrpc3 PROFILE RPC_NDR_SRVSVC''', vars=locals()) bld.SAMBA3_BINARY('smbpasswd', source=SMBPASSWD_SRC, deps='''talloc tdb_compat tevent cap wbclient param smbd_shim - libsmb LIBSMB_ERR popt_samba3 KRBCLIENT pdb SMBLDAP LIBMSRPC_GEN msrpc3 PASSWD_UTIL + libsmb LIBSMB_ERR popt_samba3 KRBCLIENT pdb LIBMSRPC_GEN msrpc3 PASSWD_UTIL LIBCLI_SAMR INIT_LSA PASSCHANGE''', vars=locals()) bld.SAMBA3_BINARY('pdbedit', source=PDBEDIT_SRC, deps='''talloc tdb_compat tevent cap wbclient param smbd_shim - LIBNTLMSSP LIBSMB_ERR popt_samba3 pdb SMBLDAP + LIBNTLMSSP LIBSMB_ERR popt_samba3 pdb PASSWD_UTIL cli-ldap-common''', vars=locals()) @@ -1291,14 +1291,14 @@ bld.SAMBA3_BINARY('msgtest', bld.SAMBA3_BINARY('smbcacls', source=SMBCACLS_SRC, deps='''talloc tdb_compat cap wbclient param libsmb KRBCLIENT - smbd_shim pdb popt_samba3 SMBLDAP LIBMSRPC_GEN + smbd_shim pdb popt_samba3 LIBMSRPC_GEN msrpc3 libcli_lsa3''', vars=locals()) bld.SAMBA3_BINARY('smbcquotas', source=SMBCQUOTAS_SRC, deps='''talloc tdb_compat cap wbclient param smbd_shim libsmb KRBCLIENT - popt_samba3 pdb SMBLDAP LIBMSRPC_GEN msrpc3 + popt_samba3 pdb LIBMSRPC_GEN msrpc3 libcli_lsa3''', vars=locals()) @@ -1322,7
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2011-10-04-1732/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2011-10-04-1732/samba3.stderr http://git.samba.org/autobuild.flakey/2011-10-04-1732/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2011-10-04-1732/samba4.stderr http://git.samba.org/autobuild.flakey/2011-10-04-1732/samba4.stdout The top commit at the time of the failure was: commit e30e7a6ec02700234f73671c113743e1572efa01 Author: Günther Deschner g...@samba.org Date: Tue Oct 4 12:53:38 2011 +0200 s3-waf: remove explicit linking to SMBLDAP subsystem. Guenther Autobuild-User: Günther Deschner g...@samba.org Autobuild-Date: Tue Oct 4 14:39:57 CEST 2011 on sn-devel-104
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2011-10-04-2051/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2011-10-04-2051/samba3.stderr http://git.samba.org/autobuild.flakey/2011-10-04-2051/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2011-10-04-2051/samba4.stderr http://git.samba.org/autobuild.flakey/2011-10-04-2051/samba4.stdout The top commit at the time of the failure was: commit e30e7a6ec02700234f73671c113743e1572efa01 Author: Günther Deschner g...@samba.org Date: Tue Oct 4 12:53:38 2011 +0200 s3-waf: remove explicit linking to SMBLDAP subsystem. Guenther Autobuild-User: Günther Deschner g...@samba.org Autobuild-Date: Tue Oct 4 14:39:57 CEST 2011 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via f93fd12 Fix bug #8507 - smbd doesn't correctly honor the force create mode bits from a cifsfs create. from e30e7a6 s3-waf: remove explicit linking to SMBLDAP subsystem. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit f93fd128eb623e324459806a34052bd40afe82e5 Author: Jeremy Allison j...@samba.org Date: Tue Oct 4 14:46:00 2011 -0700 Fix bug #8507 - smbd doesn't correctly honor the force create mode bits from a cifsfs create. Don't manipulate the new_dos_attributes bits until we know it's not a POSIX open. Autobuild-User: Jeremy Allison j...@samba.org Autobuild-Date: Wed Oct 5 01:19:17 CEST 2011 on sn-devel-104 --- Summary of changes: source3/smbd/open.c | 12 ++-- 1 files changed, 6 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 61d1a2e..a44f15f 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -1541,12 +1541,6 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn, ZERO_STRUCT(id); - /* Windows allows a new file to be created and - silently removes a FILE_ATTRIBUTE_DIRECTORY - sent by the client. Do the same. */ - - new_dos_attributes = ~FILE_ATTRIBUTE_DIRECTORY; - if (conn-printer) { /* * Printers are handled completely differently. @@ -1580,6 +1574,12 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn, unx_mode = (mode_t)(new_dos_attributes ~FILE_FLAG_POSIX_SEMANTICS); new_dos_attributes = 0; } else { + /* Windows allows a new file to be created and + silently removes a FILE_ATTRIBUTE_DIRECTORY + sent by the client. Do the same. */ + + new_dos_attributes = ~FILE_ATTRIBUTE_DIRECTORY; + /* We add FILE_ATTRIBUTE_ARCHIVE to this as this mode is only used if the file is * created new. */ unx_mode = unix_mode(conn, new_dos_attributes | FILE_ATTRIBUTE_ARCHIVE, -- Samba Shared Repository
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 0c5ef6c update location of upstream waf tree from 434956b use --enabled-shared in python install script http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 0c5ef6c5542f5573180078503abd70a1cef57184 Author: Andrew Tridgell tri...@samba.org Date: Wed Oct 5 13:30:35 2011 +1100 update location of upstream waf tree --- Summary of changes: common.fns|3 +-- import-and-analyse.py |3 +-- web/trees.conf|4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/common.fns b/common.fns index 0768d87..87fe12d 100644 --- a/common.fns +++ b/common.fns @@ -11,5 +11,4 @@ test_tree ccache-maint . $compiler test_tree talloc . $compiler test_tree tdb . $compiler test_tree ldb . $compiler -test_tree waf-svn demos $compiler - +test_tree waf demos $compiler diff --git a/import-and-analyse.py b/import-and-analyse.py index c7ef5cb..2318cc1 100755 --- a/import-and-analyse.py +++ b/import-and-analyse.py @@ -38,9 +38,8 @@ smtp.connect() def check_and_send_mails(cur, old): -if cur.tree is waf-svn: +if cur.tree is waf: # no point sending emails, as the email addresses are invalid -# from git svn return if cur.tree is samba_3_waf: diff --git a/web/trees.conf b/web/trees.conf index 9ab398a..3b497d1 100644 --- a/web/trees.conf +++ b/web/trees.conf @@ -83,7 +83,7 @@ scm = git repo = rsync.git branch = master -[waf-svn] +[waf] scm = git -repo = waf-svn.git +repo = waf.git branch = master -- build.samba.org