[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Wed Aug 16 22:54:04 UTC 2017
The branch, master has been updated
via 5473a27 lib: talloc: Use the system <talloc.h> include.
via bee22f1 lib: tevent: Use system <tevent.h>, not internal header path (except in self-test).
from 68316a4 s3: messaging: Add background job send failure message
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 5473a277e3bdcc7ae6a03c24d4e7c84a8ad63b4b
Author: Jeremy Allison <jra at samba.org>
Date: Mon Aug 14 16:04:18 2017 -0700
lib: talloc: Use the system <talloc.h> include.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Thu Aug 17 00:53:48 CEST 2017 on sn-devel-144
commit bee22f187cfca26da13efb4cc980a705ec252a21
Author: Jeremy Allison <jra at samba.org>
Date: Mon Aug 14 15:54:39 2017 -0700
lib: tevent: Use system <tevent.h>, not internal header path (except in self-test).
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/async_req/async_connect_send_test.c | 2 +-
lib/tevent/testsuite.c | 2 +-
source4/lib/wmi/wbemdata.c | 2 +-
source4/librpc/rpc/dcerpc_roh_channel_in.c | 4 ++--
source4/librpc/rpc/dcerpc_roh_channel_out.c | 4 ++--
source4/torture/smb2/rename.c | 2 +-
source4/torture/smb2/sharemode.c | 2 +-
testprogs/win32/spoolss/testspoolss.h | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/async_req/async_connect_send_test.c b/lib/async_req/async_connect_send_test.c
index 34ea6b7..d570c60 100644
--- a/lib/async_req/async_connect_send_test.c
+++ b/lib/async_req/async_connect_send_test.c
@@ -17,7 +17,7 @@
*/
#include "replace.h"
-#include "lib/tevent/tevent.h"
+#include <tevent.h>
#include "lib/async_req/async_sock.h"
#include <stdio.h>
#include <string.h>
diff --git a/lib/tevent/testsuite.c b/lib/tevent/testsuite.c
index ee29e5b..e508452 100644
--- a/lib/tevent/testsuite.c
+++ b/lib/tevent/testsuite.c
@@ -25,7 +25,7 @@
*/
#include "includes.h"
-#include "lib/tevent/tevent.h"
+#include "tevent.h"
#include "system/filesys.h"
#include "system/select.h"
#include "system/network.h"
diff --git a/source4/lib/wmi/wbemdata.c b/source4/lib/wmi/wbemdata.c
index df98da4..d475067 100644
--- a/source4/lib/wmi/wbemdata.c
+++ b/source4/lib/wmi/wbemdata.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include <talloc.h>
#include "librpc/gen_ndr/dcom.h"
#include "librpc/gen_ndr/com_dcom.h"
#include "librpc/ndr/libndr.h"
@@ -30,7 +31,6 @@
#include "librpc/gen_ndr/ndr_dcom.h"
#include "librpc/rpc/dcerpc.h"
#include "librpc/gen_ndr/ndr_misc.h"
-#include "lib/talloc/talloc.h"
#include "libcli/composite/composite.h"
#include "lib/wmi/wmi.h"
#include "librpc/gen_ndr/ndr_wmi.h"
diff --git a/source4/librpc/rpc/dcerpc_roh_channel_in.c b/source4/librpc/rpc/dcerpc_roh_channel_in.c
index d6c37a3..d6707bf 100644
--- a/source4/librpc/rpc/dcerpc_roh_channel_in.c
+++ b/source4/librpc/rpc/dcerpc_roh_channel_in.c
@@ -21,8 +21,8 @@
*/
#include "includes.h"
-#include "lib/tevent/tevent.h"
-#include "lib/talloc/talloc.h"
+#include <tevent.h>
+#include <talloc.h>
#include "lib/tsocket/tsocket.h"
#include "lib/tls/tls.h"
#include "lib/util/tevent_ntstatus.h"
diff --git a/source4/librpc/rpc/dcerpc_roh_channel_out.c b/source4/librpc/rpc/dcerpc_roh_channel_out.c
index 4e1c934..23cbce3 100644
--- a/source4/librpc/rpc/dcerpc_roh_channel_out.c
+++ b/source4/librpc/rpc/dcerpc_roh_channel_out.c
@@ -21,8 +21,8 @@
*/
#include "includes.h"
-#include "lib/tevent/tevent.h"
-#include "lib/talloc/talloc.h"
+#include <tevent.h>
+#include <talloc.h>
#include "lib/tsocket/tsocket.h"
#include "lib/tls/tls.h"
#include "lib/util/tevent_ntstatus.h"
diff --git a/source4/torture/smb2/rename.c b/source4/torture/smb2/rename.c
index 4c41c8b..5055cf2 100644
--- a/source4/torture/smb2/rename.c
+++ b/source4/torture/smb2/rename.c
@@ -22,7 +22,7 @@
#include "includes.h"
#include "libcli/smb2/smb2.h"
#include "libcli/smb2/smb2_calls.h"
-#include "lib/tevent/tevent.h"
+#include <tevent.h>
#include "lib/util/tevent_ntstatus.h"
#include "torture/torture.h"
diff --git a/source4/torture/smb2/sharemode.c b/source4/torture/smb2/sharemode.c
index f59927c..d1ad22e 100644
--- a/source4/torture/smb2/sharemode.c
+++ b/source4/torture/smb2/sharemode.c
@@ -25,7 +25,7 @@
#include "libcli/security/security.h"
#include "torture/torture.h"
#include "torture/smb2/proto.h"
-#include "lib/tevent/tevent.h"
+#include <tevent.h>
#define BASEDIRHOLD "sharemode_hold_test"
diff --git a/testprogs/win32/spoolss/testspoolss.h b/testprogs/win32/spoolss/testspoolss.h
index f025fcc..eb19c64 100644
--- a/testprogs/win32/spoolss/testspoolss.h
+++ b/testprogs/win32/spoolss/testspoolss.h
@@ -29,7 +29,7 @@
#include "printlib_proto.h"
#if 0
-#include "lib/talloc/talloc.h"
+#include <talloc.h>
#include "libcli/util/ntstatus.h"
#include "lib/torture/torture.h"
#endif
--
Samba Shared Repository
More information about the samba-cvs
mailing list