Changes from APPLIANCE_HEAD:

    source/include/proto.h
        - make proto

    source/printing/nt_printing.c
    source/rpc_server/srv_spoolss_nt.c
        - Fix for the overwriting of printerdata entries when WinNT and
          Win2k are modifying printer parameters on PCL printers. Turns out
          that Win2k creates a printer with a NULL devmode entry and then
          expects to set it on *OPEN* (yes this is insane). So we cannot
          return a "default" devmode for a printer - and we must allow an
          open to set it.

    source/tdb/tdb.c
        - Show freelist in an easier format. Show total free.
        - When storing a new record, allocate memory for the key + data
          before the tdb_allocate() as if the malloc fails a (sparse) hole
          is left in the tdb.

    source/tdb/tdbtool.c
        - Show freelist in an easier format. Show total free.

    source/tdb/Makefile
        - cleaned up Makefile dependancies

    source/smbd/lanman.c
        -  Fix for Win9x corrupting it's own parameter string.

    source/printing/printfsp.c
    source/printing/printing.c
    source/rpc_server/srv_spoolss_nt.c
    source/smbd/close.c
        - Added normal close parameter into print_fsp_end() which treats an
          abnormal close as error condition and deletes the spool file.

1 files changed, 2 insertions, 2 deletions

diff --git a/source/smbd/close.c b/source/smbd/close.c
index 62194f73a5c..87bd3133276 100644
--- a/source/smbd/close.c
+++ b/source/smbd/close.c
@@ -116,8 +116,8 @@ static int close_normal_file(files_struct *fsp, BOOL normal_close)
 	if (close_filestruct(fsp) == -1)
 		err1 = -1;
 
-	if (normal_close && fsp->print_file) {
-		print_fsp_end(fsp);
+	if (fsp->print_file) {
+		print_fsp_end(fsp, normal_close);
 		file_free(fsp);
 		return 0;
 	}