summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-04-07 23:36:15 +0200
committerGünther Deschner <gd@samba.org>2010-04-07 23:53:18 +0200
commit65c5b786ca4dcb3fda47eea24848232548caf443 (patch)
tree82bd2622eaa859906ddc4145251fd6eb9ce59a20 /source3
parent34ada1d540b0eedbe1dd573a47146f0309ed4875 (diff)
downloadsamba-65c5b786ca4dcb3fda47eea24848232548caf443.tar.gz
samba-65c5b786ca4dcb3fda47eea24848232548caf443.tar.bz2
samba-65c5b786ca4dcb3fda47eea24848232548caf443.zip
s3-spoolss: Fix some issues in _spoolss_AddForm.
Found by torture test. Guenther
Diffstat (limited to 'source3')
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c20
1 files changed, 19 insertions, 1 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index c5c2dfbf1b..236f15a9fc 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -7883,6 +7883,7 @@ WERROR _spoolss_AddForm(pipes_struct *p,
int count=0;
nt_forms_struct *list=NULL;
Printer_entry *Printer = find_printer_index_by_hnd(p, r->in.handle);
+ int i;
DEBUG(5,("_spoolss_AddForm\n"));
@@ -7893,7 +7894,7 @@ WERROR _spoolss_AddForm(pipes_struct *p,
}
- /* forms can be added on printer of on the print server handle */
+ /* forms can be added on printer or on the print server handle */
if ( Printer->printer_type == SPLHND_PRINTER )
{
@@ -7919,6 +7920,16 @@ WERROR _spoolss_AddForm(pipes_struct *p,
goto done;
}
+ switch (form->flags) {
+ case SPOOLSS_FORM_USER:
+ case SPOOLSS_FORM_BUILTIN:
+ case SPOOLSS_FORM_PRINTER:
+ break;
+ default:
+ status = WERR_INVALID_PARAM;
+ goto done;
+ }
+
/* can't add if builtin */
if (get_a_builtin_ntform_by_string(form->form_name, &tmpForm)) {
@@ -7928,6 +7939,13 @@ WERROR _spoolss_AddForm(pipes_struct *p,
count = get_ntforms(&list);
+ for (i=0; i < count; i++) {
+ if (strequal(form->form_name, list[i].name)) {
+ status = WERR_FILE_EXISTS;
+ goto done;
+ }
+ }
+
if(!add_a_form(&list, form, &count)) {
status = WERR_NOMEM;
goto done;