[PATCH] Fix build on Illumos

[Jeremy Allison]

On Wed, Apr 29, 2015 at 11:32:58AM -0700, Jeremy Allison wrote:
> On Wed, Apr 29, 2015 at 01:38:40PM -0400, Gordon Ross wrote:
> > Yes, thanks.  That doesn't seem to be on master though, is it?
> > 
> > Here's a collection of patches that let me run the waf configure
> > and make smbtorture4.   The waf patches are definitely not "polished"
> > but worked for me.
> > The others could probably be integrated if you like.
> 
> Oh, the tevent and the uninitialized variables ones are
> good....
> 
> I'll post those as patches to master.

Attached. Can I get a second Team reviewer ?

Cheers,

	Jeremy
-------------- next part --------------
From 93118370575fd66a257145a23090c1a0a6c6e56c Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra at samba.org>
Date: Wed, 29 Apr 2015 11:34:10 -0700
Subject: [PATCH 1/2] lib: tevent: Fix compile error in Solaris ports backend.

Signed-off-by: Gordon Ross <gordon.w.ross at gmail.com>
Reviewed-by: Jeremy Allison <jra at samba.org>
---
 lib/tevent/tevent_port.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/tevent/tevent_port.c b/lib/tevent/tevent_port.c
index dd4958e..245d20b 100644
--- a/lib/tevent/tevent_port.c
+++ b/lib/tevent/tevent_port.c
@@ -172,12 +172,13 @@ static void delete_port_association(struct port_event_context *port_ev,
 static int associate_all_events(struct port_event_context *port_ev)
 {
 	struct port_associate_vals *val;
+	int ret;
 
 	for (val = port_ev->po_vals; val; val = val->next) {
 		if (val->associated_event) {
 			continue;
 		}
-		int ret = port_associate(port_ev->port_fd,
+		ret = port_associate(port_ev->port_fd,
 					PORT_SOURCE_FD,
 					(uintptr_t)val->fde->fd,
 					val->events,
-- 
2.2.0.rc0.207.ga3a616c


From 4fc923bf172228382dbae9902eb9a77e001eee7e Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra at samba.org>
Date: Wed, 29 Apr 2015 11:34:49 -0700
Subject: [PATCH 2/2] s4: torture: Fix uninitialized variable.

Signed-off-by: Gordon Ross <gordon.w.ross at gmail.com>
Reviewed-by: Jeremy Allison <jra at samba.org>
---
 source4/torture/rpc/samlogon.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c
index d552fa6..9000fe9 100644
--- a/source4/torture/rpc/samlogon.c
+++ b/source4/torture/rpc/samlogon.c
@@ -1519,8 +1519,9 @@ bool test_InteractiveLogon(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
 	torture_comment(tctx, "Testing netr_LogonSamLogonWithFlags '%s' (Interactive Logon)\n", comment);
 
+	status = dcerpc_netr_LogonSamLogonWithFlags_r(b, fn_ctx, &r);
 	torture_assert_ntstatus_ok_goto(tctx,
-		dcerpc_netr_LogonSamLogonWithFlags_r(b, fn_ctx, &r),
+		status,
 		ret, failed,
 		talloc_asprintf(tctx, "%s: netr_LogonSamLogonWithFlags - %s\n",
 			 __location__, nt_errstr(status)));
-- 
2.2.0.rc0.207.ga3a616c