sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-27 07:42:04 +03:00
Code Activity

MSG_DEBUG now forwarded to all the winbindd children by parent.

Browse Source 
smbcontrol winbindd debug level would only set the debug level of the
parent winbindd process and not the child processes. This patch adds
the functionality of broadcasting the debug message to all winbindd
children. Now the debug level message is propagated to all the winbindd
processes that includes parent and children.
(This used to be commit cfbcfc3ffe)
This commit is contained in:
Darshan Purandare
2008-07-01 11:37:13 -07:00
committed by Jeremy Allison
parent 570d5ecdbd
commit 065760ede0
5 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source3/include/proto.h
View File

@ -502,6 +502,7 @@ const char *debug_classname_from_index(int ndx);
int debug_add_class(const char *classname);
int debug_lookup_classname(const char *classname);
bool debug_parse_levels(const char *params_str);
void debug_message(struct messaging_context *msg_ctx, void *private_data, uint32_t msg_type, struct server_id src, DATA_BLOB *data);
void debug_init(void);
void debug_register_msgs(struct messaging_context *msg_ctx);
void setup_logging(const char *pname, bool interactive);

2
source3/lib/debug.c
View File

@ -476,7 +476,7 @@ bool debug_parse_levels(const char *params_str)
Receive a "set debug level" message.
****************************************************************************/
static void debug_message(struct messaging_context *msg_ctx,
void debug_message(struct messaging_context *msg_ctx,
void *private_data,
uint32_t msg_type,
struct server_id src,

5
source3/winbindd/winbindd.c
View File

@ -1249,6 +1249,11 @@ int main(int argc, char **argv, char **envp)
MSG_WINBIND_DUMP_DOMAIN_LIST,
winbind_msg_dump_domain_list);
/* Register handler for MSG_DEBUG. */
messaging_register(winbind_messaging_context(), NULL,
MSG_DEBUG,
winbind_msg_debug);
netsamlogon_cache_init(); /* Non-critical */
/* clear the cached list of trusted domains */

34
source3/winbindd/winbindd_dual.c
View File

@ -501,6 +501,36 @@ void winbindd_flush_negative_conn_cache(struct winbindd_domain *domain)
}
}
/*
* Parent winbindd process sets its own debug level first and then
* sends a message to all the winbindd children to adjust their debug
* level to that of parents.
*/
void winbind_msg_debug(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_debug: got debug message.\n"));
debug_message(msg_ctx, private_data, MSG_DEBUG, server_id, data);
for (child = children; child != NULL; child = child->next) {
DEBUG(10,("winbind_msg_debug: sending message to pid %u.\n",
(unsigned int)child->pid));
messaging_send_buf(msg_ctx, pid_to_procid(child->pid),
MSG_DEBUG,
data->data,
strlen((char *) data->data) + 1);
}
}
/* Set our domains as offline and forward the offline message to our children. */
void winbind_msg_offline(struct messaging_context *msg_ctx,
@ -1044,6 +1074,8 @@ static bool fork_domain_child(struct winbindd_child *child)
MSG_DUMP_EVENT_LIST, NULL);
messaging_deregister(winbind_messaging_context(),
MSG_WINBIND_DUMP_DOMAIN_LIST, NULL);
messaging_deregister(winbind_messaging_context(),
MSG_DEBUG, NULL);
/* Handle online/offline messages. */
messaging_register(winbind_messaging_context(), NULL,
@ -1054,6 +1086,8 @@ static bool fork_domain_child(struct winbindd_child *child)
MSG_WINBIND_ONLINESTATUS, child_msg_onlinestatus);
messaging_register(winbind_messaging_context(), NULL,
MSG_DUMP_EVENT_LIST, child_msg_dump_event_list);
messaging_register(winbind_messaging_context(), NULL,
MSG_DEBUG, debug_message);
if ( child->domain ) {
child->domain->startup = True;

5
source3/winbindd/winbindd_proto.h
View File

@ -300,6 +300,11 @@ void setup_child(struct winbindd_child *child,
const char *logname);
void winbind_child_died(pid_t pid);
void winbindd_flush_negative_conn_cache(struct winbindd_domain *domain);
void winbind_msg_debug(struct messaging_context *msg_ctx,
void *private_data,
uint32_t msg_type,
struct server_id server_id,
DATA_BLOB *data);
void winbind_msg_offline(struct messaging_context *msg_ctx,
void *private_data,
uint32_t msg_type,