Author: brad Date: 2005-08-23 13:26:44 +0000 (Tue, 23 Aug 2005) New Revision: 9521
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9521 Log: [EMAIL PROTECTED]: j0j0 | 2005-08-23 07:33:06 -0600 Merging changes Modified: branches/SOC/SAMBA_4_0/ branches/SOC/SAMBA_4_0/source/torture/rpc/testjoin.c Changeset: Property changes on: branches/SOC/SAMBA_4_0 ___________________________________________________________________ Name: svk:merge - 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:9518 d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5595 d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5594 + 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:9518 d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5596 d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5594 Modified: branches/SOC/SAMBA_4_0/source/torture/rpc/testjoin.c =================================================================== --- branches/SOC/SAMBA_4_0/source/torture/rpc/testjoin.c 2005-08-23 13:26:23 UTC (rev 9520) +++ branches/SOC/SAMBA_4_0/source/torture/rpc/testjoin.c 2005-08-23 13:26:44 UTC (rev 9521) @@ -30,6 +30,7 @@ #include "system/time.h" #include "libnet/libnet.h" #include "lib/cmdline/popt_common.h" +#include "lib/crypto/crypto.h" struct test_join { struct dcerpc_pipe *p; /* SAMR pipe */
