[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  2bea45e ctdb-common: ioctl(.. FIONREAD ..) returns an int value
      from  7fd3eb6 util:charset: Return EILSEQ in smb_iconv() if newer libc is detected

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


- Log -----------------------------------------------------------------
commit 2bea45e450e5ebd6544c2a8be4493242158b712e
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Wed Feb 1 15:52:48 2017 +1100

    ctdb-common: ioctl(.. FIONREAD ..) returns an int value
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12549
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Wed Feb  1 14:29:14 CET 2017 on sn-devel-144

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

Summary of changes:
 ctdb/common/run_proc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/common/run_proc.c b/ctdb/common/run_proc.c
index 96e422c..f9fee80 100644
--- a/ctdb/common/run_proc.c
+++ b/ctdb/common/run_proc.c
@@ -132,8 +132,9 @@ static void proc_read_handler(struct tevent_context *ev,
 {
 	struct proc_context *proc = talloc_get_type_abort(
 		private_data, struct proc_context);
-	size_t offset, len = 0;
+	size_t offset;
 	ssize_t nread;
+	int len = 0;
 	int ret;
 
 	ret = ioctl(proc->fd, FIONREAD, &len);


-- 
Samba Shared Repository