summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2002-01-23 05:10:27 +0000
committerGerald Carter <jerry@samba.org>2002-01-23 05:10:27 +0000
commite710c07411f9550ca453a7e8d98cc86d83ea78df (patch)
tree01aac5973385e33ce1ca590c308880ed0420e991
parent1182b7cd8cdfcb5065ed5ca65be4ebfd84f44b2a (diff)
downloadsamba-e710c07411f9550ca453a7e8d98cc86d83ea78df.tar.gz
samba-e710c07411f9550ca453a7e8d98cc86d83ea78df.tar.bz2
samba-e710c07411f9550ca453a7e8d98cc86d83ea78df.zip
merge from 2.2
(This used to be commit 8ed7c1ffad2df03c66151c1dfe7477301bd3ebad)
-rw-r--r--source3/printing/nt_printing.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 0ba0f45452..93bb4b1a0b 100644
--- 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 ! */