r2135: BUG 1464: make sure that printing commands are initialized even if the 'printi...

(This used to be commit 8ae57a8e8d7334bc0feb2c8afb673bd5c53bffca)

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index e6bc01ff3f9c1c3ca2f41b6f456c6c373703981b..468b4c8f27fff45599ead2ea7d473e8b4344804c 100644 (file)
--- 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);
 }