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

Save & restore the port name correctly.

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison 0001-01-01 00:00:00 +00:00
parent 902ada6379
commit c0648c981e
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/rpc_server/srv_spoolss_nt.c
View File

@ -1935,12 +1935,7 @@ static BOOL construct_printer_info_2(fstring servername, PRINTER_INFO_2 *printer
init_unistr(&printer->servername, chaine); /* servername*/
init_unistr(&printer->printername, chaine2); /* printername*/
init_unistr(&printer->sharename, lp_servicename(snum)); /* sharename */
#if 1 /* JRATEST */
/* We need to determine the correct model for this..... */
init_unistr(&printer->portname, lp_printername(snum)); /* port */
#else
init_unistr(&printer->portname, lp_servicename(snum)); /* port */
#endif
init_unistr(&printer->portname, ntprinter->info_2->portname); /* port */
init_unistr(&printer->drivername, ntprinter->info_2->drivername); /* drivername */
if (*ntprinter->info_2->comment == '\0')
@ -1966,9 +1961,6 @@ static BOOL construct_printer_info_2(fstring servername, PRINTER_INFO_2 *printer
if((printer->devmode = construct_dev_mode(snum, servername)) == NULL) {
DEBUG(8, ("Returning NULL Devicemode!\n"));
#if 0 /* JFMTEST */
goto err;
#endif
}
if (ntprinter->info_2->secdesc_buf && ntprinter->info_2->secdesc_buf->len != 0) {
@ -1985,13 +1977,6 @@ static BOOL construct_printer_info_2(fstring servername, PRINTER_INFO_2 *printer
free_a_printer(&ntprinter, 2);
safe_free(queue);
return True;
err:
if (ntprinter)
free_a_printer(&ntprinter, 2);
safe_free(queue);
return False;
}
/********************************************************************