Changeset 978


Ignore:
Timestamp:
Sep 2, 2016, 11:44:25 AM (9 years ago)
Author:
Silvan Scherrer
Message:

Samba server: remove exceptq handling, as now globaly installed when using libcx. And libcx is mandatory for samba

Location:
trunk/server
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/server/lib/tdb/tools/tdbtorture.c

    r906 r978  
    22   writers - that stresses the locking code.
    33*/
    4 
    5 #ifdef __OS2__
    6 #define INCL_DOSEXCEPTIONS
    7 #define INCL_DOSPROCESS
    8 #define INCL_DOSMODULEMGR
    9 #define INCL_LOADEXCEPTQ
    10 #define INCL_FORKEXCEPTQ
    11 #include <os2.h>
    12 #include <exceptq.h>
    13 #endif
    144
    155#include "replace.h"
    … …  
    245235static int run_child(const char *filename, int i, int seed, unsigned num_loops, unsigned start)
    246236{
    247 #ifdef __OS2__
    248         EXCEPTIONREGISTRATIONRECORD ExRegRec;
    249         LoadExceptq(&ExRegRec, NULL, NULL);
    250 #endif
    251237        db = tdb_open_ex(filename, hash_size, TDB_DEFAULT,
    252238                         O_RDWR | O_CREAT, 0600, &log_ctx, NULL);
    … …  
    286272        tdb_close(db);
    287273
    288 #ifdef __OS2__
    289         UninstallExceptq(&ExRegRec);
    290 #endif
    291274        return (error_count < 100 ? error_count : 100);
    292275}
    … …  
    323306
    324307        log_ctx.log_fn = tdb_log;
    325 #ifdef __OS2__
    326         EXCEPTIONREGISTRATIONRECORD ExRegRec;
    327         LoadExceptq(&ExRegRec, NULL, NULL);
    328 #endif
    329308
    330309        while ((c = getopt(argc, argv, "n:l:s:H:thk")) != -1) {
    … …  
    475454
    476455        free(test_tdb);
    477 #ifdef __OS2__
    478         UninstallExceptq(&ExRegRec);
    479 #endif
    480456        return error_count;
    481457}

  • trunk/server/source3/nmbd/nmbd.c

    r952 r978  
    1919   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    2020*/
    21 #ifdef __OS2__
    22 #define INCL_DOSEXCEPTIONS
    23 #define INCL_DOSPROCESS
    24 #define INCL_DOSMODULEMGR
    25 #define INCL_LOADEXCEPTQ
    26 #define INCL_FORKEXCEPTQ
    27 #include "os2.h"
    28 #include "exceptq.h"
    29 #undef FILE_CREATE
    30 #undef FILE_OPEN
    31 #endif
    3221
    3322#include "includes.h"
    … …  
    788777        NTSTATUS status;
    789778
    790 #ifdef __OS2__
    791         EXCEPTIONREGISTRATIONRECORD ExRegRec;
    792         LoadExceptq(&ExRegRec, NULL, NULL);
    793 #endif
    794 
    795779        /*
    796780         * Do this before any other talloc operation
    … …  
    10521036        kill_async_dns_child();
    10531037
    1054 #ifdef __OS2__
    1055         UninstallExceptq(&ExRegRec);
    1056 #endif
    10571038        return(0);
    10581039}

  • trunk/server/source3/smbd/server.c

    r863 r978  
    2121   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    2222*/
    23 
    24 #ifdef __OS2__
    25 #define INCL_DOSEXCEPTIONS
    26 #define INCL_DOSPROCESS
    27 #define INCL_DOSMODULEMGR
    28 #define INCL_LOADEXCEPTQ
    29 #define INCL_FORKEXCEPTQ
    30 #include "os2.h"
    31 #include "exceptq.h"
    32 #undef FILE_CREATE
    33 #undef FILE_OPEN
    34 #endif
    3523
    3624#include "includes.h"
    … …  
    956944        NTSTATUS status;
    957945
    958 #ifdef __OS2__
    959         EXCEPTIONREGISTRATIONRECORD ExRegRec;
    960         LoadExceptq(&ExRegRec, NULL, NULL);
    961 #endif
    962946        /*
    963947         * Do this before any other talloc operation
    … …  
    13891373        exit_server_cleanly(NULL);
    13901374        TALLOC_FREE(frame);
    1391 #ifdef __OS2__
    1392         UninstallExceptq(&ExRegRec);
    1393 #endif
    13941375        return(0);
    13951376}

  • trunk/server/source3/winbindd/winbindd.c

    r945 r978  
    2222   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    2323*/
    24 #ifdef __OS2__
    25 #define INCL_DOSEXCEPTIONS
    26 #define INCL_DOSPROCESS
    27 #define INCL_DOSMODULEMGR
    28 #define INCL_LOADEXCEPTQ
    29 #define INCL_FORKEXCEPTQ
    30 #include "os2.h"
    31 #include "exceptq.h"
    32 #undef FILE_CREATE
    33 #undef FILE_OPEN
    34 #endif
    3524
    3625#include "includes.h"
    … …  
    12571246        NTSTATUS status;
    12581247
    1259 #ifdef __OS2__
    1260         EXCEPTIONREGISTRATIONRECORD ExRegRec;
    1261         LoadExceptq(&ExRegRec, NULL, NULL);
    1262 #endif
    12631248        /*
    12641249         * Do this before any other talloc operation
    … …  
    14871472        }
    14881473
    1489 #ifdef __OS2__
    1490         UninstallExceptq(&ExRegRec);
    1491 #endif
    14921474        return 0;
    14931475}
Note: See TracChangeset for help on using the changeset viewer.