sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-30 13:18:05 +03:00
Code

Random connection robustness related fixes. Display some debugs about

Browse Source 
the currently open connections when winbindd receives a USR1 signal.

Hmm - I've just realised this will conflict with the messaging code
but we don't use that yet.
This commit is contained in:
Tim Potter 0001-01-01 00:00:00 +00:00
parent 0d6d0c31f9
commit caef54e400
5 changed files with 122 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/nsswitch/winbindd.c
View File

@ -55,17 +55,17 @@ static BOOL reload_services_file(BOOL test)
return(ret); return(ret);
} }
static void winbindd_dump_status(void) static void winbindd_status(void)
{ {
struct winbindd_cli_state *tmp; struct winbindd_cli_state *tmp;
DEBUG(0, ("Global status for winbindd:\n")); DEBUG(0, ("winbindd status:\n"));
/* Print client state information */ /* Print client state information */
DEBUG(0, ("\t%d clients currently active\n", num_clients)); DEBUG(0, ("\t%d clients currently active\n", num_clients));
if (DEBUGLEVEL >= 2) { if (DEBUGLEVEL >= 2 && num_clients) {
DEBUG(2, ("\tclient list:\n")); DEBUG(2, ("\tclient list:\n"));
for(tmp = client_list; tmp; tmp = tmp->next) { for(tmp = client_list; tmp; tmp = tmp->next) {
DEBUG(2, ("\t\tpid %d, sock %d, rbl %d, wbl %d\n", DEBUG(2, ("\t\tpid %d, sock %d, rbl %d, wbl %d\n",
@ -79,9 +79,10 @@ static void winbindd_dump_status(void)
static void do_print_winbindd_status(void) static void do_print_winbindd_status(void)
{ {
winbindd_dump_status(); winbindd_status();
winbindd_idmap_dump_status(); winbindd_idmap_status();
winbindd_cache_dump_status(); winbindd_cache_status();
winbindd_cm_status();
} }
/* Flush client cache */ /* Flush client cache */

2
source/nsswitch/winbindd_cache.c
View File

@ -572,6 +572,6 @@ void winbindd_flush_cache(void)
/* Print cache status information */ /* Print cache status information */
void winbindd_cache_dump_status(void) void winbindd_cache_status(void)
{ {
} }

129
source/nsswitch/winbindd_cm.c
View File

@ -74,6 +74,36 @@ enum sam_pipe_type {
SAM_PIPE_GROUP /* A handle on a group */ SAM_PIPE_GROUP /* A handle on a group */
}; };
/* Return a string description of a SAM pipe type */
static char *pipe_type(enum sam_pipe_type pt)
{
char *msg;
switch (pt) {
case SAM_PIPE_BASIC:
msg = "BASIC";
break;
case SAM_PIPE_DOM:
msg = "DOMAIN";
break;
case SAM_PIPE_USER:
msg = "USER";
break;
case SAM_PIPE_GROUP:
msg = "GROUP";
break;
default:
msg = "??";
break;
}
return msg;
}
/* Global list of connections. Initially a DLIST but can become a hash
table or whatever later. */
struct winbindd_cm_conn { struct winbindd_cm_conn {
struct winbindd_cm_conn *prev, *next; struct winbindd_cm_conn *prev, *next;
fstring domain; fstring domain;
@ -82,15 +112,16 @@ struct winbindd_cm_conn {
struct cli_state *cli; struct cli_state *cli;
POLICY_HND pol; POLICY_HND pol;
/* Specific pipe stuff - move into a union? */ /* Pipe-specific properties for this instance */
enum sam_pipe_type sam_pipe_type; /* Domain, user, group etc */ union {
uint32 user_rid, group_rid; struct {
enum sam_pipe_type pipe_type;
uint32 rid;
} samr;
} pipe_data;
}; };
/* Global list of connections. Initially a DLIST but can become a hash
table or whatever later. */
struct winbindd_cm_conn *cm_conns = NULL; struct winbindd_cm_conn *cm_conns = NULL;
/* Get a domain controller name */ /* Get a domain controller name */
@ -260,7 +291,7 @@ CLI_POLICY_HND *cm_get_sam_handle(char *domain)
for (conn = cm_conns; conn; conn = conn->next) { for (conn = cm_conns; conn; conn = conn->next) {
if (strequal(conn->domain, domain) && if (strequal(conn->domain, domain) &&
strequal(conn->pipe_name, PIPE_SAMR) && strequal(conn->pipe_name, PIPE_SAMR) &&
conn->sam_pipe_type == SAM_PIPE_BASIC) { conn->pipe_data.samr.pipe_type == SAM_PIPE_BASIC) {
if (!connection_ok(conn)) if (!connection_ok(conn))
return NULL; return NULL;
@ -314,7 +345,7 @@ CLI_POLICY_HND *cm_get_sam_dom_handle(char *domain, DOM_SID *domain_sid)
for (conn = cm_conns; conn; conn = conn->next) { for (conn = cm_conns; conn; conn = conn->next) {
if (strequal(conn->domain, domain) && if (strequal(conn->domain, domain) &&
strequal(conn->pipe_name, PIPE_SAMR) && strequal(conn->pipe_name, PIPE_SAMR) &&
conn->sam_pipe_type == SAM_PIPE_DOM) { conn->pipe_data.samr.pipe_type == SAM_PIPE_DOM) {
if (!connection_ok(conn)) if (!connection_ok(conn))
return NULL; return NULL;
@ -331,7 +362,7 @@ CLI_POLICY_HND *cm_get_sam_dom_handle(char *domain, DOM_SID *domain_sid)
for (conn = cm_conns; conn; conn = conn->next) { for (conn = cm_conns; conn; conn = conn->next) {
if (strequal(conn->domain, domain) && if (strequal(conn->domain, domain) &&
strequal(conn->pipe_name, PIPE_SAMR) && strequal(conn->pipe_name, PIPE_SAMR) &&
conn->sam_pipe_type == SAM_PIPE_BASIC) conn->pipe_data.samr.pipe_type == SAM_PIPE_BASIC)
basic_conn = conn; basic_conn = conn;
} }
@ -345,7 +376,7 @@ CLI_POLICY_HND *cm_get_sam_dom_handle(char *domain, DOM_SID *domain_sid)
fstrcpy(conn->controller, basic_conn->controller); fstrcpy(conn->controller, basic_conn->controller);
fstrcpy(conn->pipe_name, basic_conn->pipe_name); fstrcpy(conn->pipe_name, basic_conn->pipe_name);
conn->sam_pipe_type = SAM_PIPE_DOM; conn->pipe_data.samr.pipe_type = SAM_PIPE_DOM;
conn->cli = basic_conn->cli; conn->cli = basic_conn->cli;
result = cli_samr_open_domain(conn->cli, conn->cli->mem_ctx, result = cli_samr_open_domain(conn->cli, conn->cli->mem_ctx,
@ -381,8 +412,8 @@ CLI_POLICY_HND *cm_get_sam_user_handle(char *domain, DOM_SID *domain_sid,
for (conn = cm_conns; conn; conn = conn->next) { for (conn = cm_conns; conn; conn = conn->next) {
if (strequal(conn->domain, domain) && if (strequal(conn->domain, domain) &&
strequal(conn->pipe_name, PIPE_SAMR) && strequal(conn->pipe_name, PIPE_SAMR) &&
conn->sam_pipe_type == SAM_PIPE_USER && conn->pipe_data.samr.pipe_type == SAM_PIPE_USER &&
conn->user_rid == user_rid) { conn->pipe_data.samr.rid == user_rid) {
if (!connection_ok(conn)) if (!connection_ok(conn))
return NULL; return NULL;
@ -399,7 +430,7 @@ CLI_POLICY_HND *cm_get_sam_user_handle(char *domain, DOM_SID *domain_sid,
for (conn = cm_conns; conn; conn = conn->next) { for (conn = cm_conns; conn; conn = conn->next) {
if (strequal(conn->domain, domain) && if (strequal(conn->domain, domain) &&
strequal(conn->pipe_name, PIPE_SAMR) && strequal(conn->pipe_name, PIPE_SAMR) &&
conn->sam_pipe_type == SAM_PIPE_DOM) conn->pipe_data.samr.pipe_type == SAM_PIPE_DOM)
basic_conn = conn; basic_conn = conn;
} }
@ -418,9 +449,9 @@ CLI_POLICY_HND *cm_get_sam_user_handle(char *domain, DOM_SID *domain_sid,
fstrcpy(conn->controller, basic_conn->controller); fstrcpy(conn->controller, basic_conn->controller);
fstrcpy(conn->pipe_name, basic_conn->pipe_name); fstrcpy(conn->pipe_name, basic_conn->pipe_name);
conn->sam_pipe_type = SAM_PIPE_USER; conn->pipe_data.samr.pipe_type = SAM_PIPE_USER;
conn->cli = basic_conn->cli; conn->cli = basic_conn->cli;
conn->user_rid = user_rid; conn->pipe_data.samr.rid = user_rid;
result = cli_samr_open_user(conn->cli, conn->cli->mem_ctx, result = cli_samr_open_user(conn->cli, conn->cli->mem_ctx,
&basic_conn->pol, des_access, user_rid, &basic_conn->pol, des_access, user_rid,
@ -455,8 +486,8 @@ CLI_POLICY_HND *cm_get_sam_group_handle(char *domain, DOM_SID *domain_sid,
for (conn = cm_conns; conn; conn = conn->next) { for (conn = cm_conns; conn; conn = conn->next) {
if (strequal(conn->domain, domain) && if (strequal(conn->domain, domain) &&
strequal(conn->pipe_name, PIPE_SAMR) && strequal(conn->pipe_name, PIPE_SAMR) &&
conn->sam_pipe_type == SAM_PIPE_GROUP && conn->pipe_data.samr.pipe_type == SAM_PIPE_GROUP &&
conn->group_rid == group_rid) { conn->pipe_data.samr.rid == group_rid) {
if (!connection_ok(conn)) if (!connection_ok(conn))
return NULL; return NULL;
@ -473,7 +504,7 @@ CLI_POLICY_HND *cm_get_sam_group_handle(char *domain, DOM_SID *domain_sid,
for (conn = cm_conns; conn; conn = conn->next) { for (conn = cm_conns; conn; conn = conn->next) {
if (strequal(conn->domain, domain) && if (strequal(conn->domain, domain) &&
strequal(conn->pipe_name, PIPE_SAMR) && strequal(conn->pipe_name, PIPE_SAMR) &&
conn->sam_pipe_type == SAM_PIPE_DOM) conn->pipe_data.samr.pipe_type == SAM_PIPE_DOM)
basic_conn = conn; basic_conn = conn;
} }
@ -492,9 +523,9 @@ CLI_POLICY_HND *cm_get_sam_group_handle(char *domain, DOM_SID *domain_sid,
fstrcpy(conn->controller, basic_conn->controller); fstrcpy(conn->controller, basic_conn->controller);
fstrcpy(conn->pipe_name, basic_conn->pipe_name); fstrcpy(conn->pipe_name, basic_conn->pipe_name);
conn->sam_pipe_type = SAM_PIPE_GROUP; conn->pipe_data.samr.pipe_type = SAM_PIPE_GROUP;
conn->cli = basic_conn->cli; conn->cli = basic_conn->cli;
conn->group_rid = group_rid; conn->pipe_data.samr.rid = group_rid;
result = cli_samr_open_group(conn->cli, conn->cli->mem_ctx, result = cli_samr_open_group(conn->cli, conn->cli->mem_ctx,
&basic_conn->pol, des_access, group_rid, &basic_conn->pol, des_access, group_rid,
@ -543,3 +574,61 @@ struct cli_state *cm_get_netlogon_cli(char *domain, unsigned char *trust_passwd)
return conn.cli; return conn.cli;
} }
/* Dump the current connection status */
static void dump_conn_list(void)
{
struct winbindd_cm_conn *con;
DEBUG(0, ("\tDomain Controller Pipe\n"));
for(con = cm_conns; con; con = con->next) {
char *msg;
/* Display pipe info */
asprintf(&msg, "\t%-15s %-15s %-16s", con->domain,
con->controller, con->pipe_name);
/* Display sam specific info */
if (strequal(con->pipe_name, PIPE_SAMR)) {
char *msg2;
asprintf(&msg2, "%s %-7s", msg,
pipe_type(con->pipe_data.samr.pipe_type));
free(msg);
msg = msg2;
}
if (strequal(con->pipe_name, PIPE_SAMR) &&
(con->pipe_data.samr.pipe_type == SAM_PIPE_USER ||
con->pipe_data.samr.pipe_type == SAM_PIPE_GROUP)) {
char *msg2;
asprintf(&msg2, "%s %4xh", msg,
con->pipe_data.samr.rid);
free(msg);
msg = msg2;
}
DEBUG(0, ("%s\n", msg));
free(msg);
}
}
void winbindd_cm_status(void)
{
/* List open connections */
DEBUG(0, ("winbindd connection manager status:\n"));
if (cm_conns)
dump_conn_list();
else
DEBUG(0, ("\tNo active connections\n"));
}

4
source/nsswitch/winbindd_idmap.c
View File

@ -251,11 +251,11 @@ BOOL winbindd_idmap_init(void)
#define DUMP_INFO 0 #define DUMP_INFO 0
void winbindd_idmap_dump_status(void) void winbindd_idmap_status(void)
{ {
int user_hwm, group_hwm; int user_hwm, group_hwm;
DEBUG(0, ("Status for winbindd idmap:\n")); DEBUG(0, ("winbindd idmap status:\n"));
/* Get current high water marks */ /* Get current high water marks */

5
source/nsswitch/winbindd_proto.h
View File

@ -43,7 +43,7 @@ BOOL winbindd_fetch_gid_cache_entry(struct winbindd_domain *domain, gid_t gid,
struct winbindd_gr *gr, struct winbindd_gr *gr,
void **extra_data, int *extra_data_len); void **extra_data, int *extra_data_len);
void winbindd_flush_cache(void); void winbindd_flush_cache(void);
void winbindd_cache_dump_status(void); void winbindd_cache_status(void);
/* The following definitions come from nsswitch/winbindd_cm.c */ /* The following definitions come from nsswitch/winbindd_cm.c */
@ -56,6 +56,7 @@ CLI_POLICY_HND *cm_get_sam_user_handle(char *domain, DOM_SID *domain_sid,
CLI_POLICY_HND *cm_get_sam_group_handle(char *domain, DOM_SID *domain_sid, CLI_POLICY_HND *cm_get_sam_group_handle(char *domain, DOM_SID *domain_sid,
uint32 group_rid); uint32 group_rid);
struct cli_state *cm_get_netlogon_cli(char *domain, unsigned char *trust_passwd); struct cli_state *cm_get_netlogon_cli(char *domain, unsigned char *trust_passwd);
void winbindd_cm_status(void);
/* The following definitions come from nsswitch/winbindd_group.c */ /* The following definitions come from nsswitch/winbindd_group.c */
@ -82,7 +83,7 @@ BOOL winbindd_idmap_get_rid_from_uid(uid_t uid, uint32 *user_rid,
BOOL winbindd_idmap_get_rid_from_gid(gid_t gid, uint32 *group_rid, BOOL winbindd_idmap_get_rid_from_gid(gid_t gid, uint32 *group_rid,
struct winbindd_domain **domain); struct winbindd_domain **domain);
BOOL winbindd_idmap_init(void); BOOL winbindd_idmap_init(void);
void winbindd_idmap_dump_status(void); void winbindd_idmap_status(void);
/* The following definitions come from nsswitch/winbindd_misc.c */ /* The following definitions come from nsswitch/winbindd_misc.c */