diff options
| author | Jeremy Allison <jra@samba.org> | 2007-02-07 20:20:56 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:17:48 -0500 |
| commit | 4901d7f10bdc34e6378964fc26aaee8289bf59e3 (patch) | |
| tree | 55421135bc5a7b5c45264ee550801d463dee82df | |
| parent | d1bb9b161fcfa0cfa4687d285706d6f15b6abcdd (diff) | |
| download | samba-4901d7f10bdc34e6378964fc26aaee8289bf59e3.tar.gz samba-4901d7f10bdc34e6378964fc26aaee8289bf59e3.tar.bz2 samba-4901d7f10bdc34e6378964fc26aaee8289bf59e3.zip | |
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.
(This used to be commit 6df32b4a6a9abd40e963c188b4c8769f15a0ab9b)
| -rw-r--r-- | source3/registry/reg_printing.c | 2 | ||||
| -rw-r--r-- | source3/smbd/server.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/source3/registry/reg_printing.c b/source3/registry/reg_printing.c index 90455a82cb..b9fe0b014a 100644 --- a/source3/registry/reg_printing.c +++ b/source3/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/source3/smbd/server.c b/source3/smbd/server.c index 5a3ae7f374..ab32d656d3 100644 --- a/source3/smbd/server.c +++ b/source3/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); |