[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  412cefc client: Fix parameter mixup
      from  0583d5b vfs: remove posix_flags hack, bump interface version to 34

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


- Log -----------------------------------------------------------------
commit 412cefc7c8222ccc77e15099a162f9fb7bb01c57
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Dec 2 08:50:02 2015 +0100

    client: Fix parameter mixup
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11628
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Wed Dec  2 21:01:14 CET 2015 on sn-devel-104

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

Summary of changes:
 source3/client/dnsbrowse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/client/dnsbrowse.c b/source3/client/dnsbrowse.c
index 03f87af..be6eb88 100644
--- a/source3/client/dnsbrowse.c
+++ b/source3/client/dnsbrowse.c
@@ -168,7 +168,7 @@ int do_smb_browse(void)
 	for (;;)  {
 		int revents;
 
-		ret = poll_one_fd(mdnsfd, POLLIN|POLLHUP, &revents, 1000);
+		ret = poll_one_fd(mdnsfd, POLLIN|POLLHUP, 1000, &revents);
 		if (ret <= 0 && errno != EINTR) {
 			break;
 		}


-- 
Samba Shared Repository