1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-19 10:03:58 +03:00

Merge from appliance-head

(This used to be commit 6d39df7cf84d391bb4dd55d9a26f9f5a6368f46f)
This commit is contained in:
Tim Potter 2000-10-20 03:23:36 +00:00
parent 849f0d0fd0
commit 4e1d306945

View File

@ -2080,7 +2080,11 @@ static BOOL construct_printer_info_2(fstring servername, PRINTER_INFO_2 *printer
else else
fstrcpy(sl, '\0'); fstrcpy(sl, '\0');
snprintf(chaine2, sizeof(chaine)-1, "%s%s%s", servername, sl, ntprinter->info_2->printername); if (!strchr(ntprinter->info_2->printername, '\\')) {
snprintf(chaine2, sizeof(chaine)-1, "%s%s%s", servername, sl, ntprinter->info_2->printername);
} else {
pstrcpy(chaine2, ntprinter->info_2->printername);
}
init_unistr(&printer->servername, chaine); /* servername*/ init_unistr(&printer->servername, chaine); /* servername*/
init_unistr(&printer->printername, chaine2); /* printername*/ init_unistr(&printer->printername, chaine2); /* printername*/