[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  5868acc vfs_gpfs: slightly simplify connect()
      from  6c5158e s3:rpc_server/srvsvc check access before doing work

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


- Log -----------------------------------------------------------------
commit 5868accc71e15e27aef6fb74036a3f1f439200b8
Author: Volker Lendecke <vl at samba.org>
Date:   Tue May 14 15:43:10 2013 +0200

    vfs_gpfs: slightly simplify connect()
    
    DISCONNECT can be arbitrarily complex, TALLOC_FREE of a simple struct
    is easier.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Christian Ambach <ambi at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Tue May 14 18:11:29 CEST 2013 on sn-devel-104

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

Summary of changes:
 source3/modules/vfs_gpfs.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index 7f00eac..13061c8 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -1691,19 +1691,19 @@ static int vfs_gpfs_connect(struct vfs_handle_struct *handle,
 
 	smbd_gpfs_lib_init();
 
-	ret = SMB_VFS_NEXT_CONNECT(handle, service, user);
-
-	if (ret < 0) {
-		return ret;
-	}
-
 	config = talloc_zero(handle->conn, struct gpfs_config_data);
 	if (!config) {
-		SMB_VFS_NEXT_DISCONNECT(handle);
 		DEBUG(0, ("talloc_zero() failed\n"));
+		errno = ENOMEM;
 		return -1;
 	}
 
+	ret = SMB_VFS_NEXT_CONNECT(handle, service, user);
+	if (ret < 0) {
+		TALLOC_FREE(config);
+		return ret;
+	}
+
 	config->sharemodes = lp_parm_bool(SNUM(handle->conn), "gpfs",
 					"sharemodes", true);
 


-- 
Samba Shared Repository