summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2002-01-26 22:27:12 +0000
committerGerald Carter <jerry@samba.org>2002-01-26 22:27:12 +0000
commit485b4ff5ecf40620a0a6fedc0929dacdb28876a2 (patch)
tree6df531e3ad6e58fd797fdfc3be14650a8feffeb8
parent59b17ff5970fd932a45ae45b4f0d4f1b2da12704 (diff)
downloadsamba-485b4ff5ecf40620a0a6fedc0929dacdb28876a2.tar.gz
samba-485b4ff5ecf40620a0a6fedc0929dacdb28876a2.tar.bz2
samba-485b4ff5ecf40620a0a6fedc0929dacdb28876a2.zip
merge from APPLIANCE_HEAD
(This used to be commit e3b87ffc8c26f9fd4c3e8181897b8812b7dc4ab6)
-rw-r--r--source3/printing/nt_printing.c36
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c6
2 files changed, 4 insertions, 38 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index f36b6bdafc..86802fc81b 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -2720,40 +2720,6 @@ WERROR mod_a_printer(NT_PRINTER_INFO_LEVEL printer, uint32 level)
}
/****************************************************************************
- Add a printer. This is called from ADDPRINTER(EX) and also SETPRINTER.
- We split this out from mod_a_printer as it updates the id's and timestamps.
-****************************************************************************/
-
-WERROR add_a_printer(NT_PRINTER_INFO_LEVEL printer, uint32 level)
-{
- WERROR result;
-
- dump_a_printer(printer, level);
-
- switch (level)
- {
- case 2:
- {
- /*
- * Update the changestamp. See comments in mod_a_printer()
- * --jerry
- */
-
- printer.info_2->changeid = rev_changeid();
- printer.info_2->c_setprinter++;
-
- result=update_a_printer_2(printer.info_2);
- break;
- }
- default:
- result=WERR_UNKNOWN_LEVEL;
- break;
- }
-
- return result;
-}
-
-/****************************************************************************
Initialize printer devmode & data with previously saved driver init values.
****************************************************************************/
static uint32 set_driver_init_2(NT_PRINTER_INFO_LEVEL_2 *info_ptr)
@@ -3923,7 +3889,7 @@ WERROR printer_write_default_dev(int snum, const PRINTER_DEFAULT *printer_defaul
* Finally write back to the tdb.
*/
- result = add_a_printer(*printer, 2);
+ result = mod_a_printer(*printer, 2);
done:
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index c96612eef2..02f7085119 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -4597,7 +4597,7 @@ static BOOL nt_printer_info_level_equal(NT_PRINTER_INFO_LEVEL *p1,
PI_CHECK_INT(averageppm);
/* Yuck - don't check the printername or servername as the
- add_a_printer() code plays games with them. You can't
+ mod_a_printer() code plays games with them. You can't
change the printername or the sharename through this interface
in Samba. */
@@ -4735,7 +4735,7 @@ static WERROR update_printer(pipes_struct *p, POLICY_HND *handle, uint32 level,
}
/* Update printer info */
- result = add_a_printer(*printer, 2);
+ result = mod_a_printer(*printer, 2);
done:
free_a_printer(&printer, 2);
@@ -5911,7 +5911,7 @@ static WERROR spoolss_addprinterex_level_2( pipes_struct *p, const UNISTR2 *uni_
set_driver_init(printer, 2);
/* write the ASCII on disk */
- err = add_a_printer(*printer, 2);
+ err = mod_a_printer(*printer, 2);
if (!W_ERROR_IS_OK(err)) {
free_a_printer(&printer,2);
return err;