The branch, v3-6-test has been updated via d1658ab Fix a typo - should be '&&' not '&' when checking for privileges. via e4fc77b s3:smbd: remove some commented out legacy code from 695f070 s3-waf: convert RPC_LSARPC into a subsystem.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log ----------------------------------------------------------------- commit d1658ab71fe710853ca0ca035d037522dc7ebccb Author: Jeremy Allison <j...@samba.org> Date: Wed Dec 1 17:29:05 2010 -0800 Fix a typo - should be '&&' not '&' when checking for privileges. Jeremy. (cherry picked from commit c8395ac6cfe3ee66c8fa8ad47f48353ae14ba8c4) commit e4fc77ba66e41508509001903040f55b004ef74b Author: Michael Adam <ob...@samba.org> Date: Thu Oct 28 13:58:31 2010 +0200 s3:smbd: remove some commented out legacy code Autobuild-User: Michael Adam <ob...@samba.org> Autobuild-Date: Thu Dec 2 01:18:19 CET 2010 on sn-devel-104 (cherry picked from commit 813fe0bc4d21678627fcf4f0249bb51ab5c0498a) ----------------------------------------------------------------------- Summary of changes: source3/smbd/open.c | 2 +- source3/smbd/server.c | 5 ----- 2 files changed, 1 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 85513bd..80756d6 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -2489,7 +2489,7 @@ static NTSTATUS open_directory(connection_struct *conn, return status; } - if ((access_mask & SEC_FLAG_SYSTEM_SECURITY) & + if ((access_mask & SEC_FLAG_SYSTEM_SECURITY) && !security_token_has_privilege(get_current_nttok(conn), SEC_PRIV_SECURITY)) { DEBUG(10, ("open_directory: open on %s " diff --git a/source3/smbd/server.c b/source3/smbd/server.c index c30b344..3790342 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -1155,11 +1155,6 @@ extern void build_options(bool screen); if (!print_backend_init(smbd_messaging_context())) exit(1); -#if 0 - if (!init_svcctl_db()) - exit(1); -#endif - /* Open the share_info.tdb here, so we don't have to open after the fork on every single connection. This is a small performance improvment and reduces the total number of system -- Samba Shared Repository