[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  664bc88... s3-winbind: In _wbint_CheckMachineAccount, there is only one child domain ever
       via  e8ef799... s3: Move a variable declaration to its only use
      from  401ba9c... s4:dsdb Move module configuration from each ldb into samba_dsdb.c

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


- Log -----------------------------------------------------------------
commit 664bc885d9a7b1be5a9aacc2681ca8774d3324eb
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Nov 23 13:58:23 2009 +0100

    s3-winbind: In _wbint_CheckMachineAccount, there is only one child domain ever

commit e8ef799c4b6d8da0104b52ebbbf9d96d2b3a8fe7
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Nov 23 11:54:19 2009 +0100

    s3: Move a variable declaration to its only use

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

Summary of changes:
 source3/smbd/open.c                  |    2 +-
 source3/winbindd/winbindd_dual_srv.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index e9e632a..f8e1927 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1470,7 +1470,6 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
 	struct share_mode_lock *lck = NULL;
 	uint32 open_access_mask = access_mask;
 	NTSTATUS status;
-	int ret_flock;
 	char *parent_dir;
 
 	ZERO_STRUCT(id);
@@ -2092,6 +2091,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
 	   note that GPFS supports it as well - jmcd */
 
 	if (fsp->fh->fd != -1) {
+		int ret_flock;
 		ret_flock = SMB_VFS_KERNEL_FLOCK(fsp, share_access, access_mask);
 		if(ret_flock == -1 ){
 
diff --git a/source3/winbindd/winbindd_dual_srv.c b/source3/winbindd/winbindd_dual_srv.c
index f0bbee9..49463d6 100644
--- a/source3/winbindd/winbindd_dual_srv.c
+++ b/source3/winbindd/winbindd_dual_srv.c
@@ -404,12 +404,12 @@ NTSTATUS _wbint_CheckMachineAccount(pipes_struct *p,
 	int num_retries = 0;
 	NTSTATUS status;
 
-again:
 	domain = wb_child_domain();
 	if (domain == NULL) {
 		return NT_STATUS_REQUEST_NOT_ACCEPTED;
 	}
 
+again:
 	invalidate_cm_connection(&domain->conn);
 
 	{


-- 
Samba Shared Repository