sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-04 05:18:06 +03:00
Code

fix a bug in printer name handling that jerry reported.

Browse Source 
names can be \\server -> print server
\\server\printer -> printer
printer -> printer

	J.F.
This commit is contained in:
Jean-François Micouleau 0001-01-01 00:00:00 +00:00
parent fcd100eec5
commit ec576722b7
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/rpc_server/srv_spoolss_nt.c
View File

@ -371,7 +371,7 @@ static BOOL set_printer_hnd_printertype(Printer_entry *Printer, char *handlename
} }
/* it's a print server */ /* it's a print server */
if (!strchr(handlename+2, '\\')) { if (*handlename=='\\' && *(handlename+1)=='\\' && !strchr(handlename+2, '\\')) {
DEBUGADD(4,("Printer is a print server\n")); DEBUGADD(4,("Printer is a print server\n"));
Printer->printer_type = PRINTER_HANDLE_IS_PRINTSERVER; Printer->printer_type = PRINTER_HANDLE_IS_PRINTSERVER;
} }
@ -407,8 +407,13 @@ static BOOL set_printer_hnd_name(Printer_entry *Printer, char *handlename)
if (Printer->printer_type!=PRINTER_HANDLE_IS_PRINTER) if (Printer->printer_type!=PRINTER_HANDLE_IS_PRINTER)
return False; return False;
aprinter=strchr(handlename+2, '\\'); if (*handlename=='\\') {
aprinter++; aprinter=strchr(handlename+2, '\\');
aprinter++;
}
else {
aprinter=handlename;
}
DEBUGADD(5,("searching for [%s] (len=%d)\n", aprinter, strlen(aprinter))); DEBUGADD(5,("searching for [%s] (len=%d)\n", aprinter, strlen(aprinter)));