[SCM] Samba Shared Repository - branch master updated
Volker Lendecke
vlendec at samba.org
Mon Jun 20 05:46:01 MDT 2011
The branch, master has been updated
via dc461ca s3: Fix the build, NAME_MAX not universally available
via f0ff6f3 Use tevent_req_oom
via 8e1b964 tevent: change version to 0.9.12
via c2a826b tevent: Add tevent_req_oom
from 580fedc tdb_compat: respect TDB_NO_FSYNC environment variable for tdb2.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit dc461cade5becec21f8d1f2bb74fcf1a977a5ec2
Author: Volker Lendecke <vl at samba.org>
Date: Mon Jun 20 12:09:06 2011 +0200
s3: Fix the build, NAME_MAX not universally available
Autobuild-User: Volker Lendecke <vlendec at samba.org>
Autobuild-Date: Mon Jun 20 13:45:21 CEST 2011 on sn-devel-104
commit f0ff6f390a14b0da8466096c0886f5c4860b977f
Author: Volker Lendecke <vl at samba.org>
Date: Sun Jun 19 21:10:01 2011 +0200
Use tevent_req_oom
This fixes a few Coverity errors
commit 8e1b9640e73bf08b161f6e9a3d86ec71708098a4
Author: Volker Lendecke <vl at samba.org>
Date: Mon Jun 20 11:43:51 2011 +0200
tevent: change version to 0.9.12
commit c2a826b10c403e1b4d7e6da1b41c89ed01d07f40
Author: Volker Lendecke <vl at samba.org>
Date: Sun Jun 19 20:55:46 2011 +0200
tevent: Add tevent_req_oom
This is a replacement for tevent_req_nomem(NULL, req)
-----------------------------------------------------------------------
Summary of changes:
.../ABI/{tevent-0.9.10.sigs => tevent-0.9.12.sigs} | 1 +
lib/tevent/tevent.h | 14 ++++++++++++++
lib/tevent/tevent_req.c | 7 ++++++-
lib/tevent/wscript | 2 +-
lib/tsocket/tsocket_helpers.c | 6 +++---
libcli/cldap/cldap.c | 4 ++--
source3/lib/fncall.c | 2 +-
source3/lib/tldap.c | 4 ++--
source3/libsmb/async_smb.c | 2 +-
source3/libsmb/cliconnect.c | 2 +-
source3/libsmb/namequery.c | 8 ++++----
source3/modules/vfs_shadow_copy2.c | 2 +-
source3/torture/wbc_async.c | 2 +-
source3/winbindd/wb_lookupsids.c | 6 +++---
source3/winbindd/winbindd_dual.c | 2 +-
source3/winbindd/winbindd_dual_ndr.c | 2 +-
source4/kdc/proxy.c | 2 +-
source4/ldap_server/ldap_server.c | 2 +-
source4/lib/messaging/messaging.c | 2 +-
source4/libcli/wrepl/winsrepl.c | 4 ++--
20 files changed, 48 insertions(+), 28 deletions(-)
copy lib/tevent/ABI/{tevent-0.9.10.sigs => tevent-0.9.12.sigs} (98%)
Changeset truncated at 500 lines:
diff --git a/lib/tevent/ABI/tevent-0.9.10.sigs b/lib/tevent/ABI/tevent-0.9.12.sigs
similarity index 98%
copy from lib/tevent/ABI/tevent-0.9.10.sigs
copy to lib/tevent/ABI/tevent-0.9.12.sigs
index 9adaba5..df9b08d 100644
--- a/lib/tevent/ABI/tevent-0.9.10.sigs
+++ b/lib/tevent/ABI/tevent-0.9.12.sigs
@@ -14,6 +14,7 @@ _tevent_req_done: void (struct tevent_req *, const char *)
_tevent_req_error: bool (struct tevent_req *, uint64_t, const char *)
_tevent_req_nomem: bool (const void *, struct tevent_req *, const char *)
_tevent_req_notify_callback: void (struct tevent_req *, const char *)
+_tevent_req_oom: void (struct tevent_req *, const char *)
_tevent_schedule_immediate: void (struct tevent_immediate *, struct tevent_context *, tevent_immediate_handler_t, void *, const char *, const char *)
tevent_backend_list: const char **(TALLOC_CTX *)
tevent_cleanup_pending_signal_handlers: void (struct tevent_signal *)
diff --git a/lib/tevent/tevent.h b/lib/tevent/tevent.h
index 38a4a9c..8204a28 100644
--- a/lib/tevent/tevent.h
+++ b/lib/tevent/tevent.h
@@ -995,6 +995,20 @@ bool _tevent_req_nomem(const void *p,
_tevent_req_nomem(p, req, __location__)
#endif
+#ifdef DOXYGEN
+/**
+ * @brief Indicate out of memory to a request
+ *
+ * @param[in] req The request being processed.
+ */
+void tevent_req_oom(struct tevent_req *req);
+#else
+void _tevent_req_oom(struct tevent_req *req,
+ const char *location);
+#define tevent_req_oom(req) \
+ _tevent_req_oom(req, __location__)
+#endif
+
/**
* @brief Finish a request before the caller had the change to set the callback.
*
diff --git a/lib/tevent/tevent_req.c b/lib/tevent/tevent_req.c
index b0c9c57..92697b7 100644
--- a/lib/tevent/tevent_req.c
+++ b/lib/tevent/tevent_req.c
@@ -123,6 +123,11 @@ bool _tevent_req_error(struct tevent_req *req,
return true;
}
+void _tevent_req_oom(struct tevent_req *req, const char *location)
+{
+ tevent_req_finish(req, TEVENT_REQ_NO_MEMORY, location);
+}
+
bool _tevent_req_nomem(const void *p,
struct tevent_req *req,
const char *location)
@@ -130,7 +135,7 @@ bool _tevent_req_nomem(const void *p,
if (p != NULL) {
return false;
}
- tevent_req_finish(req, TEVENT_REQ_NO_MEMORY, location);
+ _tevent_req_oom(req, location);
return true;
}
diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index 75c44c2..5dcd188 100644
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -1,7 +1,7 @@
#!/usr/bin/env python
APPNAME = 'tevent'
-VERSION = '0.9.11'
+VERSION = '0.9.12'
blddir = 'bin'
diff --git a/lib/tsocket/tsocket_helpers.c b/lib/tsocket/tsocket_helpers.c
index 3a41a3e..db6b614 100644
--- a/lib/tsocket/tsocket_helpers.c
+++ b/lib/tsocket/tsocket_helpers.c
@@ -73,7 +73,7 @@ struct tevent_req *tdgram_sendto_queue_send(TALLOC_CTX *mem_ctx,
tdgram_sendto_queue_trigger,
NULL);
if (!ok) {
- tevent_req_nomem(NULL, req);
+ tevent_req_oom(req);
goto post;
}
@@ -346,7 +346,7 @@ struct tevent_req *tstream_readv_pdu_queue_send(TALLOC_CTX *mem_ctx,
tstream_readv_pdu_queue_trigger,
NULL);
if (!ok) {
- tevent_req_nomem(NULL, req);
+ tevent_req_oom(req);
goto post;
}
@@ -453,7 +453,7 @@ struct tevent_req *tstream_writev_queue_send(TALLOC_CTX *mem_ctx,
tstream_writev_queue_trigger,
NULL);
if (!ok) {
- tevent_req_nomem(NULL, req);
+ tevent_req_oom(req);
goto post;
}
diff --git a/libcli/cldap/cldap.c b/libcli/cldap/cldap.c
index 59c54ea..a5a0e41 100644
--- a/libcli/cldap/cldap.c
+++ b/libcli/cldap/cldap.c
@@ -631,7 +631,7 @@ struct tevent_req *cldap_search_send(TALLOC_CTX *mem_ctx,
}
if (!tevent_req_set_endtime(req, state->caller.cldap->event.ctx, end)) {
- tevent_req_nomem(NULL, req);
+ tevent_req_oom(req);
goto post;
}
@@ -680,7 +680,7 @@ static void cldap_search_state_queue_done(struct tevent_req *subreq)
/* wait for incoming traffic */
if (!cldap_recvfrom_setup(state->caller.cldap)) {
- tevent_req_nomem(NULL, req);
+ tevent_req_oom(req);
return;
}
diff --git a/source3/lib/fncall.c b/source3/lib/fncall.c
index 4a013e9..6e6b7c9 100644
--- a/source3/lib/fncall.c
+++ b/source3/lib/fncall.c
@@ -266,7 +266,7 @@ struct tevent_req *fncall_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
return tevent_req_post(req, ev);
}
if (!fncall_set_pending(req, state->ctx, ev)) {
- tevent_req_nomem(NULL, req);
+ tevent_req_oom(req);
return tevent_req_post(req, ev);
}
return req;
diff --git a/source3/lib/tldap.c b/source3/lib/tldap.c
index c2f5b2c..8b04d00 100644
--- a/source3/lib/tldap.c
+++ b/source3/lib/tldap.c
@@ -541,7 +541,7 @@ static void tldap_msg_sent(struct tevent_req *subreq)
}
if (!tldap_msg_set_pending(req)) {
- tevent_req_nomem(NULL, req);
+ tevent_req_oom(req);
return;
}
}
@@ -1703,7 +1703,7 @@ static void tldap_search_done(struct tevent_req *subreq)
case TLDAP_RES_SEARCH_ENTRY:
case TLDAP_RES_SEARCH_REFERENCE:
if (!tldap_msg_set_pending(subreq)) {
- tevent_req_nomem(NULL, req);
+ tevent_req_oom(req);
return;
}
tevent_req_notify_callback(req);
diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 145e0ae..ee15cae 100644
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -369,7 +369,7 @@ struct tevent_req *cli_smb_req_create(TALLOC_CTX *mem_ctx,
if (cli->timeout) {
endtime = timeval_current_ofs_msec(cli->timeout);
if (!tevent_req_set_endtime(result, ev, endtime)) {
- tevent_req_nomem(NULL, result);
+ tevent_req_oom(result);
}
}
return result;
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index a9a1847..62e3a35 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -1365,7 +1365,7 @@ static void cli_sesssetup_blob_done(struct tevent_req *subreq)
* More to send
*/
if (!cli_sesssetup_blob_next(state, &subreq)) {
- tevent_req_nomem(NULL, req);
+ tevent_req_oom(req);
return;
}
tevent_req_set_callback(subreq, cli_sesssetup_blob_done, req);
diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 8d84374..dca740d 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -1595,7 +1595,7 @@ static struct tevent_req *name_queries_send(
if (!tevent_req_set_endtime(
subreq, state->ev,
timeval_current_ofs(0, state->timeout_msec * 1000))) {
- tevent_req_nomem(NULL, req);
+ tevent_req_oom(req);
return tevent_req_post(req, ev);
}
tevent_req_set_callback(subreq, name_queries_done, req);
@@ -1678,7 +1678,7 @@ static void name_queries_next(struct tevent_req *subreq)
if (!tevent_req_set_endtime(
subreq, state->ev,
timeval_current_ofs(0, state->timeout_msec * 1000))) {
- tevent_req_nomem(NULL, req);
+ tevent_req_oom(req);
return;
}
state->subreqs[state->num_sent] = subreq;
@@ -1915,7 +1915,7 @@ static struct tevent_req *query_wins_list_send(
}
if (!tevent_req_set_endtime(subreq, state->ev,
timeval_current_ofs(2, 0))) {
- tevent_req_nomem(NULL, req);
+ tevent_req_oom(req);
return tevent_req_post(req, ev);
}
tevent_req_set_callback(subreq, query_wins_list_done, req);
@@ -1962,7 +1962,7 @@ static void query_wins_list_done(struct tevent_req *subreq)
}
if (!tevent_req_set_endtime(subreq, state->ev,
timeval_current_ofs(2, 0))) {
- tevent_req_nomem(NULL, req);
+ tevent_req_oom(req);
return;
}
tevent_req_set_callback(subreq, query_wins_list_done, req);
diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c
index 1ed828b..ca33b6d 100644
--- a/source3/modules/vfs_shadow_copy2.c
+++ b/source3/modules/vfs_shadow_copy2.c
@@ -144,7 +144,7 @@ static char *shadow_copy2_insert_string(TALLOC_CTX *mem_ctx,
time_t snapshot)
{
struct tm snap_tm;
- char gmt[NAME_MAX+1];
+ fstring gmt;
size_t gmt_len;
if (localtime_r(&snapshot, &snap_tm) == 0) {
diff --git a/source3/torture/wbc_async.c b/source3/torture/wbc_async.c
index 182474c..9252b58 100644
--- a/source3/torture/wbc_async.c
+++ b/source3/torture/wbc_async.c
@@ -551,7 +551,7 @@ struct tevent_req *wb_trans_send(TALLOC_CTX *mem_ctx,
if (!tevent_queue_add(wb_ctx->queue, ev, req, wb_trans_trigger,
NULL)) {
- tevent_req_nomem(NULL, req);
+ tevent_req_oom(req);
return tevent_req_post(req, ev);
}
return req;
diff --git a/source3/winbindd/wb_lookupsids.c b/source3/winbindd/wb_lookupsids.c
index 92eee03..03b2ca9 100644
--- a/source3/winbindd/wb_lookupsids.c
+++ b/source3/winbindd/wb_lookupsids.c
@@ -481,7 +481,7 @@ static void wb_lookupsids_done(struct tevent_req *subreq)
&state->tmp_domains, &state->tmp_names.names[i],
state->res_domains, state->res_names,
res_sid_index)) {
- tevent_req_nomem(NULL, req);
+ tevent_req_oom(req);
return;
}
}
@@ -544,7 +544,7 @@ static void wb_lookupsids_single_done(struct tevent_req *subreq)
&src_domains, &src_name,
state->res_domains, state->res_names,
res_sid_index)) {
- tevent_req_nomem(NULL, req);
+ tevent_req_oom(req);
return;
}
state->single_sids_done += 1;
@@ -619,7 +619,7 @@ static void wb_lookupsids_lookuprids_done(struct tevent_req *subreq)
&src_domains, &src_name,
state->res_domains, state->res_names,
res_sid_index)) {
- tevent_req_nomem(NULL, req);
+ tevent_req_oom(req);
return;
}
}
diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 9f82737..5bf90b1 100644
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -127,7 +127,7 @@ struct tevent_req *wb_child_request_send(TALLOC_CTX *mem_ctx,
if (!tevent_queue_add(child->queue, ev, req,
wb_child_request_trigger, NULL)) {
- tevent_req_nomem(NULL, req);
+ tevent_req_oom(req);
return tevent_req_post(req, ev);
}
return req;
diff --git a/source3/winbindd/winbindd_dual_ndr.c b/source3/winbindd/winbindd_dual_ndr.c
index fb89c3f..f5f143f 100644
--- a/source3/winbindd/winbindd_dual_ndr.c
+++ b/source3/winbindd/winbindd_dual_ndr.c
@@ -144,7 +144,7 @@ static void wbint_bh_raw_call_done(struct tevent_req *subreq)
state->response->extra_data.data,
state->response->length - sizeof(struct winbindd_response));
if (state->response->extra_data.data && !state->out_data.data) {
- tevent_req_nomem(NULL, req);
+ tevent_req_oom(req);
return;
}
diff --git a/source4/kdc/proxy.c b/source4/kdc/proxy.c
index 98db956..324bfb8 100644
--- a/source4/kdc/proxy.c
+++ b/source4/kdc/proxy.c
@@ -556,7 +556,7 @@ static void kdc_tcp_proxy_read_pdu_done(struct tevent_req *subreq)
*/
state->out = data_blob_talloc(state, raw.data + 4, raw.length - 4);
if (state->out.length != raw.length - 4) {
- tevent_req_nomem(NULL, req);
+ tevent_req_oom(req);
return;
}
diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index 2d45766..411be29 100644
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -708,7 +708,7 @@ static struct tevent_req *ldapsrv_process_call_send(TALLOC_CTX *mem_ctx,
ok = tevent_queue_add(call_queue, ev, req,
ldapsrv_process_call_trigger, NULL);
if (!ok) {
- tevent_req_nomem(NULL, req);
+ tevent_req_oom(req);
return tevent_req_post(req, ev);
}
diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
index 13fc188..484f22b 100644
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -1178,7 +1178,7 @@ static void irpc_bh_raw_call_incoming_handler(struct irpc_request *irpc,
m->ndr->data + m->ndr->offset,
m->ndr->data_size - m->ndr->offset);
if ((m->ndr->data_size - m->ndr->offset) > 0 && !state->out_data.data) {
- tevent_req_nomem(NULL, req);
+ tevent_req_oom(req);
return;
}
diff --git a/source4/libcli/wrepl/winsrepl.c b/source4/libcli/wrepl/winsrepl.c
index 72c040d..c7f1ad0 100644
--- a/source4/libcli/wrepl/winsrepl.c
+++ b/source4/libcli/wrepl/winsrepl.c
@@ -201,7 +201,7 @@ struct tevent_req *wrepl_connect_send(TALLOC_CTX *mem_ctx,
wrepl_connect_trigger,
NULL);
if (!ok) {
- tevent_req_nomem(NULL, req);
+ tevent_req_oom(req);
return tevent_req_post(req, ev);
}
@@ -382,7 +382,7 @@ struct tevent_req *wrepl_request_send(TALLOC_CTX *mem_ctx,
wrepl_request_trigger,
NULL);
if (!ok) {
- tevent_req_nomem(NULL, req);
+ tevent_req_oom(req);
return tevent_req_post(req, ev);
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list