diff options
| author | Gerald Carter <jerry@samba.org> | 2007-03-19 17:45:13 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:18:42 -0500 |
| commit | 1899c834f0261edaecc575b17d8aeb57b82717e2 (patch) | |
| tree | 22a721828615a66890d8dda047d00d302b4e8bf9 /source3/include/nt_printing.h | |
| parent | e6bf92118b0dfe90896a612b663a060edbccea24 (diff) | |
| download | samba-1899c834f0261edaecc575b17d8aeb57b82717e2.tar.gz samba-1899c834f0261edaecc575b17d8aeb57b82717e2.tar.bz2 samba-1899c834f0261edaecc575b17d8aeb57b82717e2.zip | |
r21875: BUG 3275: Patch from Andy Polyakov <appro@fy.chalmers.se>
Relax check for i386 header checks in the PE header of printer
driver files. Thus allowing uploading of x64 print drivers
from 64bit Windows clients.
(This used to be commit 328807ec7b1ce6489d5443a93d1599f93af93933)
Diffstat (limited to 'source3/include/nt_printing.h')
| -rw-r--r-- | source3/include/nt_printing.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h index 5bd64ae7be..c2dde7d478 100644 --- a/source3/include/nt_printing.h +++ b/source3/include/nt_printing.h @@ -386,18 +386,13 @@ typedef struct { #define NE_HEADER_MAJOR_VER_OFFSET 63 /* Portable Executable format */ -#define PE_HEADER_SIZE 248 +#define PE_HEADER_SIZE 24 #define PE_HEADER_SIGNATURE_OFFSET 0 #define PE_HEADER_SIGNATURE 0x00004550 #define PE_HEADER_MACHINE_OFFSET 4 #define PE_HEADER_MACHINE_I386 0x14c #define PE_HEADER_NUMBER_OF_SECTIONS 6 -#define PE_HEADER_MAJOR_OS_VER_OFFSET 64 -#define PE_HEADER_MINOR_OS_VER_OFFSET 66 -#define PE_HEADER_MAJOR_IMG_VER_OFFSET 68 -#define PE_HEADER_MINOR_IMG_VER_OFFSET 70 -#define PE_HEADER_MAJOR_SS_VER_OFFSET 72 -#define PE_HEADER_MINOR_SS_VER_OFFSET 74 +#define PE_HEADER_OPTIONAL_HEADER_SIZE 20 #define PE_HEADER_SECT_HEADER_SIZE 40 #define PE_HEADER_SECT_NAME_OFFSET 0 #define PE_HEADER_SECT_SIZE_DATA_OFFSET 16 |