xserver: Branch 'master'

[Eamon Walsh]

 mi/miinitext.c |   10 ++++++++++
 1 files changed, 10 insertions(+)

New commits:
diff-tree 5e946dd853a4ebc2722ae023429ce5797de3d7a6 (from 3d39c02fe6aaa602c52f1d4f0ea6cd3bd000cf9f)
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Tue Nov 7 13:50:19 2006 -0500

    Bug #8937: Extension setup functions not called on server resets

diff --git a/mi/miinitext.c b/mi/miinitext.c
index f618595..cb34473 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -754,6 +754,16 @@ InitExtensions(argc, argv)
 	/* Sort the extensions according the init dependencies. */
 	LoaderSortExtensions();
 	listInitialised = TRUE;
+    } else {
+	/* Call the setup functions on subsequent server resets as well */
+	for (i = 0; ExtensionModuleList[i].name != NULL; i++) {
+	    ext = &ExtensionModuleList[i];
+	    if (ext->setupFunc != NULL &&
+		(ext->disablePtr == NULL ||
+		 (ext->disablePtr != NULL && !*ext->disablePtr))) {
+		(ext->setupFunc)();
+	    }
+	}
     }
 
     for (i = 0; ExtensionModuleList[i].name != NULL; i++) {