Papersize A4 bug

[Uwe Thiel]

Hello,

I have printing problems with 2.2.0 (release).
There is no way to choose A4 as papersize in any printer properties. In
the Papersize-list of the printserver-list there is only A4small
selectable. Looking in the source code, there are entries in
nt-printing.h and nt-printing.c for A4 and A4small. 
I changed the nt_printing.h and nt_printing.c and now, I can choose A4,
but no LETTER.All other papersizes are selectable
Could it be that the define-value of 9 makes the problems? Is that a
known bug (evtl. patched in cvs-version of samba)? Is it fixed in 2.2.1?

I did the following changes:

nt_printing.h:

#define PAPER_FIRST                PAPER_A4  /* here was: PAPER_LETTER
*/                <----
#define PAPER_A4                   1  /* A4 210 x 297 mm    (value was
9)           */   <----
#define PAPER_LETTERSMALL          2  /* Letter Small 8 1/2 x 11
in         */
#define PAPER_TABLOID              3  /* Tabloid 11 x 17
in                 */
#define PAPER_LEDGER               4  /* Ledger 17 x 11
in                  */
#define PAPER_LEGAL                5  /* Legal 8 1/2 x 14
in                */
#define PAPER_STATEMENT            6  /* Statement 5 1/2 x 8 1/2
in         */
#define PAPER_EXECUTIVE            7  /* Executive 7 1/4 x 10 1/2
in        */
#define PAPER_A3                   8  /* A3 297 x 420
mm                    */
#define PAPER_LETTER               9  /* Letter 8 1/2 x 11 in (value was
1)  */           <----
/* #define PAPER_A4                   9  A4 210 x 297 mm 
(removed)                  */  

nt_printing.c:

static nt_forms_struct default_forms[] = {
        {"A4",0x1,0x33450,0x48828,0x0,0x0,0x33450,0x48828}, <----was:
{"Letter", 0x2, 0x34b5b,.....}
        {"Letter",0x1,0x34b5c,0x44368,0x0,0x0,0x34b5c,0x44368},
        {"Letter Small",0x1,0x34b5c,0x44368,0x0,0x0,0x34b5c,0x44368},
        {"Tabloid",0x1,0x44368,0x696b8,0x0,0x0,0x44368,0x696b8},
        {"Ledger",0x1,0x696b8,0x44368,0x0,0x0,0x696b8,0x44368},
        {"Legal",0x1,0x34b5c,0x56d10,0x0,0x0,0x34b5c,0x56d10},
        {"Statement",0x1,0x221b4,0x34b5c,0x0,0x0,0x221b4,0x34b5c},
        {"Executive",0x1,0x2cf56,0x411cc,0x0,0x0,0x2cf56,0x411cc},
        {"A3",0x1,0x48828,0x668a0,0x0,0x0,0x48828,0x668a0},
        {"Letter",0x1,0x34b5c,0x44368,0x0,0x0,0x34b5c,0x44368}, <---was:
{"A4",0x1,0x....}
        {"A5",0x1,0x24220,0x33450,0x0,0x0,0x24220,0x33450},