mirror of
https://github.com/samba-team/samba.git
synced 2025-02-04 17:47:26 +03:00
r21862: add the cups comment and location lookup to get_a_printer_2_default() as well
This commit is contained in:
parent
e859e1fdcd
commit
5b47c4e5c2
@ -3743,9 +3743,7 @@ static void map_to_os2_driver(fstring drivername)
|
||||
****************************************************************************/
|
||||
static WERROR get_a_printer_2_default(NT_PRINTER_INFO_LEVEL_2 *info, const char *servername, const char* sharename)
|
||||
{
|
||||
int snum;
|
||||
|
||||
snum = lp_servicenumber(sharename);
|
||||
int snum = lp_servicenumber(sharename);
|
||||
|
||||
slprintf(info->servername, sizeof(info->servername)-1, "\\\\%s", servername);
|
||||
slprintf(info->printername, sizeof(info->printername)-1, "\\\\%s\\%s",
|
||||
@ -3769,6 +3767,15 @@ static WERROR get_a_printer_2_default(NT_PRINTER_INFO_LEVEL_2 *info, const char
|
||||
fstrcpy(info->printprocessor, "winprint");
|
||||
fstrcpy(info->datatype, "RAW");
|
||||
|
||||
#ifdef HAVE_CUPS
|
||||
if ( (enum printing_types)lp_printing(snum) == PRINT_CUPS ) {
|
||||
/* Pull the location and comment strings from cups if we don't
|
||||
already have one */
|
||||
if ( !strlen(info->location) || !strlen(info->comment) )
|
||||
cups_pull_comment_location( info );
|
||||
}
|
||||
#endif
|
||||
|
||||
info->attributes = PRINTER_ATTRIBUTE_SAMBA;
|
||||
|
||||
info->starttime = 0; /* Minutes since 12:00am GMT */
|
||||
|
Loading…
x
Reference in New Issue
Block a user