svn commit: samba r21225 - in branches: SAMBA_3_0/source/registry SAMBA_3_0/source/smbd SAMBA_3_0_25/source/registry SAMBA_3_0_25/source/smbd

[jra at samba.org]

Author: jra
Date: 2007-02-07 20:20:56 +0000 (Wed, 07 Feb 2007)
New Revision: 21225

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21225

Log:
Couple of fixes from Martin Zielinski mz at seh.de,
one typo, one to make sure that time initialization
is done before modules that depend on it (printer
initialization).
Jeremy.

Modified:
   branches/SAMBA_3_0/source/registry/reg_printing.c
   branches/SAMBA_3_0/source/smbd/server.c
   branches/SAMBA_3_0_25/source/registry/reg_printing.c
   branches/SAMBA_3_0_25/source/smbd/server.c


Changeset:
Modified: branches/SAMBA_3_0/source/registry/reg_printing.c
===================================================================
--- branches/SAMBA_3_0/source/registry/reg_printing.c	2007-02-07 20:16:02 UTC (rev 21224)
+++ branches/SAMBA_3_0/source/registry/reg_printing.c	2007-02-07 20:20:56 UTC (rev 21225)
@@ -555,7 +555,7 @@
 	{ "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 },

Modified: branches/SAMBA_3_0/source/smbd/server.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/server.c	2007-02-07 20:16:02 UTC (rev 21224)
+++ branches/SAMBA_3_0/source/smbd/server.c	2007-02-07 20:20:56 UTC (rev 21225)
@@ -852,6 +852,8 @@
 
 	load_case_tables();
 
+	TimeInit();
+
 #ifdef HAVE_SET_AUTH_PARAMETERS
 	set_auth_parameters(argc,argv);
 #endif
@@ -1102,9 +1104,6 @@
 	/* 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);
 

Modified: branches/SAMBA_3_0_25/source/registry/reg_printing.c
===================================================================
--- branches/SAMBA_3_0_25/source/registry/reg_printing.c	2007-02-07 20:16:02 UTC (rev 21224)
+++ branches/SAMBA_3_0_25/source/registry/reg_printing.c	2007-02-07 20:20:56 UTC (rev 21225)
@@ -555,7 +555,7 @@
 	{ "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 },

Modified: branches/SAMBA_3_0_25/source/smbd/server.c
===================================================================
--- branches/SAMBA_3_0_25/source/smbd/server.c	2007-02-07 20:16:02 UTC (rev 21224)
+++ branches/SAMBA_3_0_25/source/smbd/server.c	2007-02-07 20:20:56 UTC (rev 21225)
@@ -829,6 +829,8 @@
 
 	load_case_tables();
 
+	TimeInit();
+
 #ifdef HAVE_SET_AUTH_PARAMETERS
 	set_auth_parameters(argc,argv);
 #endif
@@ -1083,9 +1085,6 @@
 	/* 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);