summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2004-08-31 18:34:52 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:52:33 -0500
commit4c20275f51c68e3ff66a96621e578ec18c47e254 (patch)
tree2c27e912e455b9e6aebe14bc6e4114ff7628779a /source3
parent278f9467f2079044497e3fd4c5358c280f179e41 (diff)
downloadsamba-4c20275f51c68e3ff66a96621e578ec18c47e254.tar.gz
samba-4c20275f51c68e3ff66a96621e578ec18c47e254.tar.bz2
samba-4c20275f51c68e3ff66a96621e578ec18c47e254.zip
r2135: BUG 1464: make sure that printing commands are initialized even if the 'printing' parameter is not explicitly set
(This used to be commit 8ae57a8e8d7334bc0feb2c8afb673bd5c53bffca)
Diffstat (limited to 'source3')
-rw-r--r--source3/param/loadparm.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index e6bc01ff3f..468b4c8f27 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1299,6 +1299,8 @@ static void init_globals(void)
string_set(&sDefault.fstype, FSTYPE_STRING);
+ init_printer_values(&sDefault);
+
done_init = True;
}
@@ -3952,9 +3954,6 @@ BOOL lp_load(const char *pszFname, BOOL global_only, BOOL save_defaults,
}
init_iconv();
-#if 0 /* JERRY */
- init_printer_values(&sDefault);
-#endif
return (bRetval);
}