[SCM] Samba Shared Repository - branch master updated

Volker Lendecke vlendec at samba.org
Sun Feb 19 15:15:02 MST 2012


The branch, master has been updated
       via  7af3dfd s3: Remove a pointless else branch
       via  8679dc7 s3: Fix some blank line endings
       via  810d2f5 s3-vfstest: Initialize some more
      from  61314db waf: make "update-waf" script work on Darwin too

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


- Log -----------------------------------------------------------------
commit 7af3dfd3af80e146931260d6de100a9901e440bc
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Feb 18 16:49:47 2012 +0100

    s3: Remove a pointless else branch
    
    Autobuild-User: Volker Lendecke <vl at samba.org>
    Autobuild-Date: Sun Feb 19 23:14:15 CET 2012 on sn-devel-104

commit 8679dc711f82a6ca25777c0f9806953f014b4fe0
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Feb 18 16:07:37 2012 +0100

    s3: Fix some blank line endings

commit 810d2f55c113c2b0e68a4bfd37d51d26beac415c
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Feb 19 18:48:15 2012 +0100

    s3-vfstest: Initialize some more

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/open.c       |    3 +--
 source3/torture/vfstest.c |   12 ++++++++++++
 source3/torture/vfstest.h |    6 +++---
 3 files changed, 16 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index e9637c8..356a08f 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -201,9 +201,8 @@ NTSTATUS smbd_check_access_rights(struct connection_struct *conn,
 
 	if (rejected_mask != 0) {
 		return NT_STATUS_ACCESS_DENIED;
-	} else {
-		return NT_STATUS_OK;
 	}
+	return NT_STATUS_OK;
 }
 
 static NTSTATUS check_parent_access(struct connection_struct *conn,
diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c
index 22cded8..b0d55f5 100644
--- a/source3/torture/vfstest.c
+++ b/source3/torture/vfstest.c
@@ -25,9 +25,13 @@
 
 #include "includes.h"
 #include "smbd/smbd.h"
+#include "smbd/globals.h"
 #include "popt_common.h"
 #include "vfstest.h"
 #include "../libcli/smbreadline/smbreadline.h"
+#include "auth.h"
+#include "serverid.h"
+#include "messages.h"
 
 /* List to hold groups of commands */
 static struct cmd_list {
@@ -424,6 +428,7 @@ int main(int argc, char *argv[])
 	char *filename = NULL;
 	char cwd[MAXPATHLEN];
 	TALLOC_CTX *frame = talloc_stackframe();
+	struct tevent_context *ev = tevent_context_init(NULL);
 
 	/* make sure the vars that get altered (4th field) are in
 	   a fixed location or certain compilers complain */
@@ -469,8 +474,15 @@ int main(int argc, char *argv[])
 
 	/* some basic initialization stuff */
 	sec_init();
+	init_guest_info();
+	locking_init();
+	serverid_parent_init(NULL);
 	vfs.conn = talloc_zero(NULL, connection_struct);
 	vfs.conn->params = talloc_zero(vfs.conn, struct share_params);
+	vfs.conn->sconn = talloc_zero(NULL, struct smbd_server_connection);
+	vfs.conn->sconn->msg_ctx = messaging_init(vfs.conn->sconn, ev);
+	make_session_info_guest(NULL, &vfs.conn->session_info);
+	file_init(vfs.conn->sconn);
 	set_conn_connectpath(vfs.conn, getcwd(cwd, sizeof(cwd)));
 	for (i=0; i < 1024; i++)
 		vfs.files[i] = NULL;
diff --git a/source3/torture/vfstest.h b/source3/torture/vfstest.h
index c68f9dc..0d71fac 100644
--- a/source3/torture/vfstest.h
+++ b/source3/torture/vfstest.h
@@ -1,4 +1,4 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    VFS module tester
 
@@ -12,12 +12,12 @@
    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/>.
 */


-- 
Samba Shared Repository


More information about the samba-cvs mailing list