wb-ndr: use WINBIND_TRUST_LEVEL_COMPAT_LIST instead of WINBINDD_LIST_TRUSTDOM
[metze/samba/wb-ndr.git] / source / winbindd / winbindd_misc.c
index 76f2554122b476482e8c80a4d49af7b9a0db0fbb..4e4154adc593e0662aa26a88bed9077c8b7acebe 100644 (file)
@@ -97,27 +97,114 @@ enum winbindd_result winbindd_dual_check_machine_acct(struct winbindd_domain *do
        return NT_STATUS_IS_OK(result) ? WINBINDD_OK : WINBINDD_ERROR;
 }
 
+/* Constants and helper functions for determining domain trust types */
+
+enum trust_type {
+       EXTERNAL = 0,
+       FOREST,
+       IN_FOREST,
+       NONE,
+};
+
+const char *trust_type_strings[] = {"External", 
+                                   "Forest", 
+                                   "In Forest",
+                                   "None"};
+
+static enum trust_type get_trust_type(struct winbindd_tdc_domain *domain)
+{
+       if (domain->trust_attribs == NETR_TRUST_ATTRIBUTE_QUARANTINED_DOMAIN)   
+               return EXTERNAL;
+       else if (domain->trust_attribs == NETR_TRUST_ATTRIBUTE_FOREST_TRANSITIVE)
+               return FOREST;
+       else if (((domain->trust_flags & NETR_TRUST_FLAG_IN_FOREST) == NETR_TRUST_FLAG_IN_FOREST) &&
+           ((domain->trust_flags & NETR_TRUST_FLAG_PRIMARY) == 0x0))
+               return IN_FOREST;
+       return NONE;    
+}
+
+static const char *get_trust_type_string(struct winbindd_tdc_domain *domain)
+{
+       return trust_type_strings[get_trust_type(domain)];
+}
+
+static bool trust_is_inbound(struct winbindd_tdc_domain *domain)
+{
+       return (domain->trust_flags == 0x0) ||
+           ((domain->trust_flags & NETR_TRUST_FLAG_IN_FOREST) ==
+            NETR_TRUST_FLAG_IN_FOREST) ||                      
+           ((domain->trust_flags & NETR_TRUST_FLAG_INBOUND) ==
+           NETR_TRUST_FLAG_INBOUND);           
+}
+
+static bool trust_is_outbound(struct winbindd_tdc_domain *domain)
+{
+       return (domain->trust_flags == 0x0) ||
+           ((domain->trust_flags & NETR_TRUST_FLAG_IN_FOREST) ==
+            NETR_TRUST_FLAG_IN_FOREST) ||                      
+           ((domain->trust_flags & NETR_TRUST_FLAG_OUTBOUND) ==
+           NETR_TRUST_FLAG_OUTBOUND);          
+}
+
+static bool trust_is_transitive(struct winbindd_tdc_domain *domain)
+{
+       if ((domain->trust_attribs == NETR_TRUST_ATTRIBUTE_NON_TRANSITIVE) ||         
+           (domain->trust_attribs == NETR_TRUST_ATTRIBUTE_QUARANTINED_DOMAIN) ||
+           (domain->trust_attribs == NETR_TRUST_ATTRIBUTE_TREAT_AS_EXTERNAL))
+               return False;
+       return True;
+}
+
 void winbindd_list_trusted_domains(struct winbindd_cli_state *state)
 {
-       struct winbindd_domain *d = NULL;
+       struct winbindd_tdc_domain *dom_list = NULL;
+       struct winbindd_tdc_domain *d = NULL;
+       size_t num_domains = 0;
        int extra_data_len = 0;
        char *extra_data = NULL;
+       int i = 0;
        
        DEBUG(3, ("[%5lu]: list trusted domains\n",
                  (unsigned long)state->pid));
 
-       for ( d=domain_list(); d; d=d->next ) {
+       if( !wcache_tdc_fetch_list( &dom_list, &num_domains )) {
+               request_error(state);   
+               goto done;
+       }
+
+       for ( i = 0; i < num_domains; i++ ) {
+               struct winbindd_domain *domain;
+               bool is_online = true;          
+
+               d = &dom_list[i];
+               domain = find_domain_from_name_noinit(d->domain_name);
+               if (domain) {
+                       is_online = domain->online;
+               }
+
                if ( !extra_data ) {
-                       extra_data = talloc_asprintf(
-                               state->mem_ctx, "%s\\%s\\%s",
-                               d->name, d->alt_name ? d->alt_name : d->name,
-                               sid_string_talloc(state->mem_ctx, &d->sid));
+                       extra_data = talloc_asprintf(state->mem_ctx, 
+                                                    "%s\\%s\\%s\\%s\\%s\\%s\\%s\\%s",
+                                                    d->domain_name,
+                                                    d->dns_name ? d->dns_name : d->domain_name,
+                                                    sid_string_talloc(state->mem_ctx, &d->sid),
+                                                    get_trust_type_string(d),
+                                                    trust_is_transitive(d) ? "Yes" : "No",
+                                                    trust_is_inbound(d) ? "Yes" : "No",
+                                                    trust_is_outbound(d) ? "Yes" : "No",
+                                                    is_online ? "Online" : "Offline" );
                } else {
-                       extra_data = talloc_asprintf(
-                               state->mem_ctx, "%s\n%s\\%s\\%s",
-                               extra_data, d->name,
-                               d->alt_name ? d->alt_name : d->name,
-                               sid_string_talloc(state->mem_ctx, &d->sid));
+                       extra_data = talloc_asprintf(state->mem_ctx, 
+                                                    "%s\n%s\\%s\\%s\\%s\\%s\\%s\\%s\\%s",
+                                                    extra_data,
+                                                    d->domain_name,
+                                                    d->dns_name ? d->dns_name : d->domain_name,
+                                                    sid_string_talloc(state->mem_ctx, &d->sid),
+                                                    get_trust_type_string(d),
+                                                    trust_is_transitive(d) ? "Yes" : "No",
+                                                    trust_is_inbound(d) ? "Yes" : "No",
+                                                    trust_is_outbound(d) ? "Yes" : "No",
+                                                    is_online ? "Online" : "Offline" );
                }
        }
        
@@ -131,24 +218,24 @@ void winbindd_list_trusted_domains(struct winbindd_cli_state *state)
                state->response.length += extra_data_len+1;
        }
 
-       TALLOC_FREE( extra_data );      
-
        request_ok(state);      
+done:
+       TALLOC_FREE( dom_list );
+       TALLOC_FREE( extra_data );      
 }
 
-enum winbindd_result winbindd_dual_list_trusted_domains(struct winbindd_domain *domain,
-                                                       struct winbindd_cli_state *state)
+static void ndr_child_trust_compat_list(struct winbindd_domain *domain,
+                                       struct winbindd_cli_state *state,
+                                       struct winbind_trust *r)
 {
-       uint32 i, num_domains;
+       uint32_t i, num_domains;
        char **names, **alt_names;
        DOM_SID *sids;
-       int extra_data_len = 0;
-       char *extra_data;
        NTSTATUS result;
        bool have_own_domain = False;
+       struct winbind_domain_info_compat *t;
 
-       DEBUG(3, ("[%5lu]: list trusted domains\n",
-                 (unsigned long)state->pid));
+       DEBUG(3, ("list trusted domains\n"));
 
        result = domain->methods->trusted_domains(domain, state->mem_ctx,
                                                  &num_domains, &names,
@@ -157,60 +244,94 @@ enum winbindd_result winbindd_dual_list_trusted_domains(struct winbindd_domain *
        if (!NT_STATUS_IS_OK(result)) {
                DEBUG(3, ("winbindd_dual_list_trusted_domains: trusted_domains returned %s\n",
                        nt_errstr(result) ));
-               return WINBINDD_ERROR;
+               r->out.result = WINBIND_STATUS_FOOBAR;
+               return;
        }
 
-       extra_data = talloc_strdup(state->mem_ctx, "");
-
-       if (num_domains > 0)
-               extra_data = talloc_asprintf(
-                       state->mem_ctx, "%s\\%s\\%s",
-                       names[0], alt_names[0] ? alt_names[0] : names[0],
-                       sid_string_talloc(state->mem_ctx, &sids[0]));
-
-       for (i=1; i<num_domains; i++)
-               extra_data = talloc_asprintf(
-                       state->mem_ctx, "%s\n%s\\%s\\%s",
-                       extra_data, names[i],
-                       alt_names[i] ? alt_names[i] : names[i],
-                       sid_string_talloc(state->mem_ctx, &sids[i]));
+       t = talloc_array(r->out.rep,
+                        struct winbind_domain_info_compat,
+                        num_domains + 1);
+       if (!t) {
+               r->out.result = WINBIND_STATUS_NO_MEMORY;
+               return;
+       }
 
-       /* add our primary domain */
-       
        for (i=0; i<num_domains; i++) {
+               t[i].netbios_name       = names[i];
+               t[i].dns_name           = alt_names[i] ?
+                                         alt_names[i] :
+                                         names[i];
+               t[i].sid                = &sids[i];
+               /* TODO: fill this in */
+               t[i].is_native_mode     = false;
+               t[i].is_active_directory= false;
+               t[i].is_primary         = false;
+
                if (strequal(names[i], domain->name)) {
                        have_own_domain = True;
-                       break;
+                       t[i].is_native_mode     = domain->native_mode;
+                       t[i].is_active_directory= domain->active_directory;
+                       t[i].is_primary         = domain->primary;
                }
        }
 
-       if (state->request.data.list_all_domains && !have_own_domain) {
-               extra_data = talloc_asprintf(
-                       state->mem_ctx, "%s\n%s\\%s\\%s",
-                       extra_data, domain->name,
-                       domain->alt_name ? domain->alt_name : domain->name,
-                       sid_string_talloc(state->mem_ctx, &domain->sid));
+       /* add our primary domain */
+       if (!have_own_domain) {
+               t[i].netbios_name       = domain->name;
+               t[i].dns_name           = domain->alt_name ?
+                                         domain->alt_name :
+                                         domain->name;
+               t[i].sid                = &domain->sid;
+               t[i].is_native_mode     = domain->native_mode;
+               t[i].is_active_directory= domain->active_directory;
+               t[i].is_primary         = domain->primary;
+               i++;
        }
 
-       /* This is a bit excessive, but the extra data sooner or later will be
-          talloc'ed */
+       r->out.rep->compat_trusts.num_domains   = i;
+       r->out.rep->compat_trusts.domains       = t;
+       r->out.result = WINBIND_STATUS_OK;
+}
 
-       extra_data_len = 0;
-       if (extra_data != NULL) {
-               extra_data_len = strlen(extra_data);
+void winbindd_ndr_domain_child_trust(struct winbindd_domain *domain,
+                                    struct winbindd_cli_state *state)
+{
+       struct winbind_trust *r;
+
+       r = talloc_get_type_abort(state->c.ndr.r,
+                                 struct winbind_trust);
+
+       switch (*r->in.level) {
+       case WINBIND_TRUST_LEVEL_COMPAT_LIST:
+               ndr_child_trust_compat_list(domain, state, r);
+               return;
        }
 
-       if (extra_data_len > 0) {
-               state->response.extra_data.data = SMB_STRDUP(extra_data);
-               state->response.length += extra_data_len+1;
+       r->out.result = WINBIND_STATUS_UNKNOWN_LEVEL;
+       return;
+}
+
+static void winbindd_getdcname_recv(void *private_data,
+                                   bool success,
+                                   struct winbind_get_dc_info *r)
+{
+       struct winbindd_cli_state *state =
+               talloc_get_type_abort(private_data, struct winbindd_cli_state);
+
+       if (!success) {
+               request_error(state);
+               return;
        }
 
-       return WINBINDD_OK;
+       fstrcpy(state->response.data.dc_name, r->out.dc_info->name);
+
+       request_ok(state);
 }
 
 void winbindd_getdcname(struct winbindd_cli_state *state)
 {
        struct winbindd_domain *domain;
+       struct winbind_get_dc_info *r;
 
        state->request.domain_name
                [sizeof(state->request.domain_name)-1] = '\0';
@@ -225,31 +346,97 @@ void winbindd_getdcname(struct winbindd_cli_state *state)
                return;
        }
 
-       sendto_domain(state, find_our_domain());
+       r = TALLOC_P(state->mem_ctx, struct winbind_get_dc_info);
+       if (!r) goto nomem;
+       r->in.level = TALLOC_P(r, enum winbind_dc_info_level);
+       if (!r->in.level) goto nomem;
+
+       *r->in.level            = WINBIND_DC_INFO_LEVEL_COMPAT_NT4;
+       r->in.domain_name       = state->request.domain_name;
+
+       winbindd_get_dc_info_async_domain(state->mem_ctx, find_our_domain(),
+                                         r, winbindd_getdcname_recv, state);
+       return;
+nomem:
+       request_error(state);
+       return;
 }
 
-enum winbindd_result winbindd_dual_getdcname(struct winbindd_domain *domain,
-                                            struct winbindd_cli_state *state)
+static void winbindd_get_dc_info_recv(TALLOC_CTX *mem_ctx, bool success,
+                                     struct winbindd_ndr_call *c,
+                                     void *_r,
+                                     void *_cont,
+                                     void *private_data)
 {
-       char *dcname_slash = NULL;
-       char *p;
+       void (*cont)(void *priv, bool succ, struct winbind_get_dc_info *r) =
+               (void (*)(void *, bool, struct winbind_get_dc_info*))_cont;
+       struct winbind_get_dc_info *r =
+               talloc_get_type_abort(_r, struct winbind_get_dc_info);
+
+       if (!success) {
+               DEBUG(5, ("Could not get dc_info\n"));
+               cont(private_data, False, r);
+               return;
+       }
+
+       if (r->out.result != WINBIND_STATUS_OK) {
+               DEBUG(5, ("get_dc_info returned an error:0x%08X\n",
+                       r->out.result));
+               cont(private_data, False, r);
+               return;
+       }
+
+       cont(private_data, True, r);
+}
+
+void winbindd_get_dc_info_async_domain(TALLOC_CTX *mem_ctx,
+                                      struct winbindd_domain *domain,
+                                      struct winbind_get_dc_info *r,
+                                      void (*cont)(void *private_data,
+                                                   bool success,
+                                                   struct winbind_get_dc_info *r),
+                                      void *private_data)
+{
+       do_async_ndr_domain(mem_ctx, domain,
+                           NDR_WINBIND_GET_DC_INFO, r,
+                           winbindd_get_dc_info_recv, r,
+                           (void *)cont, private_data);
+}
+
+void winbindd_get_dc_info_async_child(TALLOC_CTX *mem_ctx,
+                                     struct winbindd_child *child,
+                                     struct winbind_get_dc_info *r,
+                                     void (*cont)(void *private_data,
+                                                  bool success,
+                                                  struct winbind_get_dc_info *r),
+                                     void *private_data)
+{
+       do_async_ndr(mem_ctx, child,
+                    NDR_WINBIND_GET_DC_INFO, r,
+                    winbindd_get_dc_info_recv, r,
+                    (void *)cont, private_data);
+}
+
+static void ndr_child_get_dc_info_comapt_nt4(struct winbindd_domain *domain,
+                                            struct winbindd_cli_state *state,
+                                            struct winbind_get_dc_info *r)
+{
+       const char *dcname_slash;
+       const char *p;
        struct rpc_pipe_client *netlogon_pipe;
        NTSTATUS result;
        WERROR werr;
        unsigned int orig_timeout;
        struct winbindd_domain *req_domain;
 
-       state->request.domain_name
-               [sizeof(state->request.domain_name)-1] = '\0';
-
-       DEBUG(3, ("[%5lu]: Get DC name for %s\n", (unsigned long)state->pid,
-                 state->request.domain_name));
+       DEBUG(3, ("Get DC name for '%s'\n", r->in.domain_name));
 
        result = cm_connect_netlogon(domain, &netlogon_pipe);
 
        if (!NT_STATUS_IS_OK(result)) {
                DEBUG(1, ("Can't contact the NETLOGON pipe\n"));
-               return WINBINDD_ERROR;
+               r->out.result = WINBIND_STATUS_FOOBAR;
+               return;
        }
 
        /* This call can take a long time - allow the server to time out.
@@ -257,25 +444,42 @@ enum winbindd_result winbindd_dual_getdcname(struct winbindd_domain *domain,
 
        orig_timeout = cli_set_timeout(netlogon_pipe->cli, 35000);
 
-       req_domain = find_domain_from_name_noinit(state->request.domain_name);
+       /*
+        * if the requested domain name matches the current one
+        * we need to use GetDCName(), because GetAnyDCName() only
+        * works for trusted domains
+        */
+       req_domain = find_domain_from_name_noinit(r->in.domain_name);
        if (req_domain == domain) {
-               werr = rpccli_netlogon_getdcname(netlogon_pipe, state->mem_ctx,
-                                                domain->dcname,
-                                                state->request.domain_name,
-                                                &dcname_slash);
+               result = rpccli_netr_GetDcName(netlogon_pipe,
+                                              r,
+                                              domain->dcname,
+                                              r->in.domain_name,
+                                              &dcname_slash,
+                                              &werr);
        } else {
-               werr = rpccli_netlogon_getanydcname(netlogon_pipe, state->mem_ctx,
-                                                   domain->dcname,
-                                                   state->request.domain_name,
-                                                   &dcname_slash);
+               result = rpccli_netr_GetAnyDCName(netlogon_pipe,
+                                                 r,
+                                                 domain->dcname,
+                                                 r->in.domain_name,
+                                                 &dcname_slash,
+                                                 &werr);
        }
        /* And restore our original timeout. */
        cli_set_timeout(netlogon_pipe->cli, orig_timeout);
 
+       if (!NT_STATUS_IS_OK(result)) {
+               DEBUG(5,("Error requesting DCname for domain %s: %s\n",
+                       r->in.domain_name, nt_errstr(result)));
+               r->out.result = WINBIND_STATUS_FOOBAR;
+               return;
+       }
+
        if (!W_ERROR_IS_OK(werr)) {
                DEBUG(5, ("Error requesting DCname for domain %s: %s\n",
-                       state->request.domain_name, dos_errstr(werr)));
-               return WINBINDD_ERROR;
+                       r->in.domain_name, dos_errstr(werr)));
+               r->out.result = WINBIND_STATUS_FOOBAR;
+               return;
        }
 
        p = dcname_slash;
@@ -286,20 +490,90 @@ enum winbindd_result winbindd_dual_getdcname(struct winbindd_domain *domain,
                p+=1;
        }
 
-       fstrcpy(state->response.data.dc_name, p);
-       return WINBINDD_OK;
+       r->out.dc_info->name = talloc_strdup(r, p);
+       if (!r->out.dc_info->name) {
+               r->out.result = WINBIND_STATUS_NO_MEMORY;
+               return;
+       }
+       r->out.result = WINBIND_STATUS_OK;
+}
+
+void winbindd_ndr_domain_child_get_dc_info(struct winbindd_domain *domain,
+                                          struct winbindd_cli_state *state)
+{
+       struct winbind_get_dc_info *r;
+
+       r = talloc_get_type_abort(state->c.ndr.r,
+                                 struct winbind_get_dc_info);
+
+       switch (*r->in.level) {
+       case WINBIND_DC_INFO_LEVEL_COMPAT_NT4:
+               ndr_child_get_dc_info_comapt_nt4(domain, state, r);
+               return;
+
+       case WINBIND_DC_INFO_LEVEL_COMPAT_DS:
+               r->out.result = WINBIND_STATUS_INVALID_LEVEL;
+               return;
+       }
+
+       r->out.result = WINBIND_STATUS_UNKNOWN_LEVEL;
+       return;
+}
+
+static void winbindd_get_domain_info_recv(TALLOC_CTX *mem_ctx, bool success,
+                                         struct winbindd_ndr_call *c,
+                                         void *_r,
+                                         void *_cont,
+                                         void *private_data)
+{
+       void (*cont)(void *priv, bool succ, struct winbind_get_domain_info *r) =
+               (void (*)(void *, bool, struct winbind_get_domain_info*))_cont;
+       struct winbind_get_domain_info *r =
+               talloc_get_type_abort(_r, struct winbind_get_domain_info);
+
+       if (!success) {
+               DEBUG(5, ("Could not get domain_info\n"));
+               cont(private_data, False, r);
+               return;
+       }
+
+       if (r->out.result != WINBIND_STATUS_OK) {
+               DEBUG(5, ("get_domain_info returned an error:0x%08X\n",
+                       r->out.result));
+               cont(private_data, False, r);
+               return;
+       }
+
+       cont(private_data, True, r);
+}
+
+void winbindd_get_domain_info_async(TALLOC_CTX *mem_ctx,
+                                   struct winbindd_domain *domain,
+                                   struct winbind_get_domain_info *r,
+                                   void (*cont)(void *private_data,
+                                                bool success,
+                                                struct winbind_get_domain_info *r),
+                                   void *private_data)
+{
+       do_async_ndr_domain(mem_ctx, domain,
+                           NDR_WINBIND_GET_DOMAIN_INFO, r,
+                           winbindd_get_domain_info_recv, r,
+                           (void *)cont, private_data);
 }
 
 struct sequence_state {
-       TALLOC_CTX *mem_ctx;
        struct winbindd_cli_state *cli_state;
        struct winbindd_domain *domain;
-       struct winbindd_request *request;
-       struct winbindd_response *response;
+       struct winbind_get_domain_info *r;
        char *extra_data;
+       void (*recv_fn)(void *priv, bool succ,
+                       struct winbind_get_domain_info *r);
 };
 
-static void sequence_recv(void *private_data, bool success);
+static void sequence_one_recv(void *private_data, bool success,
+                             struct winbind_get_domain_info *r);
+static void sequence_next_recv(void *private_data, bool success,
+                              struct winbind_get_domain_info *r);
 
 void winbindd_show_sequence(struct winbindd_cli_state *state)
 {
@@ -308,76 +582,87 @@ void winbindd_show_sequence(struct winbindd_cli_state *state)
        /* Ensure null termination */
        state->request.domain_name[sizeof(state->request.domain_name)-1]='\0';
 
+       seq = TALLOC_P(state->mem_ctx, struct sequence_state);
+       if (!seq) goto nomem;
+       seq->cli_state = state;
+       seq->extra_data = talloc_strdup(state->mem_ctx, "");
+       if (!seq->extra_data) goto nomem;
+       seq->r = TALLOC_P(seq, struct winbind_get_domain_info);
+       if (!seq->r) goto nomem;
+       seq->r->in.level = TALLOC_P(seq->r, enum winbind_domain_info_level);
+       if (!seq->r->in.level) goto nomem;
+
        if (strlen(state->request.domain_name) > 0) {
-               struct winbindd_domain *domain;
-               domain = find_domain_from_name_noinit(
+               seq->domain = find_domain_from_name_noinit(
                        state->request.domain_name);
-               if (domain == NULL) {
+               if (seq->domain == NULL) {
+                       DEBUG(0,("domain '%s' not found\n",
+                                state->request.domain_name));
                        request_error(state);
                        return;
                }
-               sendto_domain(state, domain);
-               return;
+               seq->recv_fn = sequence_one_recv;
+       } else {
+               seq->domain = domain_list();
+               if (seq->domain == NULL) {
+                       DEBUG(0, ("domain list empty\n"));
+                       request_error(state);
+                       return;
+               }
+               seq->recv_fn = sequence_next_recv;
        }
 
-       /* Ask all domains in sequence, collect the results in sequence_recv */
+       *seq->r->in.level       = WINBIND_DOMAIN_INFO_LEVEL_SEQNUM;
+       seq->r->in.domain_name  = seq->domain->name;
+       seq->r->in.dc_name      = NULL;
 
-       seq = TALLOC_P(state->mem_ctx, struct sequence_state);
-       if (seq == NULL) {
-               DEBUG(0, ("talloc failed\n"));
-               request_error(state);
-               return;
-       }
+       winbindd_get_domain_info_async(seq, seq->domain, seq->r,
+                                      seq->recv_fn, seq);
+       return;
+nomem:
+       request_error(state);
+       return;
+}
 
-       seq->mem_ctx = state->mem_ctx;
-       seq->cli_state = state;
-       seq->domain = domain_list();
-       if (seq->domain == NULL) {
-               DEBUG(0, ("domain list empty\n"));
-               request_error(state);
-               return;
-       }
-       seq->request = TALLOC_ZERO_P(state->mem_ctx,
-                                    struct winbindd_request);
-       seq->response = TALLOC_ZERO_P(state->mem_ctx,
-                                     struct winbindd_response);
-       seq->extra_data = talloc_strdup(state->mem_ctx, "");
+static void sequence_one_recv(void *private_data, bool success,
+                             struct winbind_get_domain_info *r)
+{
+       struct sequence_state *state = talloc_get_type_abort(private_data,
+                                      struct sequence_state);
 
-       if ((seq->request == NULL) || (seq->response == NULL) ||
-           (seq->extra_data == NULL)) {
-               DEBUG(0, ("talloc failed\n"));
-               request_error(state);
+       if (!success) {
+               request_error(state->cli_state);
                return;
        }
 
-       seq->request->length = sizeof(*seq->request);
-       seq->request->cmd = WINBINDD_SHOW_SEQUENCE;
-       fstrcpy(seq->request->domain_name, seq->domain->name);
+       state->cli_state->response.data.sequence_number =
+               state->r->out.domain_info->seqnum;
 
-       async_domain_request(state->mem_ctx, seq->domain,
-                            seq->request, seq->response,
-                            sequence_recv, seq);
+       request_ok(state->cli_state);
 }
 
-static void sequence_recv(void *private_data, bool success)
+static void sequence_next_recv(void *private_data, bool success,
+                              struct winbind_get_domain_info *r)
 {
-       struct sequence_state *state =
-               (struct sequence_state *)private_data;
-       uint32 seq = DOM_SEQUENCE_NONE;
+       struct sequence_state *state = talloc_get_type_abort(private_data,
+                                      struct sequence_state);
+       uint64_t seq = DOM_SEQUENCE_NONE;
 
-       if ((success) && (state->response->result == WINBINDD_OK))
-               seq = state->response->data.sequence_number;
+       if (success) {
+               seq = state->r->out.domain_info->seqnum;
+       }
 
        if (seq == DOM_SEQUENCE_NONE) {
-               state->extra_data = talloc_asprintf(state->mem_ctx,
+               state->extra_data = talloc_asprintf(state,
                                                    "%s%s : DISCONNECTED\n",
                                                    state->extra_data,
                                                    state->domain->name);
        } else {
-               state->extra_data = talloc_asprintf(state->mem_ctx,
-                                                   "%s%s : %d\n",
+               state->extra_data = talloc_asprintf(state,
+                                                   "%s%s : %lld\n",
                                                    state->extra_data,
-                                                   state->domain->name, seq);
+                                                   state->domain->name,
+                                                   (unsigned long long)seq);
        }
 
        state->domain->sequence_number = seq;
@@ -396,29 +681,12 @@ static void sequence_recv(void *private_data, bool success)
        }
 
        /* Ask the next domain */
-       fstrcpy(state->request->domain_name, state->domain->name);
-       async_domain_request(state->mem_ctx, state->domain,
-                            state->request, state->response,
-                            sequence_recv, state);
-}
-
-/* This is the child-only version of --sequence. It only allows for a single
- * domain (ie "our" one) to be displayed. */
-
-enum winbindd_result winbindd_dual_show_sequence(struct winbindd_domain *domain,
-                                                struct winbindd_cli_state *state)
-{
-       DEBUG(3, ("[%5lu]: show sequence\n", (unsigned long)state->pid));
-
-       /* Ensure null termination */
-       state->request.domain_name[sizeof(state->request.domain_name)-1]='\0';
-
-       domain->methods->sequence_number(domain, &domain->sequence_number);
+       *state->r->in.level     = WINBIND_DOMAIN_INFO_LEVEL_SEQNUM;
+       state->r->in.domain_name= state->domain->name;
+       state->r->in.dc_name    = NULL;
 
-       state->response.data.sequence_number =
-               domain->sequence_number;
-
-       return WINBINDD_OK;
+       winbindd_get_domain_info_async(state, state->domain, state->r,
+                                      state->recv_fn, state);
 }
 
 struct domain_info_state {
@@ -512,10 +780,22 @@ static void domain_info_init_recv(void *private_data, bool success)
 
 void winbindd_ping(struct winbindd_cli_state *state)
 {
+       if (lp_parm_bool(-1, "winbindd", "ping_our_domain", False)) {
+               sendto_domain(state, find_our_domain());
+               return;
+       }
+
        DEBUG(3, ("[%5lu]: ping\n", (unsigned long)state->pid));
        request_ok(state);
 }
 
+enum winbindd_result winbindd_dual_ping(struct winbindd_domain *domain,
+                                       struct winbindd_cli_state *state)
+{
+       DEBUG(3, ("[%5lu]: (dual) ping\n", (unsigned long)state->pid));
+       return WINBINDD_OK;
+}
+
 /* List various tidbits of information */
 
 void winbindd_info(struct winbindd_cli_state *state)