diff options
author | Andrew Tridgell <tridge@samba.org> | 2002-07-15 11:16:26 +0000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2002-07-15 11:16:26 +0000 |
commit | b0b28531c8cd76d3fcd95da08389d8a4d2e631a3 (patch) | |
tree | f6a31e883573fc26a93e6bc0529d36eefe734eae /source3/libsmb | |
parent | e90b65284812aaa5ff9e9935ce9bbad7791cbbcd (diff) | |
download | samba-b0b28531c8cd76d3fcd95da08389d8a4d2e631a3.tar.gz samba-b0b28531c8cd76d3fcd95da08389d8a4d2e631a3.tar.bz2 samba-b0b28531c8cd76d3fcd95da08389d8a4d2e631a3.zip |
more bug updates from head
(This used to be commit 8b769bf5bbbe54b1a39fd85cc24db09c1ab7faab)
Diffstat (limited to 'source3/libsmb')
-rw-r--r-- | source3/libsmb/cli_wkssvc.c | 3 | ||||
-rw-r--r-- | source3/libsmb/cliconnect.c | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/source3/libsmb/cli_wkssvc.c b/source3/libsmb/cli_wkssvc.c index 756ff61e5b..97b948bf62 100644 --- a/source3/libsmb/cli_wkssvc.c +++ b/source3/libsmb/cli_wkssvc.c @@ -40,7 +40,6 @@ NTSTATUS cli_wks_query_info(struct cli_state *cli, TALLOC_CTX *mem_ctx, prs_struct rbuf; WKS_Q_QUERY_INFO q_o; WKS_R_QUERY_INFO r_o; - NTSTATUS nt_status; if (cli == NULL || wks100 == NULL) return NT_STATUS_UNSUCCESSFUL; @@ -89,6 +88,6 @@ NTSTATUS cli_wks_query_info(struct cli_state *cli, TALLOC_CTX *mem_ctx, /* do clean up */ prs_mem_free(&rbuf); - return nt_status; + return NT_STATUS_OK; } diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index f0b02b97b0..472db69fd0 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -1119,11 +1119,6 @@ NTSTATUS cli_full_connection(struct cli_state **output_cli, struct in_addr ip; extern pstring global_myname; - if (!output_cli) { - DEBUG(0, ("output_cli is NULL!?!")); - SMB_ASSERT("output_cli for cli_full_connection was NULL.\n"); - } - if (!my_name) my_name = global_myname; |