diff options
author | Tim Potter <tpot@samba.org> | 2000-10-20 03:23:36 +0000 |
---|---|---|
committer | Tim Potter <tpot@samba.org> | 2000-10-20 03:23:36 +0000 |
commit | 4e1d30694555fe2b7b2684686778c7b143aea41e (patch) | |
tree | be7ea73725725095df6f30d6b17e5feac52ffa34 | |
parent | 849f0d0fd0394463e1dc2367a5fabeff5f973afb (diff) | |
download | samba-4e1d30694555fe2b7b2684686778c7b143aea41e.tar.gz samba-4e1d30694555fe2b7b2684686778c7b143aea41e.tar.bz2 samba-4e1d30694555fe2b7b2684686778c7b143aea41e.zip |
Merge from appliance-head
(This used to be commit 6d39df7cf84d391bb4dd55d9a26f9f5a6368f46f)
-rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index 72c87ae819..928ac45046 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -2080,7 +2080,11 @@ static BOOL construct_printer_info_2(fstring servername, PRINTER_INFO_2 *printer else 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->printername, chaine2); /* printername*/ |