sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

merge from 2.2

Browse Source 
(This used to be commit 50fa21c995)
This commit is contained in:
Gerald Carter 2002-02-13 16:44:49 +00:00
parent 9fc99e3c55
commit 8cd8cfd4cf
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/libsmb/cli_lsarpc.c
View File

@ -1075,8 +1075,8 @@ machine %s. Error was : %s.\n", remote_machine, cli_errstr(&cli) ));
} }
if (!attempt_netbios_session_request(&cli, global_myname, remote_machine, &cli.dest_ip)) { if (!attempt_netbios_session_request(&cli, global_myname, remote_machine, &cli.dest_ip)) {
DEBUG(0,("fetch_domain_sid: machine %s rejected the NetBIOS \ DEBUG(0,("fetch_domain_sid: machine %s rejected the NetBIOS session request.\n",
session request. Error was %s\n", remote_machine, cli_errstr(&cli) )); remote_machine));
goto done; goto done;
} }

5
source3/libsmb/clierror.c
View File

@ -80,6 +80,11 @@ char *cli_errstr(struct cli_state *cli)
uint8 errclass; uint8 errclass;
int i; int i;
if (!cli->initialised) {
fstrcpy(cli_error_message, "[Programmer's error] cli_errstr called on unitialized cli_stat struct!\n");
return cli_error_message;
}
/* Case #1: RAP error */ /* Case #1: RAP error */
if (cli->rap_error) { if (cli->rap_error) {
for (i = 0; rap_errmap[i].message != NULL; i++) { for (i = 0; rap_errmap[i].message != NULL; i++) {

4
source3/rpc_client/cli_spoolss_notify.c
View File

@ -69,8 +69,8 @@ BOOL spoolss_connect_to_client( struct cli_state *cli, char *remote_machine)
} }
if (!attempt_netbios_session_request(cli, global_myname, remote_machine, &cli->dest_ip)) { if (!attempt_netbios_session_request(cli, global_myname, remote_machine, &cli->dest_ip)) {
DEBUG(0,("connect_to_client: machine %s rejected the NetBIOS session request. Error was %s\n", remote_machine, cli_errstr(cli) )); DEBUG(0,("connect_to_client: machine %s rejected the NetBIOS session request.\n",
cli_shutdown(cli); remote_machine));
return False; return False;
} }