summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2002-09-11 15:18:53 +0000
committerVolker Lendecke <vlendec@samba.org>2002-09-11 15:18:53 +0000
commit66f90f97bf13d7f1b9aa18cc59ba1d15b2d8d4b8 (patch)
tree2362baaf4ceb70bab9d9f6da271d8a655a33b84d
parentcdca2ad1c4ca396e130a1091063c3aeedbb06cd8 (diff)
downloadsamba-66f90f97bf13d7f1b9aa18cc59ba1d15b2d8d4b8.tar.gz
samba-66f90f97bf13d7f1b9aa18cc59ba1d15b2d8d4b8.tar.bz2
samba-66f90f97bf13d7f1b9aa18cc59ba1d15b2d8d4b8.zip
Merge the cli_shutdown change from 2_2. All except one call to
attempt_netbios_... assumed that cli_shutdown was _not_ called on error anyway... Volker (This used to be commit f0c741594f0dad2da16b1d5692dd56a48b4157f1)
-rw-r--r--source3/libsmb/cliconnect.c2
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 1f3635d6d7..6c5c5e0b0e 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -1306,7 +1306,6 @@ BOOL attempt_netbios_session_request(struct cli_state *cli, char *srchost, char
DEBUG(0,("attempt_netbios_session_request: %s rejected the session for name *SMBSERVER \
with error %s.\n", desthost, cli_errstr(cli) ));
- cli_shutdown(cli);
return False;
}
@@ -1323,7 +1322,6 @@ with error %s.\n", desthost, cli_errstr(cli) ));
!cli_session_request(cli, &calling, &smbservername)) {
DEBUG(0,("attempt_netbios_session_request: %s rejected the session for \
name *SMBSERVER with error %s\n", desthost, cli_errstr(cli) ));
- cli_shutdown(cli);
return False;
}
}
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 8b5dcd3b6c..5231e9e681 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -2296,6 +2296,7 @@ static BOOL spoolss_connect_to_client(struct cli_state *the_cli, char *remote_ma
if (!attempt_netbios_session_request(the_cli, global_myname, remote_machine, &the_cli->dest_ip)) {
DEBUG(0,("connect_to_client: machine %s rejected the NetBIOS session request.\n",
remote_machine));
+ cli_shutdown(the_cli);
return False;
}