summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-09-19 06:22:54 +0000
committerTim Potter <tpot@samba.org>2003-09-19 06:22:54 +0000
commit7bb5182cf8ce3aa2b41a55083fedb8ae6d61d92a (patch)
treeed44c6c6b4766bf77d30c7e6c3dede60f142cb0f /source3
parent48a5e3fa09f1f5fc2ca7c7b5a17b58999092861a (diff)
downloadsamba-7bb5182cf8ce3aa2b41a55083fedb8ae6d61d92a.tar.gz
samba-7bb5182cf8ce3aa2b41a55083fedb8ae6d61d92a.tar.bz2
samba-7bb5182cf8ce3aa2b41a55083fedb8ae6d61d92a.zip
Merge from 3.0:
>Applied Steve Langasek's patch for bug #450. (This used to be commit 50ae61b674550082e30f7156f2a9129b7abebb14)
Diffstat (limited to 'source3')
-rw-r--r--source3/libsmb/trusts_util.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/libsmb/trusts_util.c b/source3/libsmb/trusts_util.c
index 4e02b29f92..c18641bc84 100644
--- a/source3/libsmb/trusts_util.c
+++ b/source3/libsmb/trusts_util.c
@@ -180,9 +180,10 @@ BOOL enumerate_domain_trusts( TALLOC_CTX *mem_ctx, const char *domain,
done:
/* cleanup */
-
- cli_nt_session_close( cli );
- cli_shutdown( cli );
+ if (cli) {
+ cli_nt_session_close( cli );
+ cli_shutdown( cli );
+ }
return NT_STATUS_IS_OK(result);
}