[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1452-ge1f5a8f

[Alexander Bokovoy]

The branch, v3-2-test has been updated
       via  e1f5a8f10795831d3c7902d9803c9571c8ac811a (commit)
       via  4256f8e093e81fbc2c1afd8f823725ae286945ce (commit)
       via  b01f34141509c90b12003786957790866c286cba (commit)
       via  a40f68eac1d421c96fc3e10e5a7494dc2c5a124e (commit)
       via  5c2d4c76d8b56be92edcee026f2289b8b46a4c27 (commit)
       via  0afd2153c7649e89d595cb7eff0f7b3c0b56ea15 (commit)
      from  df3c4648399f8d62ff6fe0013be8b89abc18f0f0 (commit)

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


- Log -----------------------------------------------------------------
commit e1f5a8f10795831d3c7902d9803c9571c8ac811a
Author: Alexander Bokovoy <ab at samba.org>
Date:   Thu Jan 17 07:34:33 2008 +0300

    Fix more VFS API mixup with offline files
    
    I'm sorry for this mess. :-(

commit 4256f8e093e81fbc2c1afd8f823725ae286945ce
Merge: b01f34141509c90b12003786957790866c286cba df3c4648399f8d62ff6fe0013be8b89abc18f0f0
Author: Alexander Bokovoy <ab at samba.org>
Date:   Thu Jan 17 07:26:12 2008 +0300

    Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test

commit b01f34141509c90b12003786957790866c286cba
Merge: a40f68eac1d421c96fc3e10e5a7494dc2c5a124e 5838a9f556f151dc7c1773dcdc598b8ba79fca44
Author: Alexander Bokovoy <ab at samba.org>
Date:   Wed Jan 16 23:24:44 2008 +0300

    Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test

commit a40f68eac1d421c96fc3e10e5a7494dc2c5a124e
Merge: 5c2d4c76d8b56be92edcee026f2289b8b46a4c27 a861ff20917eeca303e2d36de71cd8614e937d5f
Author: Alexander Bokovoy <ab at altlinux.org>
Date:   Mon Jan 14 22:36:47 2008 +0300

    Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test

commit 5c2d4c76d8b56be92edcee026f2289b8b46a4c27
Merge: 0afd2153c7649e89d595cb7eff0f7b3c0b56ea15 3f081ebeadf30a7943723703ecae479e0412c60c
Author: Alexander Bokovoy <ab at altlinux.org>
Date:   Mon Jan 14 21:40:40 2008 +0300

    Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test

commit 0afd2153c7649e89d595cb7eff0f7b3c0b56ea15
Author: Alexander Bokovoy <ab at altlinux.org>
Date:   Mon Jan 14 21:32:59 2008 +0300

    Fix crash in winbind clients: instead of talloc-based pointer we passed address of a local variable.

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

Summary of changes:
 source/modules/vfs_tsmsm.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/modules/vfs_tsmsm.c b/source/modules/vfs_tsmsm.c
index fe791b2..c2d826f 100644
--- a/source/modules/vfs_tsmsm.c
+++ b/source/modules/vfs_tsmsm.c
@@ -137,7 +137,6 @@ static int tsmsm_connect(struct vfs_handle_struct *handle,
 }
 
 static int tsmsm_is_offline(struct vfs_handle_struct *handle, 
-			    struct connection_struct *conn,
 			    const char *path,
 			    SMB_STRUCT_STAT *stbuf,
 			    bool *offline) {
@@ -171,7 +170,7 @@ static int tsmsm_is_offline(struct vfs_handle_struct *handle,
 		ret = -1;
 		DEBUG(2,("dm_path_to_handle failed - assuming offline (%s) - %s\n", 
 			 path, strerror(errno)));
-		*offline = True;
+		*offline = true;
 		goto done;
 	}
 
@@ -210,7 +209,7 @@ static bool tsmsm_aio_force(struct vfs_handle_struct *handle, struct files_struc
 			  sbuf.st_blocks, sbuf.st_size, tsmd->online_ratio));
 		return !(512 * (off_t)sbuf.st_blocks >= sbuf.st_size * tsmd->online_ratio);
 	}
-	return False;
+	return false;
 }
 
 static ssize_t tsmsm_aio_return(struct vfs_handle_struct *handle, struct files_struct *fsp, 
@@ -277,7 +276,7 @@ static ssize_t tsmsm_pwrite(struct vfs_handle_struct *handle, struct files_struc
 	return result;
 }
 
-static int tsmsm_set_offline(struct vfs_handle_struct *handle, struct connection_struct *conn, 
+static int tsmsm_set_offline(struct vfs_handle_struct *handle, 
 			     const char *path) {
 	struct tsmsm_struct *tsmd = (struct tsmsm_struct *) handle->data;
 	int result = 0;
@@ -297,7 +296,7 @@ static int tsmsm_set_offline(struct vfs_handle_struct *handle, struct connection
 	return result;
 }
 
-static bool tsmsm_is_remotestorage(struct vfs_handle_struct *handle, struct connection_struct *conn, const char *path) {
+static bool tsmsm_is_remotestorage(struct vfs_handle_struct *handle, const char *path) {
 	return True;
 }
 


-- 
Samba Shared Repository