From cb9effdc636731c1eba1101798d30f114fc83e19 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Mon, 16 Mar 2009 18:43:57 +0100
Subject: Use tevent_wakeup_send in open_socket_out_defer

---
 source3/lib/util_sock.c | 37 +++++++++++++++----------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

(limited to 'source3/lib')

diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 3604be369f..499fc732f0 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -1152,7 +1152,7 @@ struct open_socket_out_defer_state {
 	int fd;
 };
 
-static void open_socket_out_defer_waited(struct async_req *subreq);
+static void open_socket_out_defer_waited(struct tevent_req *subreq);
 static void open_socket_out_defer_connected(struct tevent_req *subreq);
 
 struct async_req *open_socket_out_defer_send(TALLOC_CTX *mem_ctx,
@@ -1162,9 +1162,9 @@ struct async_req *open_socket_out_defer_send(TALLOC_CTX *mem_ctx,
 					     uint16_t port,
 					     int timeout)
 {
-	struct async_req *result, *subreq;
+	struct async_req *result;
+	struct tevent_req *subreq;
 	struct open_socket_out_defer_state *state;
-	NTSTATUS status;
 
 	if (!async_req_setup(mem_ctx, &result, &state,
 			     struct open_socket_out_defer_state)) {
@@ -1175,47 +1175,40 @@ struct async_req *open_socket_out_defer_send(TALLOC_CTX *mem_ctx,
 	state->port = port;
 	state->timeout = timeout;
 
-	subreq = async_wait_send(state, ev, wait_time);
+	subreq = tevent_wakeup_send(
+		state, ev,
+		timeval_current_ofs(wait_time.tv_sec, wait_time.tv_usec));
 	if (subreq == NULL) {
-		status = NT_STATUS_NO_MEMORY;
-		goto post_status;
-	}
-	subreq->async.fn = open_socket_out_defer_waited;
-	subreq->async.priv = result;
-	return result;
-
- post_status:
-	if (!async_post_ntstatus(result, ev, status)) {
 		goto fail;
 	}
+	tevent_req_set_callback(subreq, open_socket_out_defer_waited, result);
 	return result;
  fail:
 	TALLOC_FREE(result);
 	return NULL;
 }
 
-static void open_socket_out_defer_waited(struct async_req *subreq)
+static void open_socket_out_defer_waited(struct tevent_req *subreq)
 {
-	struct async_req *req = talloc_get_type_abort(
-		subreq->async.priv, struct async_req);
+	struct async_req *req = tevent_req_callback_data(
+		subreq, struct async_req);
 	struct open_socket_out_defer_state *state = talloc_get_type_abort(
 		req->private_data, struct open_socket_out_defer_state);
-	struct tevent_req *subreq2;
 	bool ret;
 
-	ret = async_wait_recv(subreq);
+	ret = tevent_wakeup_recv(subreq);
 	TALLOC_FREE(subreq);
 	if (!ret) {
 		async_req_nterror(req, NT_STATUS_INTERNAL_ERROR);
 		return;
 	}
 
-	subreq2 = open_socket_out_send(state, state->ev, &state->ss,
-				       state->port, state->timeout);
-	if (async_req_nomem(subreq2, req)) {
+	subreq = open_socket_out_send(state, state->ev, &state->ss,
+				      state->port, state->timeout);
+	if (async_req_nomem(subreq, req)) {
 		return;
 	}
-	tevent_req_set_callback(subreq2, open_socket_out_defer_connected, req);
+	tevent_req_set_callback(subreq, open_socket_out_defer_connected, req);
 }
 
 static void open_socket_out_defer_connected(struct tevent_req *subreq)
-- 
cgit 


From 20cee26a3dbd231672eec9133c6e84641def298d Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Mon, 16 Mar 2009 19:15:26 +0100
Subject: Convert open_socket_out_defer to tevent_req

---
 source3/lib/util_sock.c | 58 ++++++++++++++++++++++++-------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

(limited to 'source3/lib')

diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 499fc732f0..de5b232aac 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -1155,19 +1155,19 @@ struct open_socket_out_defer_state {
 static void open_socket_out_defer_waited(struct tevent_req *subreq);
 static void open_socket_out_defer_connected(struct tevent_req *subreq);
 
-struct async_req *open_socket_out_defer_send(TALLOC_CTX *mem_ctx,
-					     struct event_context *ev,
-					     struct timeval wait_time,
-					     const struct sockaddr_storage *pss,
-					     uint16_t port,
-					     int timeout)
+struct tevent_req *open_socket_out_defer_send(TALLOC_CTX *mem_ctx,
+					      struct event_context *ev,
+					      struct timeval wait_time,
+					      const struct sockaddr_storage *pss,
+					      uint16_t port,
+					      int timeout)
 {
-	struct async_req *result;
-	struct tevent_req *subreq;
+	struct tevent_req *req, *subreq;
 	struct open_socket_out_defer_state *state;
 
-	if (!async_req_setup(mem_ctx, &result, &state,
-			     struct open_socket_out_defer_state)) {
+	req = tevent_req_create(mem_ctx, &state,
+				struct open_socket_out_defer_state);
+	if (req == NULL) {
 		return NULL;
 	}
 	state->ev = ev;
@@ -1181,31 +1181,31 @@ struct async_req *open_socket_out_defer_send(TALLOC_CTX *mem_ctx,
 	if (subreq == NULL) {
 		goto fail;
 	}
-	tevent_req_set_callback(subreq, open_socket_out_defer_waited, result);
-	return result;
+	tevent_req_set_callback(subreq, open_socket_out_defer_waited, req);
+	return req;
  fail:
-	TALLOC_FREE(result);
+	TALLOC_FREE(req);
 	return NULL;
 }
 
 static void open_socket_out_defer_waited(struct tevent_req *subreq)
 {
-	struct async_req *req = tevent_req_callback_data(
-		subreq, struct async_req);
-	struct open_socket_out_defer_state *state = talloc_get_type_abort(
-		req->private_data, struct open_socket_out_defer_state);
+	struct tevent_req *req = tevent_req_callback_data(
+		subreq, struct tevent_req);
+	struct open_socket_out_defer_state *state = tevent_req_data(
+		req, struct open_socket_out_defer_state);
 	bool ret;
 
 	ret = tevent_wakeup_recv(subreq);
 	TALLOC_FREE(subreq);
 	if (!ret) {
-		async_req_nterror(req, NT_STATUS_INTERNAL_ERROR);
+		tevent_req_nterror(req, NT_STATUS_INTERNAL_ERROR);
 		return;
 	}
 
 	subreq = open_socket_out_send(state, state->ev, &state->ss,
 				      state->port, state->timeout);
-	if (async_req_nomem(subreq, req)) {
+	if (tevent_req_nomem(subreq, req)) {
 		return;
 	}
 	tevent_req_set_callback(subreq, open_socket_out_defer_connected, req);
@@ -1213,28 +1213,28 @@ static void open_socket_out_defer_waited(struct tevent_req *subreq)
 
 static void open_socket_out_defer_connected(struct tevent_req *subreq)
 {
-	struct async_req *req =
-		tevent_req_callback_data(subreq, struct async_req);
-	struct open_socket_out_defer_state *state = talloc_get_type_abort(
-		req->private_data, struct open_socket_out_defer_state);
+	struct tevent_req *req = tevent_req_callback_data(
+		subreq, struct tevent_req);
+	struct open_socket_out_defer_state *state = tevent_req_data(
+		req, struct open_socket_out_defer_state);
 	NTSTATUS status;
 
 	status = open_socket_out_recv(subreq, &state->fd);
 	TALLOC_FREE(subreq);
 	if (!NT_STATUS_IS_OK(status)) {
-		async_req_nterror(req, status);
+		tevent_req_nterror(req, status);
 		return;
 	}
-	async_req_done(req);
+	tevent_req_done(req);
 }
 
-NTSTATUS open_socket_out_defer_recv(struct async_req *req, int *pfd)
+NTSTATUS open_socket_out_defer_recv(struct tevent_req *req, int *pfd)
 {
-	struct open_socket_out_defer_state *state = talloc_get_type_abort(
-		req->private_data, struct open_socket_out_defer_state);
+	struct open_socket_out_defer_state *state = tevent_req_data(
+		req, struct open_socket_out_defer_state);
 	NTSTATUS status;
 
-	if (async_req_is_nterror(req, &status)) {
+	if (tevent_req_is_nterror(req, &status)) {
 		return status;
 	}
 	*pfd = state->fd;
-- 
cgit 


From 5c848e47cc89f5b6658c2de2d742540e56db29dc Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Mon, 16 Mar 2009 20:15:23 +0100
Subject: Use tevent_wakeup_send in wb_trans

---
 source3/lib/wbclient.c | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

(limited to 'source3/lib')

diff --git a/source3/lib/wbclient.c b/source3/lib/wbclient.c
index 80937641e6..c2042c23e0 100644
--- a/source3/lib/wbclient.c
+++ b/source3/lib/wbclient.c
@@ -545,7 +545,7 @@ struct wb_trans_state {
 
 static void wb_trans_connect_done(struct tevent_req *subreq);
 static void wb_trans_done(struct tevent_req *subreq);
-static void wb_trans_retry_wait_done(struct async_req *subreq);
+static void wb_trans_retry_wait_done(struct tevent_req *subreq);
 
 static void wb_trigger_trans(struct async_req *req)
 {
@@ -604,7 +604,7 @@ static bool wb_trans_retry(struct async_req *req,
 			   struct wb_trans_state *state,
 			   wbcErr wbc_err)
 {
-	struct async_req *subreq;
+	struct tevent_req *subreq;
 
 	if (WBC_ERROR_IS_OK(wbc_err)) {
 		return false;
@@ -634,38 +634,36 @@ static bool wb_trans_retry(struct async_req *req,
 		state->wb_ctx->fd = -1;
 	}
 
-	subreq = async_wait_send(state, state->ev, timeval_set(1, 0));
+	subreq = tevent_wakeup_send(state, state->ev,
+				    timeval_current_ofs(1, 0));
 	if (async_req_nomem(subreq, req)) {
 		return true;
 	}
-
-	subreq->async.fn = wb_trans_retry_wait_done;
-	subreq->async.priv = req;
+	tevent_req_set_callback(subreq, wb_trans_retry_wait_done, req);
 	return true;
 }
 
-static void wb_trans_retry_wait_done(struct async_req *subreq)
+static void wb_trans_retry_wait_done(struct tevent_req *subreq)
 {
-	struct async_req *req = talloc_get_type_abort(
-		subreq->async.priv, struct async_req);
+	struct async_req *req = tevent_req_callback_data(
+		subreq, struct async_req);
 	struct wb_trans_state *state = talloc_get_type_abort(
 		req->private_data, struct wb_trans_state);
-	struct tevent_req *subreq2;
 	bool ret;
 
-	ret = async_wait_recv(subreq);
+	ret = tevent_wakeup_recv(subreq);
 	TALLOC_FREE(subreq);
-	if (ret) {
+	if (!ret) {
 		async_req_error(req, WBC_ERR_UNKNOWN_FAILURE);
 		return;
 	}
 
-	subreq2 = wb_open_pipe_send(state, state->ev, state->wb_ctx,
+	subreq = wb_open_pipe_send(state, state->ev, state->wb_ctx,
 				    state->need_priv);
-	if (async_req_nomem(subreq2, req)) {
+	if (async_req_nomem(subreq, req)) {
 		return;
 	}
-	tevent_req_set_callback(subreq2, wb_trans_connect_done, req);
+	tevent_req_set_callback(subreq, wb_trans_connect_done, req);
 }
 
 static void wb_trans_connect_done(struct tevent_req *subreq)
-- 
cgit 


From a58eccfee742bcecbd4a2e5662305c5077024244 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Mon, 16 Mar 2009 20:23:37 +0100
Subject: Make struct wb_context private to wbclient.c

---
 source3/lib/wbclient.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'source3/lib')

diff --git a/source3/lib/wbclient.c b/source3/lib/wbclient.c
index c2042c23e0..b1a4449734 100644
--- a/source3/lib/wbclient.c
+++ b/source3/lib/wbclient.c
@@ -20,6 +20,12 @@
 #include "includes.h"
 #include "wbc_async.h"
 
+struct wb_context {
+	struct async_req_queue *queue;
+	int fd;
+	bool is_priv;
+};
+
 static int make_nonstd_fd(int fd)
 {
 	int i;
-- 
cgit 


From 1624b58beb4b3278acf7de721392ccc7dda65013 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Mon, 16 Mar 2009 20:25:25 +0100
Subject: Remove an unnecessary variable

---
 source3/lib/wbclient.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'source3/lib')

diff --git a/source3/lib/wbclient.c b/source3/lib/wbclient.c
index b1a4449734..4c3dd889e7 100644
--- a/source3/lib/wbclient.c
+++ b/source3/lib/wbclient.c
@@ -678,7 +678,6 @@ static void wb_trans_connect_done(struct tevent_req *subreq)
 		subreq, struct async_req);
 	struct wb_trans_state *state = talloc_get_type_abort(
 		req->private_data, struct wb_trans_state);
-	struct tevent_req *subreq2;
 	wbcErr wbc_err;
 
 	wbc_err = wb_open_pipe_recv(subreq);
@@ -688,12 +687,12 @@ static void wb_trans_connect_done(struct tevent_req *subreq)
 		return;
 	}
 
-	subreq2 = wb_int_trans_send(state, state->ev, NULL, state->wb_ctx->fd,
-				    state->wb_req);
-	if (async_req_nomem(subreq2, req)) {
+	subreq = wb_int_trans_send(state, state->ev, NULL, state->wb_ctx->fd,
+				   state->wb_req);
+	if (async_req_nomem(subreq, req)) {
 		return;
 	}
-	tevent_req_set_callback(subreq2, wb_trans_done, req);
+	tevent_req_set_callback(subreq, wb_trans_done, req);
 }
 
 static void wb_trans_done(struct tevent_req *subreq)
-- 
cgit 


From 05b49fd4c8aaf779b98eb2eabb860295dc1300b9 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Mon, 16 Mar 2009 20:38:11 +0100
Subject: Convert wb_trans to tevent_req

---
 source3/lib/wbclient.c | 112 ++++++++++++++++++++++---------------------------
 1 file changed, 49 insertions(+), 63 deletions(-)

(limited to 'source3/lib')

diff --git a/source3/lib/wbclient.c b/source3/lib/wbclient.c
index 4c3dd889e7..3cf992c7de 100644
--- a/source3/lib/wbclient.c
+++ b/source3/lib/wbclient.c
@@ -21,7 +21,7 @@
 #include "wbc_async.h"
 
 struct wb_context {
-	struct async_req_queue *queue;
+	struct tevent_queue *queue;
 	int fd;
 	bool is_priv;
 };
@@ -144,7 +144,7 @@ struct wb_context *wb_context_init(TALLOC_CTX *mem_ctx)
 	if (result == NULL) {
 		return NULL;
 	}
-	result->queue = async_req_queue_init(result);
+	result->queue = tevent_queue_create(result, "wb_trans");
 	if (result->queue == NULL) {
 		TALLOC_FREE(result);
 		return NULL;
@@ -553,41 +553,16 @@ static void wb_trans_connect_done(struct tevent_req *subreq);
 static void wb_trans_done(struct tevent_req *subreq);
 static void wb_trans_retry_wait_done(struct tevent_req *subreq);
 
-static void wb_trigger_trans(struct async_req *req)
+struct tevent_req *wb_trans_send(TALLOC_CTX *mem_ctx,
+				 struct tevent_context *ev,
+				 struct wb_context *wb_ctx, bool need_priv,
+				 struct winbindd_request *wb_req)
 {
-	struct wb_trans_state *state = talloc_get_type_abort(
-		req->private_data, struct wb_trans_state);
-	struct tevent_req *subreq;
-
-	if ((state->wb_ctx->fd == -1)
-	    || (state->need_priv && !state->wb_ctx->is_priv)) {
-
-		subreq = wb_open_pipe_send(state, state->ev, state->wb_ctx,
-					   state->need_priv);
-		if (async_req_nomem(subreq, req)) {
-			return;
-		}
-		tevent_req_set_callback(subreq, wb_trans_connect_done, req);
-		return;
-	}
-
-	subreq = wb_int_trans_send(state, state->ev, NULL, state->wb_ctx->fd,
-				   state->wb_req);
-	if (async_req_nomem(subreq, req)) {
-		return;
-	}
-	tevent_req_set_callback(subreq, wb_trans_done, req);
-}
-
-struct async_req *wb_trans_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
-				struct wb_context *wb_ctx, bool need_priv,
-				struct winbindd_request *wb_req)
-{
-	struct async_req *result;
+	struct tevent_req *req, *subreq;
 	struct wb_trans_state *state;
 
-	if (!async_req_setup(mem_ctx, &result, &state,
-			     struct wb_trans_state)) {
+	req = tevent_req_create(mem_ctx, &state, struct wb_trans_state);
+	if (req == NULL) {
 		return NULL;
 	}
 	state->wb_ctx = wb_ctx;
@@ -596,17 +571,28 @@ struct async_req *wb_trans_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
 	state->num_retries = 10;
 	state->need_priv = need_priv;
 
-	if (!async_req_enqueue(wb_ctx->queue, ev, result, wb_trigger_trans)) {
-		goto fail;
+	if ((wb_ctx->fd == -1) || (need_priv && !wb_ctx->is_priv)) {
+		subreq = wb_open_pipe_send(state, ev, wb_ctx, need_priv);
+		if (subreq == NULL) {
+			goto fail;
+		}
+		tevent_req_set_callback(subreq, wb_trans_connect_done, req);
+		return req;
 	}
-	return result;
 
+	subreq = wb_int_trans_send(state, ev, wb_ctx->queue, wb_ctx->fd,
+				   wb_req);
+	if (subreq == NULL) {
+		goto fail;
+	}
+	tevent_req_set_callback(subreq, wb_trans_done, req);
+	return req;
  fail:
-	TALLOC_FREE(result);
+	TALLOC_FREE(req);
 	return NULL;
 }
 
-static bool wb_trans_retry(struct async_req *req,
+static bool wb_trans_retry(struct tevent_req *req,
 			   struct wb_trans_state *state,
 			   wbcErr wbc_err)
 {
@@ -621,13 +607,13 @@ static bool wb_trans_retry(struct async_req *req,
 		 * Winbind not around or we can't connect to the pipe. Fail
 		 * immediately.
 		 */
-		async_req_error(req, wbc_err);
+		tevent_req_error(req, wbc_err);
 		return true;
 	}
 
 	state->num_retries -= 1;
 	if (state->num_retries == 0) {
-		async_req_error(req, wbc_err);
+		tevent_req_error(req, wbc_err);
 		return true;
 	}
 
@@ -642,7 +628,7 @@ static bool wb_trans_retry(struct async_req *req,
 
 	subreq = tevent_wakeup_send(state, state->ev,
 				    timeval_current_ofs(1, 0));
-	if (async_req_nomem(subreq, req)) {
+	if (tevent_req_nomem(subreq, req)) {
 		return true;
 	}
 	tevent_req_set_callback(subreq, wb_trans_retry_wait_done, req);
@@ -651,22 +637,22 @@ static bool wb_trans_retry(struct async_req *req,
 
 static void wb_trans_retry_wait_done(struct tevent_req *subreq)
 {
-	struct async_req *req = tevent_req_callback_data(
-		subreq, struct async_req);
-	struct wb_trans_state *state = talloc_get_type_abort(
-		req->private_data, struct wb_trans_state);
+	struct tevent_req *req = tevent_req_callback_data(
+		subreq, struct tevent_req);
+	struct wb_trans_state *state = tevent_req_data(
+		req, struct wb_trans_state);
 	bool ret;
 
 	ret = tevent_wakeup_recv(subreq);
 	TALLOC_FREE(subreq);
 	if (!ret) {
-		async_req_error(req, WBC_ERR_UNKNOWN_FAILURE);
+		tevent_req_error(req, WBC_ERR_UNKNOWN_FAILURE);
 		return;
 	}
 
 	subreq = wb_open_pipe_send(state, state->ev, state->wb_ctx,
-				    state->need_priv);
-	if (async_req_nomem(subreq, req)) {
+				   state->need_priv);
+	if (tevent_req_nomem(subreq, req)) {
 		return;
 	}
 	tevent_req_set_callback(subreq, wb_trans_connect_done, req);
@@ -674,10 +660,10 @@ static void wb_trans_retry_wait_done(struct tevent_req *subreq)
 
 static void wb_trans_connect_done(struct tevent_req *subreq)
 {
-	struct async_req *req = tevent_req_callback_data(
-		subreq, struct async_req);
-	struct wb_trans_state *state = talloc_get_type_abort(
-		req->private_data, struct wb_trans_state);
+	struct tevent_req *req = tevent_req_callback_data(
+		subreq, struct tevent_req);
+	struct wb_trans_state *state = tevent_req_data(
+		req, struct wb_trans_state);
 	wbcErr wbc_err;
 
 	wbc_err = wb_open_pipe_recv(subreq);
@@ -689,7 +675,7 @@ static void wb_trans_connect_done(struct tevent_req *subreq)
 
 	subreq = wb_int_trans_send(state, state->ev, NULL, state->wb_ctx->fd,
 				   state->wb_req);
-	if (async_req_nomem(subreq, req)) {
+	if (tevent_req_nomem(subreq, req)) {
 		return;
 	}
 	tevent_req_set_callback(subreq, wb_trans_done, req);
@@ -697,10 +683,10 @@ static void wb_trans_connect_done(struct tevent_req *subreq)
 
 static void wb_trans_done(struct tevent_req *subreq)
 {
-	struct async_req *req = tevent_req_callback_data(
-		subreq, struct async_req);
-	struct wb_trans_state *state = talloc_get_type_abort(
-		req->private_data, struct wb_trans_state);
+	struct tevent_req *req = tevent_req_callback_data(
+		subreq, struct tevent_req);
+	struct wb_trans_state *state = tevent_req_data(
+		req, struct wb_trans_state);
 	wbcErr wbc_err;
 
 	wbc_err = wb_int_trans_recv(subreq, state, &state->wb_resp);
@@ -710,17 +696,17 @@ static void wb_trans_done(struct tevent_req *subreq)
 		return;
 	}
 
-	async_req_done(req);
+	tevent_req_done(req);
 }
 
-wbcErr wb_trans_recv(struct async_req *req, TALLOC_CTX *mem_ctx,
+wbcErr wb_trans_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
 		     struct winbindd_response **presponse)
 {
-	struct wb_trans_state *state = talloc_get_type_abort(
-		req->private_data, struct wb_trans_state);
+	struct wb_trans_state *state = tevent_req_data(
+		req, struct wb_trans_state);
 	wbcErr wbc_err;
 
-	if (async_req_is_wbcerr(req, &wbc_err)) {
+	if (tevent_req_is_wbcerr(req, &wbc_err)) {
 		return wbc_err;
 	}
 
-- 
cgit 


From 8a2b7b3e56230c46df9ae3820578a2f3e765d32d Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Mon, 16 Mar 2009 21:02:26 +0100
Subject: Remove unused async_req references from wb_reqtrans.c

---
 source3/lib/wb_reqtrans.c | 37 -------------------------------------
 1 file changed, 37 deletions(-)

(limited to 'source3/lib')

diff --git a/source3/lib/wb_reqtrans.c b/source3/lib/wb_reqtrans.c
index e1c67491c0..dbea8b6686 100644
--- a/source3/lib/wb_reqtrans.c
+++ b/source3/lib/wb_reqtrans.c
@@ -25,32 +25,6 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 
-bool async_req_is_wbcerr(struct async_req *req, wbcErr *pwbc_err)
-{
-	enum async_req_state state;
-	uint64_t error;
-	if (!async_req_is_error(req, &state, &error)) {
-		*pwbc_err = WBC_ERR_SUCCESS;
-		return false;
-	}
-
-	switch (state) {
-	case ASYNC_REQ_USER_ERROR:
-		*pwbc_err = error;
-		break;
-	case ASYNC_REQ_TIMED_OUT:
-		*pwbc_err = WBC_ERR_UNKNOWN_FAILURE;
-		break;
-	case ASYNC_REQ_NO_MEMORY:
-		*pwbc_err = WBC_ERR_NO_MEMORY;
-		break;
-	default:
-		*pwbc_err = WBC_ERR_UNKNOWN_FAILURE;
-		break;
-	}
-	return true;
-}
-
 wbcErr map_wbc_err_from_errno(int error)
 {
 	switch(error) {
@@ -65,17 +39,6 @@ wbcErr map_wbc_err_from_errno(int error)
 	}
 }
 
-wbcErr async_req_simple_recv_wbcerr(struct async_req *req)
-{
-	wbcErr wbc_err;
-
-	if (async_req_is_wbcerr(req, &wbc_err)) {
-		return wbc_err;
-	}
-
-	return WBC_ERR_SUCCESS;
-}
-
 bool tevent_req_is_wbcerr(struct tevent_req *req, wbcErr *pwbc_err)
 {
 	enum tevent_req_state state;
-- 
cgit 


From 382d8069adcc49e351eef63d86036ae553b119a2 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Mon, 16 Mar 2009 16:38:15 -0700
Subject: Add some appropriate const. Jeremy.

---
 source3/lib/util.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'source3/lib')

diff --git a/source3/lib/util.c b/source3/lib/util.c
index ec794ca74e..613cc1eae7 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -290,7 +290,7 @@ struct user_auth_info *user_auth_info_init(TALLOC_CTX *mem_ctx)
 	return result;
 }
 
-const char *get_cmdline_auth_info_username(struct user_auth_info *auth_info)
+const char *get_cmdline_auth_info_username(const struct user_auth_info *auth_info)
 {
 	if (!auth_info->username) {
 		return "";
@@ -308,7 +308,7 @@ void set_cmdline_auth_info_username(struct user_auth_info *auth_info,
 	}
 }
 
-const char *get_cmdline_auth_info_password(struct user_auth_info *auth_info)
+const char *get_cmdline_auth_info_password(const struct user_auth_info *auth_info)
 {
 	if (!auth_info->password) {
 		return "";
@@ -346,7 +346,7 @@ bool set_cmdline_auth_info_signing_state(struct user_auth_info *auth_info,
 	return true;
 }
 
-int get_cmdline_auth_info_signing_state(struct user_auth_info *auth_info)
+int get_cmdline_auth_info_signing_state(const struct user_auth_info *auth_info)
 {
 	return auth_info->signing_state;
 }
@@ -357,7 +357,7 @@ void set_cmdline_auth_info_use_kerberos(struct user_auth_info *auth_info,
         auth_info->use_kerberos = b;
 }
 
-bool get_cmdline_auth_info_use_kerberos(struct user_auth_info *auth_info)
+bool get_cmdline_auth_info_use_kerberos(const struct user_auth_info *auth_info)
 {
 	return auth_info->use_kerberos;
 }
@@ -380,23 +380,23 @@ void set_cmdline_auth_info_use_machine_account(struct user_auth_info *auth_info)
 	auth_info->use_machine_account = true;
 }
 
-bool get_cmdline_auth_info_got_pass(struct user_auth_info *auth_info)
+bool get_cmdline_auth_info_got_pass(const struct user_auth_info *auth_info)
 {
 	return auth_info->got_pass;
 }
 
-bool get_cmdline_auth_info_smb_encrypt(struct user_auth_info *auth_info)
+bool get_cmdline_auth_info_smb_encrypt(const struct user_auth_info *auth_info)
 {
 	return auth_info->smb_encrypt;
 }
 
-bool get_cmdline_auth_info_use_machine_account(struct user_auth_info *auth_info)
+bool get_cmdline_auth_info_use_machine_account(const struct user_auth_info *auth_info)
 {
 	return auth_info->use_machine_account;
 }
 
 struct user_auth_info *get_cmdline_auth_info_copy(TALLOC_CTX *mem_ctx,
-						  struct user_auth_info *src)
+						  const struct user_auth_info *src)
 {
 	struct user_auth_info *result;
 
-- 
cgit 


From d27be1d5fa3fdcaac07b527ad14b0d10ef27c0bb Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 16 Mar 2009 14:45:42 +0100
Subject: s3:events: make use of tevent_common_loop_wait()

metze
---
 source3/lib/events.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'source3/lib')

diff --git a/source3/lib/events.c b/source3/lib/events.c
index 8c56941829..d0374121ce 100644
--- a/source3/lib/events.c
+++ b/source3/lib/events.c
@@ -181,17 +181,6 @@ static int s3_event_loop_once(struct tevent_context *ev, const char *location)
 	return 0;
 }
 
-static int s3_event_loop_wait(struct tevent_context *ev, const char *location)
-{
-	int ret = 0;
-
-	while (ret == 0) {
-		ret = s3_event_loop_once(ev, location);
-	}
-
-	return ret;
-}
-
 void event_context_reinit(struct tevent_context *ev)
 {
 	tevent_common_context_destructor(ev);
@@ -246,7 +235,7 @@ static const struct tevent_ops s3_event_ops = {
 	.add_timer	= tevent_common_add_timer,
 	.add_signal	= tevent_common_add_signal,
 	.loop_once	= s3_event_loop_once,
-	.loop_wait	= s3_event_loop_wait,
+	.loop_wait	= tevent_common_loop_wait,
 };
 
 static bool s3_tevent_init(void)
-- 
cgit 


From 6c290586e41b3f5f7748a5b8c782be67cafe6c57 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 16 Mar 2009 15:06:52 +0100
Subject: s3:events: add support for immediate events

metze
---
 source3/lib/events.c | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'source3/lib')

diff --git a/source3/lib/events.c b/source3/lib/events.c
index d0374121ce..90d86c6c79 100644
--- a/source3/lib/events.c
+++ b/source3/lib/events.c
@@ -91,6 +91,11 @@ bool run_events(struct tevent_context *ev,
 		return true;
 	}
 
+	if (ev->immediate_events &&
+	    tevent_common_loop_immediate(ev)) {
+		return true;
+	}
+
 	GetTimeOfDay(&now);
 
 	if ((ev->timer_events != NULL)
@@ -227,15 +232,16 @@ void dump_event_list(struct tevent_context *ev)
 }
 
 static const struct tevent_ops s3_event_ops = {
-	.context_init	= s3_event_context_init,
-	.add_fd		= tevent_common_add_fd,
-	.set_fd_close_fn= tevent_common_fd_set_close_fn,
-	.get_fd_flags	= tevent_common_fd_get_flags,
-	.set_fd_flags	= tevent_common_fd_set_flags,
-	.add_timer	= tevent_common_add_timer,
-	.add_signal	= tevent_common_add_signal,
-	.loop_once	= s3_event_loop_once,
-	.loop_wait	= tevent_common_loop_wait,
+	.context_init		= s3_event_context_init,
+	.add_fd			= tevent_common_add_fd,
+	.set_fd_close_fn	= tevent_common_fd_set_close_fn,
+	.get_fd_flags		= tevent_common_fd_get_flags,
+	.set_fd_flags		= tevent_common_fd_set_flags,
+	.add_timer		= tevent_common_add_timer,
+	.schedule_immediate	= tevent_common_schedule_immediate,
+	.add_signal		= tevent_common_add_signal,
+	.loop_once		= s3_event_loop_once,
+	.loop_wait		= tevent_common_loop_wait,
 };
 
 static bool s3_tevent_init(void)
-- 
cgit 


From 8dd1faaa2992851f6852ba7ea4498445af5faadd Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Tue, 17 Mar 2009 14:53:06 -0700
Subject: Remove the global "struct cm_cred_struct" and associated calls, make
 callers pass in a struct user_auth_info * instead. This commit causes
 smbc_set_credentials() to print out a message telling callers to use
 smbc_set_credentials_with_fallback() instead, as smbc_set_credentials() has a
 broken API (no SMBCCTX * pointer). No more global variables used in the
 connection manager API for client dfs calls. Jeremy.

---
 source3/lib/netapi/cm.c | 32 ++++++++++++++++----------------
 source3/lib/util.c      | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 16 deletions(-)

(limited to 'source3/lib')

diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c
index 43ebed6c22..b676ae63dd 100644
--- a/source3/lib/netapi/cm.c
+++ b/source3/lib/netapi/cm.c
@@ -29,36 +29,36 @@ static WERROR libnetapi_open_ipc_connection(struct libnetapi_ctx *ctx,
 					    const char *server_name,
 					    struct cli_state **cli)
 {
+	struct user_auth_info *auth_info = NULL;
 	struct cli_state *cli_ipc = NULL;
 
 	if (!ctx || !cli || !server_name) {
 		return WERR_INVALID_PARAM;
 	}
 
-	cli_cm_set_signing_state(Undefined);
-
-	if (ctx->use_kerberos) {
-		cli_cm_set_use_kerberos();
-	}
-
-	if (ctx->password) {
-		cli_cm_set_password(ctx->password);
-	}
-	if (ctx->username) {
-		cli_cm_set_username(ctx->username);
+	auth_info = user_auth_info_init(NULL);
+	if (!auth_info) {
+		return WERR_NOMEM;
 	}
+	auth_info->signing_state = Undefined;
+	set_cmdline_auth_info_use_kerberos(auth_info, ctx->use_kerberos);
+	set_cmdline_auth_info_password(auth_info, ctx->password);
+	set_cmdline_auth_info_username(auth_info, ctx->username);
 
 	if (ctx->username && ctx->username[0] &&
 	    ctx->password && ctx->password[0] &&
 	    ctx->use_kerberos) {
-		cli_cm_set_fallback_after_kerberos();
+		set_cmdline_auth_info_fallback_after_kerberos(auth_info, true);
 	}
 
 	cli_ipc = cli_cm_open(ctx, NULL,
-			      server_name, "IPC$",
-			      false, false,
-			      PROTOCOL_NT1,
-			      0, 0x20);
+				server_name, "IPC$",
+				auth_info,
+				false, false,
+				PROTOCOL_NT1,
+				0, 0x20);
+	TALLOC_FREE(auth_info);
+
 	if (!cli_ipc) {
 		libnetapi_set_error_string(ctx,
 			"Failed to connect to IPC$ share on %s", server_name);
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 613cc1eae7..80a807d7e4 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -320,6 +320,9 @@ void set_cmdline_auth_info_password(struct user_auth_info *auth_info,
 				    const char *password)
 {
 	TALLOC_FREE(auth_info->password);
+	if (password == NULL) {
+		password = "";
+	}
 	auth_info->password = talloc_strdup(auth_info, password);
 	if (!auth_info->password) {
 		exit(ENOMEM);
@@ -362,6 +365,17 @@ bool get_cmdline_auth_info_use_kerberos(const struct user_auth_info *auth_info)
 	return auth_info->use_kerberos;
 }
 
+void set_cmdline_auth_info_fallback_after_kerberos(struct user_auth_info *auth_info,
+					bool b)
+{
+	auth_info->fallback_after_kerberos = b;
+}
+
+bool get_cmdline_auth_info_fallback_after_kerberos(const struct user_auth_info *auth_info)
+{
+	return auth_info->fallback_after_kerberos;
+}
+
 /* This should only be used by lib/popt_common.c JRA */
 void set_cmdline_auth_info_use_krb5_ticket(struct user_auth_info *auth_info)
 {
@@ -455,6 +469,32 @@ bool set_cmdline_auth_info_machine_account_creds(struct user_auth_info *auth_inf
 	return true;
 }
 
+/****************************************************************************
+ Ensure we have a password if one not given.
+****************************************************************************/
+
+void set_cmdline_auth_info_getpass(struct user_auth_info *auth_info)
+{
+	char *label = NULL;
+	char *pass;
+	TALLOC_CTX *frame;
+
+	if (get_cmdline_auth_info_got_pass(auth_info) ||
+			get_cmdline_auth_info_use_kerberos(auth_info)) {
+		/* Already got one... */
+		return;
+	}
+
+	frame = talloc_stackframe();
+	label = talloc_asprintf(frame, "Enter %s's password: ",
+			get_cmdline_auth_info_username(auth_info));
+	pass = getpass(label);
+	if (pass) {
+		set_cmdline_auth_info_password(auth_info, pass);
+	}
+	TALLOC_FREE(frame);
+}
+
 /****************************************************************************
  Add a gid to an array of gids if it's not already there.
 ****************************************************************************/
-- 
cgit 


From 7a85a87edf3a589235b932a3c802278e78da4ec5 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Wed, 18 Mar 2009 12:22:22 +0100
Subject: s3-rpc_parse: remove unused BUFFER5 and UNISTR3.

Guenther
---
 source3/lib/util_unistr.c | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'source3/lib')

diff --git a/source3/lib/util_unistr.c b/source3/lib/util_unistr.c
index 4e78d1b064..840e8e06da 100644
--- a/source3/lib/util_unistr.c
+++ b/source3/lib/util_unistr.c
@@ -383,22 +383,6 @@ void unistr2_to_ascii(char *dest, const UNISTR2 *str, size_t maxlen)
 	pull_ucs2(NULL, dest, str->buffer, maxlen, str->uni_str_len*2, STR_NOALIGN);
 }
 
-#if 0
-/*******************************************************************
- Convert a (little-endian) UNISTR3 structure to an ASCII string.
-********************************************************************/
-
-void unistr3_to_ascii(char *dest, const UNISTR3 *str, size_t maxlen)
-{
-	if ((str == NULL) || (str->uni_str_len == 0)) {
-		*dest='\0';
-		return;
-	}
-	pull_ucs2(NULL, dest, str->str.buffer, maxlen, str->uni_str_len*2,
-	          STR_NOALIGN);
-}
-#endif
-
 /*******************************************************************
  Duplicate a UNISTR2 string into a null terminated char*
  using a talloc context.
-- 
cgit 


From 531af136f9dd5c6050f78948837294aed02de440 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Wed, 18 Mar 2009 22:49:41 +0100
Subject: s3: remove POLICY_HND.

Guenther
---
 source3/lib/netapi/group.c | 12 ++++++------
 source3/lib/netapi/user.c  |  4 ++--
 source3/lib/util.c         |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'source3/lib')

diff --git a/source3/lib/netapi/group.c b/source3/lib/netapi/group.c
index 617bde2c9a..189902a78e 100644
--- a/source3/lib/netapi/group.c
+++ b/source3/lib/netapi/group.c
@@ -33,7 +33,7 @@ WERROR NetGroupAdd_r(struct libnetapi_ctx *ctx,
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
-	POLICY_HND connect_handle, domain_handle, group_handle;
+	struct policy_handle connect_handle, domain_handle, group_handle;
 	struct lsa_String lsa_group_name;
 	struct dom_sid2 *domain_sid = NULL;
 	uint32_t rid = 0;
@@ -223,7 +223,7 @@ WERROR NetGroupDel_r(struct libnetapi_ctx *ctx,
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
-	POLICY_HND connect_handle, domain_handle, group_handle;
+	struct policy_handle connect_handle, domain_handle, group_handle;
 	struct lsa_String lsa_group_name;
 	struct dom_sid2 *domain_sid = NULL;
 	int i = 0;
@@ -384,7 +384,7 @@ WERROR NetGroupSetInfo_r(struct libnetapi_ctx *ctx,
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
-	POLICY_HND connect_handle, domain_handle, group_handle;
+	struct policy_handle connect_handle, domain_handle, group_handle;
 	struct lsa_String lsa_group_name;
 	struct dom_sid2 *domain_sid = NULL;
 
@@ -624,7 +624,7 @@ WERROR NetGroupGetInfo_r(struct libnetapi_ctx *ctx,
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
-	POLICY_HND connect_handle, domain_handle, group_handle;
+	struct policy_handle connect_handle, domain_handle, group_handle;
 	struct lsa_String lsa_group_name;
 	struct dom_sid2 *domain_sid = NULL;
 
@@ -742,7 +742,7 @@ WERROR NetGroupAddUser_r(struct libnetapi_ctx *ctx,
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
-	POLICY_HND connect_handle, domain_handle, group_handle;
+	struct policy_handle connect_handle, domain_handle, group_handle;
 	struct lsa_String lsa_group_name, lsa_user_name;
 	struct dom_sid2 *domain_sid = NULL;
 
@@ -863,7 +863,7 @@ WERROR NetGroupDelUser_r(struct libnetapi_ctx *ctx,
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
-	POLICY_HND connect_handle, domain_handle, group_handle;
+	struct policy_handle connect_handle, domain_handle, group_handle;
 	struct lsa_String lsa_group_name, lsa_user_name;
 	struct dom_sid2 *domain_sid = NULL;
 
diff --git a/source3/lib/netapi/user.c b/source3/lib/netapi/user.c
index 9d7f299f59..8cc65a6e9e 100644
--- a/source3/lib/netapi/user.c
+++ b/source3/lib/netapi/user.c
@@ -352,7 +352,7 @@ WERROR NetUserAdd_r(struct libnetapi_ctx *ctx,
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
-	POLICY_HND connect_handle, domain_handle, user_handle;
+	struct policy_handle connect_handle, domain_handle, user_handle;
 	struct lsa_String lsa_account_name;
 	struct dom_sid2 *domain_sid = NULL;
 	union samr_UserInfo *user_info = NULL;
@@ -496,7 +496,7 @@ WERROR NetUserDel_r(struct libnetapi_ctx *ctx,
 	struct rpc_pipe_client *pipe_cli = NULL;
 	NTSTATUS status;
 	WERROR werr;
-	POLICY_HND connect_handle, builtin_handle, domain_handle, user_handle;
+	struct policy_handle connect_handle, builtin_handle, domain_handle, user_handle;
 	struct lsa_String lsa_account_name;
 	struct samr_Ids user_rids, name_types;
 	struct dom_sid2 *domain_sid = NULL;
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 80a807d7e4..75fd82709a 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -3142,9 +3142,9 @@ NTSTATUS split_ntfs_stream_name(TALLOC_CTX *mem_ctx, const char *fname,
 	return NT_STATUS_OK;
 }
 
-bool is_valid_policy_hnd(const POLICY_HND *hnd)
+bool is_valid_policy_hnd(const struct policy_handle *hnd)
 {
-	POLICY_HND tmp;
+	struct policy_handle tmp;
 	ZERO_STRUCT(tmp);
 	return (memcmp(&tmp, hnd, sizeof(tmp)) != 0);
 }
-- 
cgit 


From 0dfdb7b911ed4fe013fc4a22a8c3a28620277a67 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 19 Mar 2009 09:06:38 +0100
Subject: s3:lib/util_sock: use sys_recv() instead of sys_read() on sockets

This ways the pcap support in socket wrapper sees the received data.

metze
---
 source3/lib/util_sock.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/lib')

diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index de5b232aac..a0dbca1a00 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -519,7 +519,7 @@ NTSTATUS read_socket_with_timeout(int fd, char *buf,
 		}
 
 		while (nread < mincnt) {
-			readret = sys_read(fd, buf + nread, maxcnt - nread);
+			readret = sys_recv(fd, buf + nread, maxcnt - nread, 0);
 
 			if (readret == 0) {
 				DEBUG(5,("read_socket_with_timeout: "
@@ -588,7 +588,7 @@ NTSTATUS read_socket_with_timeout(int fd, char *buf,
 			return NT_STATUS_IO_TIMEOUT;
 		}
 
-		readret = sys_read(fd, buf+nread, maxcnt-nread);
+		readret = sys_recv(fd, buf+nread, maxcnt-nread, 0);
 
 		if (readret == 0) {
 			/* we got EOF on the file descriptor */
-- 
cgit 


From f603903cb01f0c1e8bba66ab8c5229c3e7724ae3 Mon Sep 17 00:00:00 2001
From: Dan Sledz <dan.sledz@isilon.com>
Date: Thu, 19 Mar 2009 21:53:34 +0000
Subject: s3: Fix a free of an uninitialized variable in
 winbind_get_sid_aliases

---
 source3/lib/winbind_util.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source3/lib')

diff --git a/source3/lib/winbind_util.c b/source3/lib/winbind_util.c
index 64f5fb421a..df095b9e91 100644
--- a/source3/lib/winbind_util.c
+++ b/source3/lib/winbind_util.c
@@ -322,7 +322,6 @@ bool winbind_get_sid_aliases(TALLOC_CTX *mem_ctx,
 			       &rids,
 			       &num_rids);
 	if (ret != WBC_ERR_SUCCESS) {
-		wbcFreeMemory(rids);
 		return false;
 	}
 
-- 
cgit 


From 3a4638db0351368d3b148bf547546f28fa0b1479 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Thu, 19 Mar 2009 23:56:12 +0100
Subject: add a versiontest program to print samba_version_string().

This is to allow for testing samba_version_string() without
the need to compile any of the larger binaries like smbd or net...

Michael
---
 source3/lib/version_test.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 source3/lib/version_test.c

(limited to 'source3/lib')

diff --git a/source3/lib/version_test.c b/source3/lib/version_test.c
new file mode 100644
index 0000000000..880cfeb084
--- /dev/null
+++ b/source3/lib/version_test.c
@@ -0,0 +1,26 @@
+/*
+ *  Unix SMB/CIFS implementation.
+ *  version_test - test program for samba_version_strion()
+ *  Copyright (C) Michael Adam 2009
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "includes.h"
+
+int main(void)
+{
+	printf("%s\n", samba_version_string());
+	return 0;
+}
-- 
cgit 


From d2e348b191ada5492538b7bdae1bb7cd3f639aba Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Fri, 20 Mar 2009 11:17:50 +0100
Subject: s3-netapi: Fix Coverity #776 (REVERSE_INULL).

Guenther
---
 source3/lib/netapi/group.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'source3/lib')

diff --git a/source3/lib/netapi/group.c b/source3/lib/netapi/group.c
index 189902a78e..c09632a857 100644
--- a/source3/lib/netapi/group.c
+++ b/source3/lib/netapi/group.c
@@ -1276,6 +1276,7 @@ WERROR NetGroupGetUsers_r(struct libnetapi_ctx *ctx,
 
 	*r->out.buffer = NULL;
 	*r->out.entries_read = 0;
+	*r->out.total_entries = 0;
 
 	switch (r->in.level) {
 		case 0:
@@ -1364,13 +1365,8 @@ WERROR NetGroupGetUsers_r(struct libnetapi_ctx *ctx,
 		}
 	}
 
-	if (r->out.entries_read) {
-		*r->out.entries_read = entries_read;
-	}
-
-	if (r->out.total_entries) {
-		*r->out.total_entries = entries_read;
-	}
+	*r->out.entries_read = entries_read;
+	*r->out.total_entries = entries_read;
 
 	werr = WERR_OK;
 
-- 
cgit 


From f2243e8197aa064adea3da2a4d1c08250668943f Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Fri, 20 Mar 2009 11:19:59 +0100
Subject: s3-netapi: Fix Coverity #775 (REVERSE_INULL).

Guenther
---
 source3/lib/netapi/user.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'source3/lib')

diff --git a/source3/lib/netapi/user.c b/source3/lib/netapi/user.c
index 8cc65a6e9e..b1bd27af2a 100644
--- a/source3/lib/netapi/user.c
+++ b/source3/lib/netapi/user.c
@@ -3242,6 +3242,7 @@ WERROR NetUserGetLocalGroups_r(struct libnetapi_ctx *ctx,
 
 	*r->out.buffer = NULL;
 	*r->out.entries_read = 0;
+	*r->out.total_entries = 0;
 
 	switch (r->in.level) {
 		case 0:
@@ -3402,12 +3403,8 @@ WERROR NetUserGetLocalGroups_r(struct libnetapi_ctx *ctx,
 		}
 	}
 
-	if (r->out.entries_read) {
-		*r->out.entries_read = entries_read;
-	}
-	if (r->out.total_entries) {
-		*r->out.total_entries = entries_read;
-	}
+	*r->out.entries_read = entries_read;
+	*r->out.total_entries = entries_read;
 
  done:
 	if (ctx->disable_policy_handle_cache) {
-- 
cgit 


From 3a6133d70202ef80ead4203740c000be5e93b288 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Fri, 20 Mar 2009 11:21:36 +0100
Subject: s3-netapi: Fix Coverity #774 (REVERSE_INULL).

Guenther
---
 source3/lib/netapi/user.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'source3/lib')

diff --git a/source3/lib/netapi/user.c b/source3/lib/netapi/user.c
index b1bd27af2a..e760a8b1de 100644
--- a/source3/lib/netapi/user.c
+++ b/source3/lib/netapi/user.c
@@ -2806,6 +2806,7 @@ WERROR NetUserGetGroups_r(struct libnetapi_ctx *ctx,
 
 	*r->out.buffer = NULL;
 	*r->out.entries_read = 0;
+	*r->out.total_entries = 0;
 
 	switch (r->in.level) {
 		case 0:
@@ -2899,12 +2900,8 @@ WERROR NetUserGetGroups_r(struct libnetapi_ctx *ctx,
 		}
 	}
 
-	if (r->out.entries_read) {
-		*r->out.entries_read = entries_read;
-	}
-	if (r->out.total_entries) {
-		*r->out.total_entries = entries_read;
-	}
+	*r->out.entries_read = entries_read;
+	*r->out.total_entries = entries_read;
 
  done:
 	if (ctx->disable_policy_handle_cache) {
-- 
cgit