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

couple of merges from APP_HEAD

Browse Source 
* performance optimization in enumprinterdataex() when keyname is empty
  * fix a few typos in comments
  * reload services after addprinter_command()

dump registry data in ascii when the key is REG_SZ or REG_MULTI_SZ
This commit is contained in:
Gerald Carter 0001-01-01 00:00:00 +00:00
parent e5acebbe79
commit 3fc90ea1d9
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/rpc_parse/parse_spoolss.c
View File

@ -1372,7 +1372,7 @@ BOOL spoolss_io_r_getprinterdata(const char *desc, SPOOL_R_GETPRINTERDATA *r_u,
return False; return False;
} }
if (!prs_uint8s(False,"data", ps, depth, r_u->data, r_u->size)) if (!prs_uint8s( r_u->type&(REG_SZ|REG_MULTI_SZ), "data", ps, depth, r_u->data, r_u->size ))
return False; return False;
if (!prs_align(ps)) if (!prs_align(ps))

29
source/rpc_server/srv_spoolss_nt.c
View File

@ -615,7 +615,7 @@ static BOOL is_monitoring_event(Printer_entry *p, uint16 notify_type,
/* /*
* Flags should always be zero when the change notify * Flags should always be zero when the change notify
* is registered by the cliebnt's spooler. A user Win32 app * is registered by the client's spooler. A user Win32 app
* might use the flags though instead of the NOTIFY_OPTION_INFO * might use the flags though instead of the NOTIFY_OPTION_INFO
* --jerry * --jerry
*/ */
@ -5936,6 +5936,13 @@ static WERROR update_printer(pipes_struct *p, POLICY_HND *handle, uint32 level,
result = WERR_ACCESS_DENIED; result = WERR_ACCESS_DENIED;
goto done; goto done;
} }
/*
* make sure we actually reload the services after
* this as smb.conf could have a new section in it
* .... shouldn't .... but could
*/
reload_services(False);
} }
/* /*
@ -8871,11 +8878,24 @@ WERROR _spoolss_enumprinterdataex(pipes_struct *p, SPOOL_Q_ENUMPRINTERDATAEX *q_
DEBUG(4,("_spoolss_enumprinterdataex\n")); DEBUG(4,("_spoolss_enumprinterdataex\n"));
if (!Printer) { if (!Printer) {
DEBUG(2,("_spoolss_enumprinterdata: Invalid handle (%s:%u:%u1<).\n", OUR_HANDLE(handle))); DEBUG(2,("_spoolss_enumprinterdataex: Invalid handle (%s:%u:%u1<).\n", OUR_HANDLE(handle)));
return WERR_BADFID; return WERR_BADFID;
} }
/* first get the printer off of disk */ /*
* first check for a keyname of NULL or "". Win2k seems to send
* this a lot and we should send back WERR_INVALID_PARAM
* no need to spend time looking up the printer in this case.
* --jerry
*/
unistr2_to_dos(key, &q_u->key, sizeof(key) - 1);
if ( !strlen(key) ) {
result = WERR_INVALID_PARAM;
goto done;
}
/* get the printer off of disk */
if (!get_printer_snum(p,handle, &snum)) if (!get_printer_snum(p,handle, &snum))
return WERR_BADFID; return WERR_BADFID;
@ -8971,7 +8991,8 @@ WERROR _spoolss_enumprinterdataex(pipes_struct *p, SPOOL_Q_ENUMPRINTERDATAEX *q_
done: done:
free_a_printer(&printer, 2); if ( printer )
free_a_printer(&printer, 2);
return result; return result;
} }