[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0-100-gda771f1

[Karolin Seeger]

The branch, v3-2-stable has been updated
       via  da771f13af99388005df60e2bec5c5ee5a2f5d95 (commit)
       via  9fcced79a072c5c44f42c8fd3755da03c052a45e (commit)
       via  0c6c114d8f6ec0b06cf32471ec860271c18bbbc6 (commit)
      from  807e2842db8ac88798f454e7b32c52cb53229fc5 (commit)

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


- Log -----------------------------------------------------------------
commit da771f13af99388005df60e2bec5c5ee5a2f5d95
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Jul 28 15:26:19 2008 +0200

    WHATSNEW: Update changes since 3.2.0.
    
    Karolin
    (cherry picked from commit 0d4a3c2dfb07663dc9fded298e6b7b6c67029f71)

commit 9fcced79a072c5c44f42c8fd3755da03c052a45e
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Jul 25 23:30:53 2008 +0200

    Fix an incompatible pointer warning
    (cherry picked from commit 3282f7289b7b33beeaa1ca649651cca6537a69af)

commit 0c6c114d8f6ec0b06cf32471ec860271c18bbbc6
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Jul 25 13:14:57 2008 -0700

    Fix bug creating files using DOS clients with mixed
    case files. Reported by Daniel Johnson <Progman2000 at usa.net>.
    The smb_set_file_time() call to set the filetimes is failing
    because it's using the unmodified name passed in by the
    client, not the modified name (matching case on the
    disk) that comes out from create_file().
    Jeremy.
    (cherry picked from commit d54fe83b16c187847a975df373e73d56111d7f21)

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

Summary of changes:
 WHATSNEW.txt                    |    1 +
 source/smbd/reply.c             |    2 +-
 source/winbindd/winbindd_user.c |    4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 88bee81..c5f8b3c 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -43,6 +43,7 @@ o   Jeremy Allison <jra at samba.org>
     * Canonicalize servername in the printer functions to remove leading
       '\\' characters.
     * Fix option processing in smbcacls - add POPT_COMMON_CONNECTION.
+    * Fix bug creating files using DOS clients with mixed case files.
 
 
 o   Jim Brown <jim.brown at miami.edu>
diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index 2506ff9..ac9ccd6 100644
--- a/source/smbd/reply.c
+++ b/source/smbd/reply.c
@@ -2000,7 +2000,7 @@ void reply_mknew(struct smb_request *req)
 	}
 
 	ts[0] = get_atimespec(&sbuf); /* atime. */
-	status = smb_set_file_time(conn, fsp, fname, &sbuf, ts, true);
+	status = smb_set_file_time(conn, fsp, fsp->fsp_name, &sbuf, ts, true);
 	if (!NT_STATUS_IS_OK(status)) {
 		END_PROFILE(SMBcreate);
 		reply_openerror(req, status);
diff --git a/source/winbindd/winbindd_user.c b/source/winbindd/winbindd_user.c
index 4591838..19feec3 100644
--- a/source/winbindd/winbindd_user.c
+++ b/source/winbindd/winbindd_user.c
@@ -184,7 +184,7 @@ static void getpwsid_queryuser_recv(void *private_data, bool success,
 				    const char *full_name, 
 				    const char *homedir,
 				    const char *shell,
-				    uint32 gid,
+				    gid_t gid,
 				    uint32 group_rid);
 static void getpwsid_sid2uid_recv(void *private_data, bool success, uid_t uid);
 static void getpwsid_sid2gid_recv(void *private_data, bool success, gid_t gid);
@@ -223,7 +223,7 @@ static void getpwsid_queryuser_recv(void *private_data, bool success,
 				    const char *full_name, 
 				    const char *homedir,
 				    const char *shell,
-				    uint32 gid,
+				    gid_t gid,
 				    uint32 group_rid)
 {
 	fstring username;


-- 
Samba Shared Repository