The branch, v3-0-test has been updated via 8ad2826c48a0d4d26abc3bb209860c776f55822f (commit) from 56b012b1c4dc48434bf5ae9cb8459bd7ad33d2a1 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test - Log ----------------------------------------------------------------- commit 8ad2826c48a0d4d26abc3bb209860c776f55822f Author: Gerald (Jerry) Carter <[EMAIL PROTECTED]> Date: Tue Nov 20 13:24:03 2007 -0600 Prevent segv in winbindd running on a DC using the "idmap backend" syntax. The number of domains should be counted as they are added and not assumed to match the loop counter. ----------------------------------------------------------------------- Summary of changes: source/nsswitch/idmap.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) Changeset truncated at 500 lines: diff --git a/source/nsswitch/idmap.c b/source/nsswitch/idmap.c index db1c6f3..9c38f6b 100644 --- a/source/nsswitch/idmap.c +++ b/source/nsswitch/idmap.c @@ -376,7 +376,7 @@ NTSTATUS idmap_init(void) */ DEBUG(1, ("Initializing idmap domains\n")); - for (i = 0; dom_list[i]; i++) { + for (i=0, num_domains=0; dom_list[i]; i++) { const char *parm_backend; char *config_option; @@ -384,7 +384,7 @@ NTSTATUS idmap_init(void) if (strequal(dom_list[i], "BUILTIN") || strequal(dom_list[i], get_global_sam_name())) { - DEBUG(0,("idmap_init: Ignoring invalid domain %s\n", + DEBUG(0,("idmap_init: Ignoring domain %s\n", dom_list[i])); continue; } @@ -492,13 +492,17 @@ NTSTATUS idmap_init(void) ret = NT_STATUS_NO_MEMORY; goto done; } - idmap_domains[i] = dom; + idmap_domains[num_domains] = dom; /* save default domain position for future uses */ if (dom->default_domain) { - def_dom_num = i; + def_dom_num = num_domains; } + /* Bump counter to next available slot */ + + num_domains++; + DEBUG(10, ("Domain %s - Backend %s - %sdefault - %sreadonly\n", dom->name, parm_backend, dom->default_domain?"":"not ", @@ -507,9 +511,6 @@ NTSTATUS idmap_init(void) talloc_free(config_option); } - /* save the number of domains we have */ - num_domains = i; - /* automatically add idmap_nss backend if needed */ if ((lp_server_role() == ROLE_DOMAIN_MEMBER) && ( ! pri_dom_is_in_list) && -- Samba Shared Repository