merge from 2.2

(This used to be commit 8ed7c1ffad2df03c66151c1dfe7477301bd3ebad)

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 0ba0f454527715dafb4351dcec266ec7a4e1d045..93bb4b1a0b389816431c6420bb89b46462c3f3ac 100644 (file)
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -2444,12 +2444,12 @@ static WERROR get_a_printer_2_default(NT_PRINTER_INFO_LEVEL_2 **info_ptr, fstrin
         */
 
        if (lp_default_devmode(snum)) {
-               info.devmode = NULL;
-       }
-       else {
                if ((info.devmode = construct_nt_devicemode(info.printername)) == NULL)
                        goto fail;
        }
+       else {
+               info.devmode = NULL;
+       }
 
        /* This will get the current RPC talloc context, but we should be
           passing this as a parameter... fixme... JRA ! */