diff options
| author | Jeremy Allison <jra@samba.org> | 2002-09-09 19:02:53 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2002-09-09 19:02:53 +0000 |
| commit | 05e2aba52f9b027bbab7c65cc02fd5c83d3c61aa (patch) | |
| tree | 769bc018bca7adb043f2c74ce9b22ef26d1916fe | |
| parent | 29d7ee7e0d6eea53a596973d157d377fbaaab3d1 (diff) | |
| download | samba-05e2aba52f9b027bbab7c65cc02fd5c83d3c61aa.tar.gz samba-05e2aba52f9b027bbab7c65cc02fd5c83d3c61aa.tar.xz samba-05e2aba52f9b027bbab7c65cc02fd5c83d3c61aa.zip | |
Merged Volkers (correct) fix from 2.2 for crash on unable to connect.
Jeremy.
| -rw-r--r-- | source/libsmb/clientgen.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/libsmb/clientgen.c b/source/libsmb/clientgen.c index facf361a6b4..6b6a2acd3b8 100644 --- a/source/libsmb/clientgen.c +++ b/source/libsmb/clientgen.c @@ -212,9 +212,8 @@ struct cli_state *cli_initialise(struct cli_state *cli) alloced_cli = True; } - if (cli->initialised) { - cli_shutdown(cli); - } + if (cli->initialised) + cli_close_connection(cli); ZERO_STRUCTP(cli); @@ -286,11 +285,14 @@ void cli_close_connection(struct cli_state *cli) data_blob_free(&cli->secblob); - if (cli->mem_ctx) + if (cli->mem_ctx) { talloc_destroy(cli->mem_ctx); + cli->mem_ctx = NULL; + } if (cli->fd != -1) close(cli->fd); + cli->fd = -1; } /**************************************************************************** |