[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4094-ga03b0dd

[Jeremy Allison]

The branch, v3-devel has been updated
       via  a03b0dde01e4cebe07a65af3943d178dbdeda276 (commit)
       via  b81a4dd003957a611ea190979d828b75d07a1f80 (commit)
      from  295bfb6af8153e91ae881e2437cc707d5736bc97 (commit)

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


- Log -----------------------------------------------------------------
commit a03b0dde01e4cebe07a65af3943d178dbdeda276
Merge: b81a4dd003957a611ea190979d828b75d07a1f80 295bfb6af8153e91ae881e2437cc707d5736bc97
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Sep 10 14:57:52 2008 -0700

    Merge branch 'v3-devel' of ssh://jra@git.samba.org/data/git/samba into v3-devel

commit b81a4dd003957a611ea190979d828b75d07a1f80
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Sep 10 14:54:25 2008 -0700

    When requesting UNIX info levels on findfirst/findnext, don't play games with write time,
    just return what the underlying filesystem says. Trying not to confuse UNIX apps any more than necessary.
    Jeremy.

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

Summary of changes:
 source/smbd/trans2.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c
index 3c17533..2e2da5c 100644
--- a/source/smbd/trans2.c
+++ b/source/smbd/trans2.c
@@ -1945,6 +1945,8 @@ close_if_end = %d requires_resume_key = %d level = 0x%x, max_data_bytes = %d\n",
 			break;
 		case SMB_FIND_FILE_UNIX:
 		case SMB_FIND_FILE_UNIX_INFO2:
+			/* Always use filesystem for UNIX mtime query. */
+			ask_sharemode = false;
 			if (!lp_unix_extensions()) {
 				reply_nterror(req, NT_STATUS_INVALID_LEVEL);
 				return;
@@ -2302,6 +2304,8 @@ resume_key = %d resume name = %s continue=%d level = %d\n",
 			break;
 		case SMB_FIND_FILE_UNIX:
 		case SMB_FIND_FILE_UNIX_INFO2:
+			/* Always use filesystem for UNIX mtime query. */
+			ask_sharemode = false;
 			if (!lp_unix_extensions()) {
 				reply_nterror(req, NT_STATUS_INVALID_LEVEL);
 				return;
@@ -4148,7 +4152,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 		}
 	}
 
-	if (!null_timespec(write_time_ts)) {
+	if (!null_timespec(write_time_ts) && !INFO_LEVEL_IS_UNIX(info_level)) {
 		mtime_ts = write_time_ts;
 	}
 


-- 
Samba Shared Repository