[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1314-g71de494

[Volker Lendecke]

The branch, v3-2-test has been updated
       via  71de4946cf00cf8b7bb2f2d92832166bee12e84a (commit)
       via  616bc34744487450edd47e212a29c0f57eabb722 (commit)
       via  24e719a1d432d5de022ab903457df0dd67c24b85 (commit)
      from  883f7415769ad1e714f636e9d6fbd1f075e69d1e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 71de4946cf00cf8b7bb2f2d92832166bee12e84a
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Jan 12 23:06:33 2008 +0100

    Don't early delete the share mode tdb data
    
    We now refer directly to the file name in the tdb data, so don't delete it.

commit 616bc34744487450edd47e212a29c0f57eabb722
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Jan 12 23:05:23 2008 +0100

    Trivial simplification

commit 24e719a1d432d5de022ab903457df0dd67c24b85
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Jan 12 19:12:30 2008 +0100

    Remove an unused variable

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

Summary of changes:
 source/locking/locking.c |    8 +-------
 source/smbd/aio.c        |    1 -
 2 files changed, 1 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/locking/locking.c b/source/locking/locking.c
index 113b994..513bb31 100644
--- a/source/locking/locking.c
+++ b/source/locking/locking.c
@@ -836,8 +836,6 @@ struct share_mode_lock *fetch_share_mode_unlocked(TALLOC_CTX *mem_ctx,
 		return NULL;
 	}
 
-	TALLOC_FREE(data.dptr);
-
 	return lck;
 }
 
@@ -1281,11 +1279,7 @@ static UNIX_USER_TOKEN *copy_unix_token(TALLOC_CTX *ctx, UNIX_USER_TOKEN *tok)
 
 void set_delete_on_close_token(struct share_mode_lock *lck, UNIX_USER_TOKEN *tok)
 {
-	/* Ensure there's no token. */
-	if (lck->delete_token) {
-		TALLOC_FREE(lck->delete_token); /* Also deletes groups... */
-		lck->delete_token = NULL;
-	}
+	TALLOC_FREE(lck->delete_token); /* Also deletes groups... */
 
 	/* Copy the new token (can be NULL). */
 	lck->delete_token = copy_unix_token(lck, tok);
diff --git a/source/smbd/aio.c b/source/smbd/aio.c
index c8175f7..9c25f69 100644
--- a/source/smbd/aio.c
+++ b/source/smbd/aio.c
@@ -451,7 +451,6 @@ static int handle_aio_write_complete(struct aio_extra *aio_ex)
 	int ret = 0;
 	files_struct *fsp = aio_ex->fsp;
 	char *outbuf = aio_ex->outbuf;
-	const char *inbuf = aio_ex->inbuf;
 	ssize_t numtowrite = aio_ex->acb.aio_nbytes;
 	ssize_t nwritten = SMB_VFS_AIO_RETURN(fsp,&aio_ex->acb);
 


-- 
Samba Shared Repository