diff options
| author | Andreas Schneider <asn@samba.org> | 2010-04-01 11:53:01 +0200 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2010-07-27 10:27:08 -0400 |
| commit | a879bba0acc8682949a2ca38e23f354baa6f96d1 (patch) | |
| tree | fd92aa69799658865704d5ff9b4017c3e19c347f | |
| parent | 76f72fe5157cb6dd37f1beaa0ff6473bd67c6b0f (diff) | |
| download | samba-a879bba0acc8682949a2ca38e23f354baa6f96d1.tar.gz samba-a879bba0acc8682949a2ca38e23f354baa6f96d1.tar.bz2 samba-a879bba0acc8682949a2ca38e23f354baa6f96d1.zip | |
s3-spoolss: Migrated spoolss_SetForm to the winreg function.
Signed-off-by: Jim McDonough <jmcd@samba.org>
| -rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index ad4cabb77a..8bcbea881e 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -7796,14 +7796,12 @@ WERROR _spoolss_SetForm(pipes_struct *p, struct spoolss_SetForm *r) { struct spoolss_AddFormInfo1 *form = r->in.info.info1; - nt_forms_struct tmpForm; + const char *form_name = r->in.form_name; int snum = -1; WERROR status = WERR_OK; NT_PRINTER_INFO_LEVEL *printer = NULL; SE_PRIV se_printop = SE_PRINT_OPERATOR; - int count=0; - nt_forms_struct *list=NULL; Printer_entry *Printer = find_printer_index_by_hnd(p, r->in.handle); DEBUG(5,("_spoolss_SetForm\n")); @@ -7841,18 +7839,14 @@ WERROR _spoolss_SetForm(pipes_struct *p, goto done; } - /* can't set if builtin */ - if (get_a_builtin_ntform_by_string(form->form_name, &tmpForm)) { - status = WERR_INVALID_PARAM; + status = winreg_printer_setform1(p->mem_ctx, + p->server_info, + form_name, + form); + if (!W_ERROR_IS_OK(status)) { goto done; } - count = get_ntforms(&list); - update_a_form(&list, form, count); - become_root(); - write_ntforms(&list, count); - unbecome_root(); - /* * ChangeID must always be set if this is a printer */ @@ -7864,7 +7858,6 @@ WERROR _spoolss_SetForm(pipes_struct *p, done: if ( printer ) free_a_printer(&printer, 2); - SAFE_FREE(list); return status; } |