[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  ac7de80 Compare the correct values
       via  ec499c3 Do not return a value from a void function.
      from  e6afeae libcli/auth: try to use the current timestamp creds->sequence

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


- Log -----------------------------------------------------------------
commit ac7de8021050e560d39f613ea4a2caab06c7a2a8
Author: Simo Sorce <idra at samba.org>
Date:   Wed Dec 25 23:28:58 2013 -0500

    Compare the correct values
    
    Reported by herwin <samba at herwinw.nl>
    Resolves: https://bugzilla.samba.org/show_bug.cgi?id=10349
    
    Signed-off-by: Simo Sorce <idra at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Fri Dec 27 20:39:54 CET 2013 on sn-devel-104

commit ec499c3d668d0788c64276bf9a0f58ce9a915bd6
Author: Simo Sorce <idra at samba.org>
Date:   Wed Dec 25 23:20:58 2013 -0500

    Do not return a value from a void function.
    
    Reported by herwin <samba at herwinw.nl>
    Resolves: https://bugzilla.samba.org/show_bug.cgi?id=10346
    
    Signed-off-by: Simo Sorce <idra at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 lib/tevent/tevent_epoll.c |    1 -
 source3/torture/pdbtest.c |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tevent/tevent_epoll.c b/lib/tevent/tevent_epoll.c
index b0d15c8..01fcde6 100644
--- a/lib/tevent/tevent_epoll.c
+++ b/lib/tevent/tevent_epoll.c
@@ -125,7 +125,6 @@ _PRIVATE_ void tevent_epoll_set_panic_fallback(struct tevent_context *ev,
 		struct epoll_event_context);
 
 	epoll_ev->panic_fallback = panic_fallback;
-	return true;
 }
 
 /*
diff --git a/source3/torture/pdbtest.c b/source3/torture/pdbtest.c
index 17da455..df2c326 100644
--- a/source3/torture/pdbtest.c
+++ b/source3/torture/pdbtest.c
@@ -117,7 +117,7 @@ static bool samu_correct(struct samu *s1, struct samu *s2)
 		DEBUG(0, ("Password history is not set\n"));
 	} else if (d1_buf == NULL) {
 		/* Do nothing */
-	} else if (s1_len != s1_len) {
+	} else if (s1_len != s2_len) {
 		DEBUG(0, ("Password history not written correctly, lengths differ, want %d, got %d\n",
 					s1_len, s2_len));
 		ret = False;


-- 
Samba Shared Repository