The branch, master has been updated
via 3508268 replace: Only warn if rpc/rpc.h haven't been found
via 5f4b71d winbindd: Remove "DUMP_EVENT_LIST" message
from 46e6626 vfs_glusterfs: Fix the wrong pointer being sent in
glfs_fsync_async
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 350826868dc81846e0b1086ad5f69506ae2a44f6
Author: Andreas Schneider <a...@samba.org>
Date: Mon Feb 26 14:07:28 2018 +0100
replace: Only warn if rpc/rpc.h haven't been found
This is also used by talloc, tevent, etc. Those libs don't need or use
rpc.h
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Ralph Boehme <s...@samba.org>
Autobuild-User(master): Ralph Böhme <s...@samba.org>
Autobuild-Date(master): Tue Feb 27 03:23:37 CET 2018 on sn-devel-144
commit 5f4b71d21d5018fe36150b03bc1a0593d4ead747
Author: Volker Lendecke <v...@samba.org>
Date: Mon Feb 26 11:04:31 2018 +0100
winbindd: Remove "DUMP_EVENT_LIST" message
This was no longer implemented, remove it completely
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Ralph Boehme <s...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/replace/wscript | 3 +--
librpc/idl/messaging.idl | 2 +-
source3/utils/smbcontrol.c | 14 --------------
source3/winbindd/winbindd.c | 3 ---
source3/winbindd/winbindd_dual.c | 38 --------------------------------------
5 files changed, 2 insertions(+), 58 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 2c638b7..a2e2d11 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -82,8 +82,7 @@ def configure(conf):
conf.CHECK_HEADERS('rpc/rpc.h rpc/nettype.h', lib='tirpc',
together=True)
conf.SET_TARGET_TYPE('tirpc', 'SYSLIB')
if not conf.CONFIG_SET('HAVE_RPC_RPC_H'):
- Logs.error('ERROR: No rpc/rpc.h header found, tirpc or libntirpc
missing?')
- sys.exit(1)
+ Logs.warn('No rpc/rpc.h header found, tirpc or libntirpc missing?')
conf.SET_TARGET_TYPE('nsl', 'EMPTY')
conf.CHECK_HEADERS('rpc/rpc.h rpcsvc/yp_prot.h', lib='tirpc')
diff --git a/librpc/idl/messaging.idl b/librpc/idl/messaging.idl
index b35f1e1..5468334 100644
--- a/librpc/idl/messaging.idl
+++ b/librpc/idl/messaging.idl
@@ -126,7 +126,7 @@ interface messaging
MSG_WINBIND_RELOAD_TRUSTED_DOMAINS = 0x040D,
/* event messages */
- MSG_DUMP_EVENT_LIST = 0x0500,
+ /* MSG_DUMP_EVENT_LIST = 0x0500, Obsoleted */
/* smbXsrv messages */
MSG_SMBXSRV_SESSION_CLOSE = 0x0600,
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index c4b5630..4ecfb3e 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -1184,19 +1184,6 @@ static bool do_winbind_onlinestatus(struct
tevent_context *ev_ctx,
return num_replies;
}
-static bool do_dump_event_list(struct tevent_context *ev_ctx,
- struct messaging_context *msg_ctx,
- const struct server_id pid,
- const int argc, const char **argv)
-{
- if (argc != 1) {
- fprintf(stderr, "Usage: smbcontrol <dest> dump-event-list\n");
- return False;
- }
-
- return send_message(msg_ctx, pid, MSG_DUMP_EVENT_LIST, NULL, 0);
-}
-
static bool do_winbind_dump_domain_list(struct tevent_context *ev_ctx,
struct messaging_context *msg_ctx,
const struct server_id pid,
@@ -1412,7 +1399,6 @@ static const struct {
{ "online", do_winbind_online, "Ask winbind to go into online state"},
{ "offline", do_winbind_offline, "Ask winbind to go into offline
state"},
{ "onlinestatus", do_winbind_onlinestatus, "Request winbind online
status"},
- { "dump-event-list", do_dump_event_list, "Dump event list"},
{ "validate-cache" , do_winbind_validate_cache,
"Validate winbind's credential cache" },
{ "dump-domain-list", do_winbind_dump_domain_list, "Dump winbind domain
list"},
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 9611f73..81b86df 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -1330,9 +1330,6 @@ static void winbindd_register_handlers(struct
messaging_context *msg_ctx,
MSG_WINBIND_DOMAIN_ONLINE,
winbind_msg_domain_online);
messaging_register(msg_ctx, NULL,
- MSG_DUMP_EVENT_LIST, winbind_msg_dump_event_list);
-
- messaging_register(msg_ctx, NULL,
MSG_WINBIND_VALIDATE_CACHE,
winbind_msg_validate_cache);
diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 874d556..fa34e73 100644
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -973,30 +973,6 @@ void winbind_msg_onlinestatus(struct messaging_context
*msg_ctx,
talloc_destroy(mem_ctx);
}
-void winbind_msg_dump_event_list(struct messaging_context *msg_ctx,
- void *private_data,
- uint32_t msg_type,
- struct server_id server_id,
- DATA_BLOB *data)
-{
- struct winbindd_child *child;
-
- DEBUG(10,("winbind_msg_dump_event_list received\n"));
-
- DBG_WARNING("dump event list no longer implemented\n");
-
- for (child = winbindd_children; child != NULL; child = child->next) {
-
- DEBUG(10,("winbind_msg_dump_event_list: sending message to pid
%u\n",
- (unsigned int)child->pid));
-
- messaging_send_buf(msg_ctx, pid_to_procid(child->pid),
- MSG_DUMP_EVENT_LIST,
- NULL, 0);
- }
-
-}
-
void winbind_msg_dump_domain_list(struct messaging_context *msg_ctx,
void *private_data,
uint32_t msg_type,
@@ -1373,16 +1349,6 @@ static void child_msg_online(struct messaging_context
*msg,
}
}
-static void child_msg_dump_event_list(struct messaging_context *msg,
- void *private_data,
- uint32_t msg_type,
- struct server_id server_id,
- DATA_BLOB *data)
-{
- DEBUG(5,("child_msg_dump_event_list received\n"));
- DBG_WARNING("dump_event_list no longer implemented\n");
-}
-
NTSTATUS winbindd_reinit_after_fork(const struct winbindd_child *myself,
const char *logfilename)
{
@@ -1427,8 +1393,6 @@ NTSTATUS winbindd_reinit_after_fork(const struct
winbindd_child *myself,
messaging_deregister(server_messaging_context(),
MSG_WINBIND_ONLINESTATUS, NULL);
messaging_deregister(server_messaging_context(),
- MSG_DUMP_EVENT_LIST, NULL);
- messaging_deregister(server_messaging_context(),
MSG_WINBIND_DUMP_DOMAIN_LIST, NULL);
messaging_deregister(server_messaging_context(),
MSG_DEBUG, NULL);
@@ -1644,8 +1608,6 @@ static bool fork_domain_child(struct winbindd_child
*child)
messaging_register(server_messaging_context(), NULL,
MSG_WINBIND_ONLINE, child_msg_online);
messaging_register(server_messaging_context(), NULL,
- MSG_DUMP_EVENT_LIST, child_msg_dump_event_list);
- messaging_register(server_messaging_context(), NULL,
MSG_DEBUG, debug_message);
messaging_register(server_messaging_context(), NULL,
MSG_WINBIND_IP_DROPPED,
--
Samba Shared Repository
