Changeset 843 for trunk/server/source3

Timestamp:

Feb 7, 2014, 5:18:05 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.6: initial exceptq suport

Location:

trunk/server/source3

Files:

• nmbd/nmbd.c (modified) (3 diffs)
• smbd/server.c (modified) (3 diffs)

trunk/server/source3/nmbd/nmbd.c

@@ -19 +19 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef __OS2__
+#define INCL_DOSEXCEPTIONS
+#define INCL_DOSPROCESS
+#define INCL_DOSMODULEMGR
+#define INCL_LOADEXCEPTQ
+#define INCL_FORKEXCEPTQ
+#include "os2.h"
+#include "exceptq.h"
+#undef FILE_CREATE
+#undef FILE_OPEN
+#endif
 
 #include "includes.h"
@@ -780 +791 @@
         NTSTATUS status;
 
+#ifdef __OS2__
+        EXCEPTIONREGISTRATIONRECORD *pExRegRec;
+        LoadExceptq(pExRegRec, NULL, NULL);
+#endif
+
         /*
          * Do this before any other talloc operation
@@ -1033 +1049 @@
 
         kill_async_dns_child();
+
+#ifdef __OS2__
+        if (pExRegRec != NULL)
+                UninstallExceptq(pExRegRec);
+#endif
         return(0);
 }

trunk/server/source3/smbd/server.c

@@ -21 +21 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef __OS2__
+#define INCL_DOSEXCEPTIONS
+#define INCL_DOSPROCESS
+#define INCL_DOSMODULEMGR
+#define INCL_LOADEXCEPTQ
+#define INCL_FORKEXCEPTQ
+#include "os2.h"
+#include "exceptq.h"
+#undef FILE_CREATE
+#undef FILE_OPEN
+#endif
 
 #include "includes.h"
@@ -898 +909 @@
         NTSTATUS status;
 
+#ifdef __OS2__
+        EXCEPTIONREGISTRATIONRECORD *pExRegRec;
+        LoadExceptq(pExRegRec, NULL, NULL);
+#endif
         /*
          * Do this before any other talloc operation
@@ -1320 +1335 @@
         exit_server_cleanly(NULL);
         TALLOC_FREE(frame);
+#ifdef __OS2__
+        if (pExRegRec != NULL)
+                UninstallExceptq(pExRegRec);
+#endif
         return(0);
 }