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

fixed previous bug spotted by Elrond in get_printerdrivernumber().

Browse Source 
Thought I had already committed this.





jerry
This commit is contained in:
Gerald Carter 0001-01-01 00:00:00 +00:00
parent e291500903
commit 2ceb704c3d
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
source/smbd/lanman.c
View File

@ -542,16 +542,16 @@ static void fill_printq_info_52(connection_struct *conn, int snum, int uLevel,
desc->errcode=NERR_notsupported;
return;
}
else
/* lookup the long printer driver name in the file description */
for (i=0;lines[i] && !ok;i++)
{
/* lookup the long printer driver name in the file description */
for (i=0;lines[i] && !ok;i++)
p = lines[i];
if (next_token(&p,tok,":",sizeof(tok)) &&
(strlen(lp_printerdriver(snum)) == strlen(tok)) &&
(!strncmp(tok,lp_printerdriver(snum),strlen(lp_printerdriver(snum)))))
{
p = lines[i];
if (next_token(&p,tok,":",sizeof(tok)) &&
(strlen(lp_printerdriver(snum)) == strlen(tok)) &&
(!strncmp(tok,lp_printerdriver(snum),strlen(lp_printerdriver(snum)))))
ok = True;
ok = True;
}
}
}
@ -777,17 +777,18 @@ static int get_printerdrivernumber(int snum)
if (!lines)
{
DEBUG(3,("Can't open %s - %s\n", lp_driverfile(snum),strerror(errno)));
return 0;
}
else
/* lookup the long printer driver name in the file description */
for (i=0;lines[i] && !ok;i++)
{
/* lookup the long printer driver name in the file description */
for (i=0;lines[i] && !ok;i++)
p = lines[i];
if (next_token(&p,tok,":",sizeof(tok)) &&
(strlen(lp_printerdriver(snum)) == strlen(tok)) &&
(!strncmp(tok,lp_printerdriver(snum),strlen(lp_printerdriver(snum)))))
{
p = lines[i];
if (next_token(&p,tok,":",sizeof(tok)) &&
(strlen(lp_printerdriver(snum)) == strlen(tok)) &&
(!strncmp(tok,lp_printerdriver(snum),strlen(lp_printerdriver(snum)))))
ok = True;
ok = True;
}
}
}