r21225: Couple of fixes from Martin Zielinski mz@seh.de,

one typo, one to make sure that time initialization
is done before modules that depend on it (printer
initialization).
Jeremy.

diff --git a/source/registry/reg_printing.c b/source/registry/reg_printing.c
index 90455a82cb1073540c7f613f75ac6f74401c0dae..b9fe0b014ac37cc8f07cb6e6e480fac0d33c1c33 100644 (file)
--- a/source/registry/reg_printing.c
+++ b/source/registry/reg_printing.c
@@ -555,7 +555,7 @@ struct {
        { "UntilTime",          REG_IDX_UNTILTIME },
        { "Name",               REG_IDX_NAME },
        { "Location",           REG_IDX_LOCATION },
-       { "Descrioption",       REG_IDX_DESCRIPTION },
+       { "Description",        REG_IDX_DESCRIPTION },
        { "Parameters",         REG_IDX_PARAMETERS },
        { "Port",               REG_IDX_PORT },
        { "Share Name",         REG_IDX_SHARENAME },

diff --git a/source/smbd/server.c b/source/smbd/server.c
index 5a3ae7f3742f7fdb2b45fe858c44a84e2d960eaa..ab32d656d38ebba32ec6463f7c7353142745a251 100644 (file)
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -852,6 +852,8 @@ extern void build_options(BOOL screen);
 
        load_case_tables();
 
+       TimeInit();
+
 #ifdef HAVE_SET_AUTH_PARAMETERS
        set_auth_parameters(argc,argv);
 #endif
@@ -1102,9 +1104,6 @@ extern void build_options(BOOL screen);
        /* Setup aio signal handler. */
        initialize_async_io_handler();
 
-       /* re-initialise the timezone */
-       TimeInit();
-
        /* register our message handlers */
        message_register(MSG_SMB_FORCE_TDIS, msg_force_tdis, NULL);