[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  d04efe5 vfs_fruit: Fix the 32-bit build
       via  dd0d2ee pam_wrapper: Add PAM_STRERROR_CONST configure check
      from  4c17850 samba-tool: fix log message of 'samba-tool user syncpasswords'

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


- Log -----------------------------------------------------------------
commit d04efe5b9bf8c4e655142ba828045a258951804c
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Apr 29 12:01:41 2017 +0200

    vfs_fruit: Fix the 32-bit build
    
    On debian 32-bit, size_t is an 32 bit, but off_t is 64 bit.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Fri May  5 11:50:55 CEST 2017 on sn-devel-144

commit dd0d2ee1dd210784420d79fcc5063eb81465d5de
Author: Volker Lendecke <vl at samba.org>
Date:   Mon May 1 17:56:50 2017 +0200

    pam_wrapper: Add PAM_STRERROR_CONST configure check
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 lib/pam_wrapper/wscript     |  7 +++++++
 source3/modules/vfs_fruit.c | 20 +++++++++++---------
 2 files changed, 18 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/pam_wrapper/wscript b/lib/pam_wrapper/wscript
index 87181c3..aacd1d7 100644
--- a/lib/pam_wrapper/wscript
+++ b/lib/pam_wrapper/wscript
@@ -80,6 +80,13 @@ def configure(conf):
                                'int pam_prompt(const pam_handle_t *_pamh, int _style, char **_resp, const char *_fmt, ...)',
                                define='HAVE_PAM_PROMPT_CONST', headers='stdio.h sys/types.h security/pam_appl.h security/pam_modules.h')
 
+        conf.CHECK_C_PROTOTYPE(
+            'pam_strerror',
+            'const char *pam_strerror(const pam_handle_t *pamh, int errnum)',
+            define='HAVE_PAM_STRERROR_CONST',
+            headers='''stdio.h sys/types.h security/pam_appl.h
+                       security/pam_modules.h''')
+
         # Find the absolute path to libpam.so.0
         libpam_path = find_library(['libpam.so.0', 'libpam.so'], conf.env.STANDARD_LIBPATH)
         conf.DEFINE('PAM_LIBRARY', ('"%s"' % libpam_path ))
diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 11d2071..273540e 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -3738,8 +3738,8 @@ static ssize_t fruit_pread(vfs_handle_struct *handle,
 	struct fio *fio = (struct fio *)VFS_FETCH_FSP_EXTENSION(handle, fsp);
 	ssize_t nread;
 
-	DBG_DEBUG("Path [%s] offset=%zd, size=%zd\n",
-		  fsp_str_dbg(fsp), offset, n);
+	DBG_DEBUG("Path [%s] offset=%"PRIdMAX", size=%zd\n",
+		  fsp_str_dbg(fsp), (intmax_t)offset, n);
 
 	if (fio == NULL) {
 		return SMB_VFS_NEXT_PREAD(handle, fsp, data, n, offset);
@@ -3962,8 +3962,8 @@ static ssize_t fruit_pwrite(vfs_handle_struct *handle,
 	struct fio *fio = (struct fio *)VFS_FETCH_FSP_EXTENSION(handle, fsp);
 	ssize_t nwritten;
 
-	DBG_DEBUG("Path [%s] offset=%zd, size=%zd\n",
-		  fsp_str_dbg(fsp), offset, n);
+	DBG_DEBUG("Path [%s] offset=%"PRIdMAX", size=%zd\n",
+		  fsp_str_dbg(fsp), (intmax_t)offset, n);
 
 	if (fio == NULL) {
 		return SMB_VFS_NEXT_PWRITE(handle, fsp, data, n, offset);
@@ -4407,8 +4407,8 @@ static int fruit_fstat(vfs_handle_struct *handle, files_struct *fsp,
 		sbuf->st_ex_blocks = sbuf->st_ex_size / STAT_ST_BLOCKSIZE + 1;
 	}
 
-	DBG_DEBUG("Path [%s] rc [%d] size [%zd]\n",
-		  fsp_str_dbg(fsp), rc, sbuf->st_ex_size);
+	DBG_DEBUG("Path [%s] rc [%d] size [%"PRIdMAX"]\n",
+		  fsp_str_dbg(fsp), rc, (intmax_t)sbuf->st_ex_size);
 	return rc;
 }
 
@@ -4441,8 +4441,9 @@ static NTSTATUS fruit_streaminfo_meta_stream(
 		return NT_STATUS_OK;
 	}
 
-	DBG_ERR("Removing invalid AFPINFO_STREAM size [%zd] from [%s]\n",
-		stream[i].size, smb_fname_str_dbg(smb_fname));
+	DBG_ERR("Removing invalid AFPINFO_STREAM size [%"PRIdMAX"] "
+		"from [%s]\n", (intmax_t)stream[i].size,
+		smb_fname_str_dbg(smb_fname));
 
 	ok = del_fruit_stream(mem_ctx, pnum_streams, pstreams, AFPINFO_STREAM);
 	if (!ok) {
@@ -4909,7 +4910,8 @@ static int fruit_ftruncate(struct vfs_handle_struct *handle,
 	struct fio *fio = (struct fio *)VFS_FETCH_FSP_EXTENSION(handle, fsp);
 	int ret;
 
-	DBG_DEBUG("Path [%s] offset [%zd]\n", fsp_str_dbg(fsp), offset);
+	DBG_DEBUG("Path [%s] offset [%"PRIdMAX"]\n", fsp_str_dbg(fsp),
+		  (intmax_t)offset);
 
 	if (fio == NULL) {
 		return SMB_VFS_NEXT_FTRUNCATE(handle, fsp, offset);


-- 
Samba Shared Repository