summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-12-23 22:57:11 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-12-23 22:57:11 +0100
commitbd64688c6aca6512efd0bd7d95000579beea3119 (patch)
treec05cf6c484f03b967c95508c13cce8179e08d3bc /source4/lib
parent32e03f9fa55a4c897ade55b9b2e3740facfdcfd1 (diff)
downloadsamba-bd64688c6aca6512efd0bd7d95000579beea3119.tar.gz
samba-bd64688c6aca6512efd0bd7d95000579beea3119.tar.bz2
samba-bd64688c6aca6512efd0bd7d95000579beea3119.zip
Fix more compiler warnings in various places.
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/events/tevent_s4.c4
-rw-r--r--source4/lib/ldb/modules/operational.c8
2 files changed, 4 insertions, 8 deletions
diff --git a/source4/lib/events/tevent_s4.c b/source4/lib/events/tevent_s4.c
index 80267fdd22..e711e43761 100644
--- a/source4/lib/events/tevent_s4.c
+++ b/source4/lib/events/tevent_s4.c
@@ -17,8 +17,8 @@
*/
#include "includes.h"
-#include "tevent.h"
-#include "tevent_internal.h"
+#include <tevent.h>
+#include <tevent_internal.h>
/*
this is used to catch debug messages from events
diff --git a/source4/lib/ldb/modules/operational.c b/source4/lib/ldb/modules/operational.c
index 345441b5e1..4193f916a0 100644
--- a/source4/lib/ldb/modules/operational.c
+++ b/source4/lib/ldb/modules/operational.c
@@ -268,16 +268,12 @@ static int operational_search(struct ldb_module *module, struct ldb_request *req
}
}
- /* use new set of attrs if any */
- if (search_attrs == NULL) {
- search_attrs = req->op.search.attrs;
- }
-
ret = ldb_build_search_req_ex(&down_req, module->ldb, ac,
req->op.search.base,
req->op.search.scope,
req->op.search.tree,
- (const char * const *)search_attrs,
+ /* use new set of attrs if any */
+ search_attrs?req->op.search.attrs:search_attrs,
req->controls,
ac, operational_callback,
req);