summaryrefslogtreecommitdiff
path: root/source3/rpc_server/srv_spoolss_nt.c
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2002-07-11 03:27:12 +0000
committerGerald Carter <jerry@samba.org>2002-07-11 03:27:12 +0000
commit0aadcff8ec1caa7e8a8cc9c5738bc8d57be7b24f (patch)
tree8ecd1f3c024b7045ef7c6175ac1426aac153e678 /source3/rpc_server/srv_spoolss_nt.c
parent496e85dd812b932caf5e6169e03df6b31a378966 (diff)
downloadsamba-0aadcff8ec1caa7e8a8cc9c5738bc8d57be7b24f.tar.gz
samba-0aadcff8ec1caa7e8a8cc9c5738bc8d57be7b24f.tar.bz2
samba-0aadcff8ec1caa7e8a8cc9c5738bc8d57be7b24f.zip
all that is left to do is to actually perform the
file deletion now. I have the file list. One more commit should do it. (This used to be commit 7207662504f585352b0ceeb99f8998ef58db7f15)
Diffstat (limited to 'source3/rpc_server/srv_spoolss_nt.c')
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c28
1 files changed, 24 insertions, 4 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 8acdd9d5ab..a37d8e9c19 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -1590,6 +1590,7 @@ WERROR _spoolss_deleteprinterdriverex(pipes_struct *p, SPOOL_Q_DELETEPRINTERDRIV
NT_PRINTER_DRIVER_INFO_LEVEL info;
int version;
uint32 flags = q_u->delete_flags;
+ BOOL delete_files;
unistr2_to_ascii(driver, &q_u->driver, sizeof(driver)-1 );
unistr2_to_ascii(arch, &q_u->arch, sizeof(arch)-1 );
@@ -1614,11 +1615,30 @@ WERROR _spoolss_deleteprinterdriverex(pipes_struct *p, SPOOL_Q_DELETEPRINTERDRIV
if ( printer_driver_in_use(info.info_3) )
return WERR_PRINTER_DRIVER_IN_USE;
- if ( printer_driver_files_in_use(info.info_3) )
- /* no idea of the correct error here */
- return WERR_ACCESS_DENIED;
+ /*
+ * we have a couple of cases to consider.
+ * (1) Are any files in use? If so and DPD_DELTE_ALL_FILE is set,
+ * then the delete should fail if **any** files overlap with
+ * other drivers
+ * (2) If DPD_DELTE_UNUSED_FILES is sert, then delete all
+ * non-overlapping files
+ * (3) If neither DPD_DELTE_ALL_FILE nor DPD_DELTE_ALL_FILES
+ * is set, the do not delete any files
+ * Refer to MSDN docs on DeletePrinterDriverEx() for details.
+ */
+
+ delete_files = flags & (DPD_DELETE_ALL_FILES|DPD_DELETE_UNUSED_FILES);
+
+ if ( delete_files )
+ {
+ /* fail if any files are in use and DPD_DELETE_ALL_FILES is set */
+
+ if ( printer_driver_files_in_use(info.info_3) & (flags&DPD_DELETE_ALL_FILES) )
+ /* no idea of the correct error here */
+ return WERR_ACCESS_DENIED;
+ }
- return delete_printer_driver(info.info_3, True);
+ return delete_printer_driver(info.info_3, delete_files);
}