Ignore:
Timestamp:
Nov 27, 2012, 4:43:17 PM (13 years ago)
Author:
Silvan Scherrer
Message:

Samba Server: updated trunk to 3.6.0

Location:
trunk/server
Files:
1 deleted
9 edited
91 copied

Legend:

Unmodified
Added
Removed

  • trunk/server

  • trunk/server/testprogs/win32/midltests/Makefile

    r414 r745  
    1 INCLUDES=-I
    2 CFLAGS=$(INCLUDES) -Zi -D_WIN32_WINNT=0x502
    3 LIBS=rpcrt4.lib
    41
    5 all: midltests.exe
     2all:
     3        @echo "nmake targets:"
     4        @echo "   clean"
     5        @echo "   simple"
     6        @echo "   tcp"
    67
    78clean:
    8         del *~ *.obj *.exe midltests.h midltests_s.c midltests_c.c
     9        @call nmake /f Makefile.simple /A /NOLOGO clean
     10        @call nmake /f Makefile.tcp /A /NOLOGO clean
    911
    10 #MIDL_ARGS=/target NT50
    11 MIDL_ARGS=/Os /prefix client cli_ /prefix server srv_ /prefix switch swi_
    12 midltests.h midltests_s.c midltests_c.c: midltests.idl midltests.acf
    13         midl $(MIDL_ARGS) /acf midltests.acf midltests.idl
     12simple:
     13        @call nmake /f Makefile.simple /A /NOLOGO all
    1414
    15 MIDLTESTS_OBJ = midltests.obj midltests_s_m.obj midltests_c_m.obj midltests_marshall.obj utils.obj
    16 midltests.exe: $(MIDLTESTS_OBJ)
    17         $(CC) -o midltests.exe $(MIDLTESTS_OBJ) $(LIBS)
    18 
    19 midltests.obj: midltests.h midltests.idl
    20 midltests_c_m.c: midltests_c.c
    21 midltests_s_m.c: midltests_s.c
    22 
    23 midltests.obj: midltests.h midltests.idl midltests.c
    24 midltests_s_m.obj: midltests_marshall.h midltests_s.c midltests_s_m.c
    25 midltests_c_m.obj: midltests_marshall.h midltests_c.c midltests_c_m.c
    26 midltests_marshall.obj: midltests.h midltests_marshall.c
    27 utils.obj: midltests.h utils.c
     15tcp:
     16        @call nmake /f Makefile.tcp /A /NOLOGO all

  • trunk/server/testprogs/win32/midltests/midltests.idl

    r414 r745  
    11#ifndef MIDLTESTS_C_CODE
     2
     3/*
     4 * For midltests_tcp.exe you may want to
     5 * redirect the traffic via rinetd
     6 * with a /etc/rinetd.conf like this:
     7 *
     8 * 172.31.9.1 5032 172.31.9.8 5032
     9 * 172.31.9.1 5064 172.31.9.8 5064
     10 *
     11 * This is useful to watch the traffic with
     12 * a network sniffer.
     13 */
     14/*
     15cpp_quote("#define LISTEN_IP \"0.0.0.0\"")
     16cpp_quote("#define FORWARD_IP \"127.0.0.1\"")
     17cpp_quote("#define CONNECT_IP \"172.31.9.1\"")
     18*/
     19
     20/*
     21 * With midltests_tcp.exe NDR64 is enforced by default.
     22 * For testing it might be needed to allow downgrades
     23 * to NDR32. This is needed when you use 'pipe'.
     24 */
     25//cpp_quote("#define DONOT_FORCE_NDR64 1")
    226
    327[

  • trunk/server/testprogs/win32/midltests/midltests_marshall.c

    r414 r745  
    3131}
    3232
    33 static void dump_data(const unsigned char *buf1,int len)
     33void dump_data(const unsigned char *buf1,int len)
    3434{
    3535        const unsigned char *buf = (const unsigned char *)buf1;
    … …  
    6161        }
    6262}
     63
     64#if _WIN32_WINNT < 0x600
    6365
    6466void NdrGetBufferMarshall(PMIDL_STUB_MESSAGE stubmsg, unsigned long len, RPC_BINDING_HANDLE hnd)
    … …  
    120122        return 0;
    121123}
     124
     125#endif /* _WIN32_WINNT < 0x600 */

  • trunk/server/testprogs/win32/midltests/midltests_marshall.h

    r414 r745  
    11#include "rpc.h"
    22#include "rpcndr.h"
     3
     4void dump_data(const unsigned char *buf1,int len);
     5
     6#if _WIN32_WINNT < 0x600
    37#define NdrSendReceive NdrSendReceiveMarshall
    48void NdrSendReceiveMarshall(PMIDL_STUB_MESSAGE stubmsg, unsigned char *buffer);
    … …  
    1216RPC_STATUS WINAPI I_RpcGetBufferMarshall(PRPC_MESSAGE pMsg);
    1317
     18#endif /* _WIN32_WINNT < 0x600 */
    1419
    15 
    16 

  • trunk/server/testprogs/win32/npecho/GNUmakefile

    r414 r745  
    99all: $(NPECHO) $(NPECHO2)
    1010
    11 CC = i586-mingw32msvc-gcc
     11MINGW_CC = i586-mingw32msvc-cc
     12CC = $(MINGW_CC)
    1213
    1314.SUFFIXES: .c .obj .exe
    … …  
    2021
    2122clean:
    22         del *~ *.obj *.exe
     23        rm -f *~ *.obj *.exe
    2324

  • trunk/server/testprogs/win32/npecho/NMakefile

    r414 r745  
     1#
     2# use nmake /f NMakefile [<target>]
     3#
    14INCLUDES=-I
    25CFLAGS=$(INCLUDES) -Zi -nologo

  • trunk/server/testprogs/win32/testmailslot/GNUmakefile

    r414 r745  
    11INCLUDES=-I.
    22CFLAGS=$(INCLUDES)
    3 CC=i586-mingw32msvc-gcc
     3MINGW_CC = i586-mingw32msvc-cc
     4CC = $(MINGW_CC)
    45
    56all: testmailslot.exe

  • trunk/server/testprogs/win32/testmailslot/NMakefile

    r414 r745  
     1#
     2# use nmake /f NMakefile [<target>]
     3#
    14INCLUDES=-I
    25CFLAGS=$(INCLUDES) -Zi -nologo
Note: See TracChangeset for help on using the changeset viewer.