diff options
| author | David O'Neill <dmo@samba.org> | 2001-01-29 21:34:08 +0000 |
|---|---|---|
| committer | David O'Neill <dmo@samba.org> | 2001-01-29 21:34:08 +0000 |
| commit | 2506c61ab3bd667d54c5e004cc80ce5e40643b5d (patch) | |
| tree | b31d685b78a8ba71f3599aa481ce281d5fea290b /source3/smbd | |
| parent | 9ec19336e519ef3543eb9d3eafb24585657a2e8d (diff) | |
| download | samba-2506c61ab3bd667d54c5e004cc80ce5e40643b5d.tar.gz samba-2506c61ab3bd667d54c5e004cc80ce5e40643b5d.tar.bz2 samba-2506c61ab3bd667d54c5e004cc80ce5e40643b5d.zip | |
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.
(This used to be commit 025f7a092ad258ff774e3f5e53737f8210cc8af6)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/close.c | 4 | ||||
| -rw-r--r-- | source3/smbd/lanman.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/close.c b/source3/smbd/close.c index 62194f73a5..87bd313327 100644 --- a/source3/smbd/close.c +++ b/source3/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; } diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c index 23ce19f532..7dba0c06f3 100644 --- a/source3/smbd/lanman.c +++ b/source3/smbd/lanman.c @@ -736,7 +736,7 @@ static void fill_printq_info(connection_struct *conn, int snum, int uLevel, PACKI(desc,"W",5); /* pad1 */ PACKS(desc,"z",""); /* pszSepFile */ PACKS(desc,"z","WinPrint"); /* pszPrProc */ - PACKS(desc,"z",""); /* pszParms */ + PACKS(desc,"z",NULL); /* pszParms */ PACKS(desc,"z",NULL); /* pszComment - don't ask.... JRA */ /* "don't ask" that it's done this way to fix corrupted Win9X/ME printer comments. */ |