diff options
| author | Tim Potter <tpot@samba.org> | 2002-03-20 00:24:35 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2002-03-20 00:24:35 +0000 |
| commit | 0cd5dd67ce12f02d3d20568e901ef7666caa8472 (patch) | |
| tree | a50b8a5868995538a14d3390f0ee33cdcfdc3c0d | |
| parent | 4ee3eb8987ddee5247f542dd71a1bb1a6f2f880e (diff) | |
| download | samba-0cd5dd67ce12f02d3d20568e901ef7666caa8472.tar.gz samba-0cd5dd67ce12f02d3d20568e901ef7666caa8472.tar.bz2 samba-0cd5dd67ce12f02d3d20568e901ef7666caa8472.zip | |
Merge from app-head:
> Don't put two copies of the server name in construct_printer_info_1()
(This used to be commit 47b1003bc5a069e84cb20df507022e5ff3e93832)
| -rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index e351f125bf..c4a2334c16 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -2832,12 +2832,12 @@ static BOOL construct_printer_info_1(uint32 flags, PRINTER_INFO_1 *printer, int if (*ntprinter->info_2->comment == '\0') { init_unistr(&printer->comment, lp_comment(snum)); - slprintf(chaine,sizeof(chaine)-1,"%s%s,%s,%s",get_called_name(), ntprinter->info_2->printername, + slprintf(chaine,sizeof(chaine)-1,"%s,%s,%s", ntprinter->info_2->printername, ntprinter->info_2->drivername, lp_comment(snum)); } else { init_unistr(&printer->comment, ntprinter->info_2->comment); /* saved comment. */ - slprintf(chaine,sizeof(chaine)-1,"%s%s,%s,%s",get_called_name(), ntprinter->info_2->printername, + slprintf(chaine,sizeof(chaine)-1,"%s,%s,%s", ntprinter->info_2->printername, ntprinter->info_2->drivername, ntprinter->info_2->comment); } |