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

Applied Michael Sweet's patch, with one minor signal change.

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison 0001-01-01 00:00:00 +00:00
parent 1aef522452
commit 8d1dab74c2
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source/client/smbspool.c
View File

@ -115,7 +115,7 @@ static int smb_print(struct cli_state *, char *, FILE *);
copies = atoi(argv[4]);
/*
* Fine the URI...
* Find the URI...
*/
if (strncmp(argv[0], "smb://", 6) == 0)
@ -205,11 +205,33 @@ static int smb_print(struct cli_state *, char *, FILE *);
load_interfaces();
if ((cli = smb_connect(workgroup, server, printer, username, password)) == NULL)
do
{
perror("ERROR: Unable to connect to SAMBA host");
return (1);
if ((cli = smb_connect(workgroup, server, printer, username, password)) == NULL)
{
if (getenv("CLASS") == NULL)
{
perror("ERROR: Unable to connect to SAMBA host, will retry in 60 seconds...");
sleep (60);
}
else
{
perror("ERROR: Unable to connect to SAMBA host, trying next printer...");
return (1);
}
}
}
while (cli == NULL);
/*
* Now that we are connected to the server, ignore SIGTERM so that we
* can finish out any page data the driver sends (e.g. to eject the
* current page... Only ignore SIGTERM if we are printing data from
* stdin (otherwise you can't cancel raw jobs...)
*/
if (argc < 7)
CatchSignal(SIGTERM, SIG_IGN);
/*
* Queue the job...