winbindd: Remove now unused domain->methods

[samba.git] / source3 / winbindd / winbindd_ndr.c

diff --git a/source3/winbindd/winbindd_ndr.c b/source3/winbindd/winbindd_ndr.c
index 396aa06985d60b37d08acb067b291c1c9382fb4f..028eb50a10b147eeb5f0ca5df92f4a1e80216c72 100644 (file)
--- a/source3/winbindd/winbindd_ndr.c
+++ b/source3/winbindd/winbindd_ndr.c
@@ -21,6 +21,8 @@
 #include "winbindd.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 #include "../librpc/gen_ndr/ndr_security.h"
+#include "../librpc/gen_ndr/ndr_lsa.h"
+#include "../librpc/ndr/libndr.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
@@ -73,6 +75,7 @@ void ndr_print_winbindd_cm_conn(struct ndr_print *ndr,
 
 #ifdef HAVE_ADS
 extern struct winbindd_methods ads_methods;
+extern struct winbindd_methods reconnect_ads_methods;
 #endif
 extern struct winbindd_methods msrpc_methods;
 extern struct winbindd_methods builtin_passdb_methods;
@@ -98,6 +101,8 @@ void ndr_print_winbindd_methods(struct ndr_print *ndr,
 #ifdef HAVE_ADS
        } else if (r == &ads_methods) {
                ndr_print_string(ndr, name, "ads_methods");
+       } else if (r == &reconnect_ads_methods) {
+               ndr_print_string(ndr, name, "reconnect_ads_methods");
 #endif
        } else if (r == &builtin_passdb_methods) {
                ndr_print_string(ndr, name, "builtin_passdb_methods");
@@ -120,6 +125,7 @@ void ndr_print_winbindd_domain(struct ndr_print *ndr,
                               const char *name,
                               const struct winbindd_domain *r)
 {
+       int i;
        if (!r) {
                return;
        }
@@ -131,8 +137,8 @@ void ndr_print_winbindd_domain(struct ndr_print *ndr,
        ndr_print_string(ndr, "forest_name", r->forest_name);
        ndr_print_dom_sid(ndr, "sid", &r->sid);
        ndr_print_netr_TrustFlags(ndr, "domain_flags", r->domain_flags);
-       ndr_print_netr_TrustType(ndr, "domain_type", r->domain_type);
-       ndr_print_netr_TrustAttributes(ndr, "domain_trust_attribs", r->domain_trust_attribs);
+       ndr_print_lsa_TrustType(ndr, "domain_type", r->domain_type);
+       ndr_print_lsa_TrustAttributes(ndr, "domain_trust_attribs", r->domain_trust_attribs);
        ndr_print_bool(ndr, "initialized", r->initialized);
        ndr_print_bool(ndr, "native_mode", r->native_mode);
        ndr_print_bool(ndr, "active_directory", r->active_directory);
@@ -141,7 +147,6 @@ void ndr_print_winbindd_domain(struct ndr_print *ndr,
        ndr_print_bool(ndr, "online", r->online);
        ndr_print_time_t(ndr, "startup_time", r->startup_time);
        ndr_print_bool(ndr, "startup", r->startup);
-       ndr_print_winbindd_methods(ndr, "methods", r->methods);
        ndr_print_winbindd_methods(ndr, "backend", r->backend);
        ndr_print_ptr(ndr, "private_data", r->private_data);
        ndr_print_string(ndr, "dcname", r->dcname);
@@ -150,7 +155,9 @@ void ndr_print_winbindd_domain(struct ndr_print *ndr,
        ndr_print_uint32(ndr, "sequence_number", r->sequence_number);
        ndr_print_NTSTATUS(ndr, "last_status", r->last_status);
        ndr_print_winbindd_cm_conn(ndr, "conn", &r->conn);
-       ndr_print_winbindd_child(ndr, "child", &r->child);
+       for (i=0; i<lp_winbind_max_domain_connections(); i++) {
+               ndr_print_winbindd_child(ndr, "children", &r->children[i]);
+       }
        ndr_print_uint32(ndr, "check_online_timeout", r->check_online_timeout);
        ndr_print_ptr(ndr, "check_online_event", r->check_online_event);
        ndr->depth--;