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

r11860: BUG 3156: don't use find_service() when explicitly looking for a printer as the username map might get in the way

Browse Source 
(This used to be commit 46bf28c81c)
This commit is contained in:
Gerald Carter 2005-11-22 15:52:22 +00:00 committed by Gerald (Jerry) Carter
parent 4826f9d413
commit f2ecd4fed0
2 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source3/registry/reg_printing.c
View File

@ -227,7 +227,16 @@ static int key_printers_fetch_keys( const char *key, REGSUBKEY_CTR *subkeys )
reg_split_path( printers_key, &printername, &printerdatakey ); reg_split_path( printers_key, &printername, &printerdatakey );
if ( find_service(printername) == -1 /* validate the printer name */
for (snum=0; snum<n_services; snum++) {
if ( !lp_snum_ok(snum) || !lp_print_ok(snum) )
continue;
if (strequal( lp_servicename(snum), printername ) )
break;
}
if ( snum>=n_services
|| !W_ERROR_IS_OK( get_a_printer(NULL, &printer, 2, printername) ) ) || !W_ERROR_IS_OK( get_a_printer(NULL, &printer, 2, printername) ) )
{ {
return -1; return -1;

30
source3/rpc_server/srv_spoolss_nt.c
View File

@ -479,29 +479,30 @@ static BOOL set_printer_hnd_name(Printer_entry *Printer, char *handlename)
DEBUGADD(5, ("searching for [%s]\n", aprinter )); DEBUGADD(5, ("searching for [%s]\n", aprinter ));
/* Search all sharenames first as this is easier than pulling /* Search all sharenames first as this is easier than pulling
the printer_info_2 off of disk */ the printer_info_2 off of disk. Don't use find_service() since
that calls out to map_username() */
snum = find_service(aprinter);
if ( lp_snum_ok(snum) && lp_print_ok(snum) ) {
found = True;
fstrcpy( sname, aprinter );
}
/* do another loop to look for printernames */ /* do another loop to look for printernames */
for (snum=0; !found && snum<n_services; snum++) { for (snum=0; !found && snum<n_services; snum++) {
/* no point in checking if this is not a printer or /* no point going on if this is not a printer */
we aren't allowing printername != sharename */
if ( !(lp_snum_ok(snum) if ( !(lp_snum_ok(snum) && lp_print_ok(snum)) )
&& lp_print_ok(snum)
&& !lp_force_printername(snum)) )
{
continue; continue;
fstrcpy(sname, lp_servicename(snum));
if ( strequal( aprinter, sname ) ) {
found = True;
break;
} }
/* no point looking up the printer object if
we aren't allowing printername != sharename */
if ( lp_force_printername(snum) )
continue;
fstrcpy(sname, lp_servicename(snum)); fstrcpy(sname, lp_servicename(snum));
printer = NULL; printer = NULL;
@ -524,6 +525,7 @@ static BOOL set_printer_hnd_name(Printer_entry *Printer, char *handlename)
if ( strequal(printername, aprinter) ) { if ( strequal(printername, aprinter) ) {
found = True; found = True;
break;
} }
DEBUGADD(10, ("printername: %s\n", printername)); DEBUGADD(10, ("printername: %s\n", printername));