summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-09-10 10:43:31 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:18:09 -0500
commitaab0622a75767d5d10068236b5dabcb75e321ae5 (patch)
treec380056c52022f1f7820646e598e030ef1dc7d5b
parentcac69cdd743c8ce93631a0ddd37a8d3344ce8259 (diff)
downloadsamba-aab0622a75767d5d10068236b5dabcb75e321ae5.tar.gz
samba-aab0622a75767d5d10068236b5dabcb75e321ae5.tar.bz2
samba-aab0622a75767d5d10068236b5dabcb75e321ae5.zip
r18325: more warnings and one compile error on aix fixed
(This used to be commit 6e7e151432a31e48a67679df3966d2227d555317)
-rw-r--r--source4/torture/libnet/libnet_domain.c6
-rw-r--r--source4/torture/libnet/libnet_user.c2
-rw-r--r--source4/torture/rpc/samba3rpc.c2
-rw-r--r--source4/torture/smb2/setinfo.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/source4/torture/libnet/libnet_domain.c b/source4/torture/libnet/libnet_domain.c
index 48bbd1eb2b..24431de54a 100644
--- a/source4/torture/libnet/libnet_domain.c
+++ b/source4/torture/libnet/libnet_domain.c
@@ -180,7 +180,7 @@ BOOL torture_domain_close_lsa(struct torture_context *torture)
{
BOOL ret = True;
NTSTATUS status;
- TALLOC_CTX *mem_ctx;
+ TALLOC_CTX *mem_ctx=NULL;
struct libnet_context *ctx;
struct lsa_String domain_name;
struct dcerpc_binding *binding;
@@ -254,7 +254,7 @@ BOOL torture_domain_open_samr(struct torture_context *torture)
NTSTATUS status;
const char *binding;
struct libnet_context *ctx;
- struct event_context *evt_ctx;
+ struct event_context *evt_ctx=NULL;
TALLOC_CTX *mem_ctx;
struct policy_handle domain_handle, handle;
struct lsa_String name;
@@ -312,7 +312,7 @@ BOOL torture_domain_close_samr(struct torture_context *torture)
{
BOOL ret = True;
NTSTATUS status;
- TALLOC_CTX *mem_ctx;
+ TALLOC_CTX *mem_ctx=NULL;
struct libnet_context *ctx;
struct lsa_String domain_name;
struct dcerpc_binding *binding;
diff --git a/source4/torture/libnet/libnet_user.c b/source4/torture/libnet/libnet_user.c
index 9fc61af2e0..8924e15a4b 100644
--- a/source4/torture/libnet/libnet_user.c
+++ b/source4/torture/libnet/libnet_user.c
@@ -524,7 +524,7 @@ BOOL torture_userinfo_api(struct torture_context *torture)
const char *binding;
BOOL ret = True;
NTSTATUS status;
- TALLOC_CTX *mem_ctx, *prep_mem_ctx;
+ TALLOC_CTX *mem_ctx=NULL, *prep_mem_ctx;
struct libnet_context *ctx;
struct dcerpc_pipe *p;
struct policy_handle h;
diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
index d0b9a25920..adebce34ef 100644
--- a/source4/torture/rpc/samba3rpc.c
+++ b/source4/torture/rpc/samba3rpc.c
@@ -1458,7 +1458,7 @@ static struct dom_sid *name2sid(TALLOC_CTX *mem_ctx,
if (!NT_STATUS_IS_OK(status)) {
printf("LookupNames failed - %s\n", nt_errstr(status));
talloc_free(tmp_ctx);
- return False;
+ return NULL;
}
result = dom_sid_add_rid(mem_ctx, l.out.domains->domains[0].sid,
diff --git a/source4/torture/smb2/setinfo.c b/source4/torture/smb2/setinfo.c
index 08cce7693a..ee09c7351c 100644
--- a/source4/torture/smb2/setinfo.c
+++ b/source4/torture/smb2/setinfo.c
@@ -50,7 +50,7 @@ BOOL torture_smb2_setinfo(struct torture_context *torture)
struct security_ace ace;
struct security_descriptor *sd;
struct dom_sid *test_sid;
- NTSTATUS status, status2;
+ NTSTATUS status, status2=NT_STATUS_OK;
const char *call_name;
time_t basetime = (time(NULL) - 86400) & ~1;
int n = time(NULL) % 100;