r23141: Use the finddcs() library call rather than a winbind-specific version.
[ira/wip.git] / source / winbind / wb_samba3_cmd.c
index a1593ef8bdef4624c771023e58c38346d54f45ca..7989bec17223e2e2190bcad3c25548ebffe0cfa4 100644 (file)
@@ -4,6 +4,7 @@
 
    Copyright (C) Stefan Metzmacher     2005
    Copyright (C) Volker Lendecke       2005
+   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2005
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 */
 
 #include "includes.h"
-#include "smbd/service_stream.h"
-#include "nsswitch/winbind_nss_config.h"
 #include "nsswitch/winbindd_nss.h"
 #include "winbind/wb_server.h"
-#include "winbind/wb_samba3_protocol.h"
 #include "winbind/wb_async_helpers.h"
-#include "librpc/gen_ndr/nbt.h"
-#include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
-#include "libcli/smb_composite/smb_composite.h"
-#include "include/version.h"
+#include "version.h"
+#include "librpc/gen_ndr/netlogon.h"
+#include "libcli/security/security.h"
+#include "auth/pam_errors.h"
+
+/* 
+   Send off the reply to an async Samba3 query, handling filling in the PAM, NTSTATUS and string errors.
+*/
+
+static void wbsrv_samba3_async_auth_epilogue(NTSTATUS status,
+                                            struct wbsrv_samba3_call *s3call)
+{
+       struct winbindd_response *resp = &s3call->response;
+       if (!NT_STATUS_IS_OK(status)) {
+               resp->result = WINBINDD_ERROR;
+               WBSRV_SAMBA3_SET_STRING(resp->data.auth.nt_status_string,
+                                       nt_errstr(status));
+               WBSRV_SAMBA3_SET_STRING(resp->data.auth.error_string,
+                                       get_friendly_nt_error_msg(status));
+       } else {
+               resp->result = WINBINDD_OK;
+       }
+
+       resp->data.auth.pam_error = nt_status_to_pam(status);
+       resp->data.auth.nt_status = NT_STATUS_V(status);
+
+       wbsrv_samba3_send_reply(s3call);
+}
+
+/* 
+   Send of a generic reply to a Samba3 query
+*/
+
+static void wbsrv_samba3_async_epilogue(NTSTATUS status,
+                                       struct wbsrv_samba3_call *s3call)
+{
+       struct winbindd_response *resp = &s3call->response;
+       if (NT_STATUS_IS_OK(status)) {
+               resp->result = WINBINDD_OK;
+       } else {
+               resp->result = WINBINDD_ERROR;
+       }
+
+       wbsrv_samba3_send_reply(s3call);
+}
+
+/* 
+   Boilerplate commands, simple queries without network traffic 
+*/
 
 NTSTATUS wbsrv_samba3_interface_version(struct wbsrv_samba3_call *s3call)
 {
@@ -44,29 +87,32 @@ NTSTATUS wbsrv_samba3_info(struct wbsrv_samba3_call *s3call)
 {
        s3call->response.result                 = WINBINDD_OK;
        s3call->response.data.info.winbind_separator = *lp_winbind_separator();
-       WBSRV_SAMBA3_SET_STRING(s3call->response.data.info.samba_version, SAMBA_VERSION_STRING);
+       WBSRV_SAMBA3_SET_STRING(s3call->response.data.info.samba_version,
+                               SAMBA_VERSION_STRING);
        return NT_STATUS_OK;
 }
 
 NTSTATUS wbsrv_samba3_domain_name(struct wbsrv_samba3_call *s3call)
 {
        s3call->response.result                 = WINBINDD_OK;
-       WBSRV_SAMBA3_SET_STRING(s3call->response.data.domain_name, lp_workgroup());
+       WBSRV_SAMBA3_SET_STRING(s3call->response.data.domain_name,
+                               lp_workgroup());
        return NT_STATUS_OK;
 }
 
 NTSTATUS wbsrv_samba3_netbios_name(struct wbsrv_samba3_call *s3call)
 {
        s3call->response.result                 = WINBINDD_OK;
-       WBSRV_SAMBA3_SET_STRING(s3call->response.data.netbios_name, lp_netbios_name());
+       WBSRV_SAMBA3_SET_STRING(s3call->response.data.netbios_name,
+                               lp_netbios_name());
        return NT_STATUS_OK;
 }
 
 NTSTATUS wbsrv_samba3_priv_pipe_dir(struct wbsrv_samba3_call *s3call)
 {
        s3call->response.result                 = WINBINDD_OK;
-       s3call->response.extra_data             = smbd_tmp_path(s3call,
-                                                 WINBINDD_SAMBA3_PRIVILEGED_SOCKET);
+       s3call->response.extra_data =
+               smbd_tmp_path(s3call, WINBINDD_SAMBA3_PRIVILEGED_SOCKET);
        NT_STATUS_HAVE_NO_MEMORY(s3call->response.extra_data);
        return NT_STATUS_OK;
 }
@@ -77,141 +123,541 @@ NTSTATUS wbsrv_samba3_ping(struct wbsrv_samba3_call *s3call)
        return NT_STATUS_OK;
 }
 
-struct check_machacc_state {
-       struct wb_finddcs *io;
-       struct smb_composite_connect *conn;
-};
+#if 0
+/* 
+   Validate that we have a working pipe to the domain controller.
+   Return any NT error found in the process
+*/
+
+static void checkmachacc_recv_creds(struct composite_context *ctx);
+
+NTSTATUS wbsrv_samba3_check_machacc(struct wbsrv_samba3_call *s3call)
+{
+       struct composite_context *ctx;
+
+       DEBUG(5, ("wbsrv_samba3_check_machacc called\n"));
+
+       ctx = wb_cmd_checkmachacc_send(s3call->call);
+       NT_STATUS_HAVE_NO_MEMORY(ctx);
 
-static void wbsrv_samba3_check_machacc_receive_tree(struct composite_context *action)
+       ctx->async.fn = checkmachacc_recv_creds;
+       ctx->async.private_data = s3call;
+       s3call->call->flags |= WBSRV_CALL_FLAGS_REPLY_ASYNC;
+       return NT_STATUS_OK;
+}
+       
+static void checkmachacc_recv_creds(struct composite_context *ctx)
 {
        struct wbsrv_samba3_call *s3call =
-               talloc_get_type(action->async.private_data,
+               talloc_get_type(ctx->async.private_data,
                                struct wbsrv_samba3_call);
-       struct check_machacc_state *state =
-               talloc_get_type(s3call->private_data,
-                               struct check_machacc_state);
        NTSTATUS status;
 
-       status = smb_composite_connect_recv(action, state);
-       WBSRV_SAMBA3_SET_STRING(s3call->response.data.auth.nt_status_string,
-                               nt_errstr(status));
-       WBSRV_SAMBA3_SET_STRING(s3call->response.data.auth.error_string,
-                               nt_errstr(status));
-       s3call->response.data.auth.pam_error = nt_status_to_pam(status);
+       status = wb_cmd_checkmachacc_recv(ctx);
 
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(5, ("Connect failed: %s\n", nt_errstr(status)));
-               goto done;
-       }
+       wbsrv_samba3_async_auth_epilogue(status, s3call);
+}
+#endif
+
+/*
+  Find the name of a suitable domain controller, by query on the
+  netlogon pipe to the DC.  
+*/
+
+static void getdcname_recv_dc(struct composite_context *ctx);
+
+NTSTATUS wbsrv_samba3_getdcname(struct wbsrv_samba3_call *s3call)
+{
+       struct composite_context *ctx;
+       struct wbsrv_service *service =
+               s3call->wbconn->listen_socket->service;
+
+       DEBUG(5, ("wbsrv_samba3_getdcname called\n"));
+
+       ctx = wb_cmd_getdcname_send(s3call, service,
+                                   s3call->request.domain_name);
+       NT_STATUS_HAVE_NO_MEMORY(ctx);
+
+       ctx->async.fn = getdcname_recv_dc;
+       ctx->async.private_data = s3call;
+       s3call->flags |= WBSRV_CALL_FLAGS_REPLY_ASYNC;
+       return NT_STATUS_OK;
+}
+
+static void getdcname_recv_dc(struct composite_context *ctx)
+{
+       struct wbsrv_samba3_call *s3call =
+               talloc_get_type(ctx->async.private_data,
+                               struct wbsrv_samba3_call);
+       const char *dcname;
+       NTSTATUS status;
+
+       status = wb_cmd_getdcname_recv(ctx, s3call, &dcname);
+       if (!NT_STATUS_IS_OK(status)) goto done;
 
        s3call->response.result = WINBINDD_OK;
-       
+       WBSRV_SAMBA3_SET_STRING(s3call->response.data.dc_name, dcname);
+
  done:
-       if (!NT_STATUS_IS_OK(status)) {
-               s3call->response.result = WINBINDD_ERROR;
-       }
+       wbsrv_samba3_async_epilogue(status, s3call);
+}
 
-       status = wbsrv_send_reply(s3call->call);
-       if (!NT_STATUS_IS_OK(status)) {
-               wbsrv_terminate_connection(s3call->call->wbconn,
-                                          "wbsrv_queue_reply() failed");
-               return;
+/* 
+   Lookup a user's domain groups
+*/
+
+static void userdomgroups_recv_groups(struct composite_context *ctx);
+
+NTSTATUS wbsrv_samba3_userdomgroups(struct wbsrv_samba3_call *s3call)
+{
+       struct composite_context *ctx;
+       struct dom_sid *sid;
+
+       DEBUG(5, ("wbsrv_samba3_userdomgroups called\n"));
+
+       sid = dom_sid_parse_talloc(s3call, s3call->request.data.sid);
+       if (sid == NULL) {
+               DEBUG(5, ("Could not parse sid %s\n",
+                         s3call->request.data.sid));
+               return NT_STATUS_NO_MEMORY;
        }
+
+       ctx = wb_cmd_userdomgroups_send(
+               s3call, s3call->wbconn->listen_socket->service, sid);
+       NT_STATUS_HAVE_NO_MEMORY(ctx);
+
+       ctx->async.fn = userdomgroups_recv_groups;
+       ctx->async.private_data = s3call;
+       s3call->flags |= WBSRV_CALL_FLAGS_REPLY_ASYNC;
+       return NT_STATUS_OK;
 }
 
-static void wbsrv_samba3_check_machacc_receive_dcs(struct composite_context *action)
+static void userdomgroups_recv_groups(struct composite_context *ctx)
 {
        struct wbsrv_samba3_call *s3call =
-               talloc_get_type(action->async.private_data,
+               talloc_get_type(ctx->async.private_data,
                                struct wbsrv_samba3_call);
-       struct check_machacc_state *state =
-               talloc_get_type(s3call->private_data,
-                               struct check_machacc_state);
-       struct composite_context *ctx;
+       int i, num_sids;
+       struct dom_sid **sids;
+       char *sids_string;
        NTSTATUS status;
 
-       status = wb_finddcs_recv(action, s3call);
-
-       s3call->response.data.auth.nt_status = NT_STATUS_V(status);
-       WBSRV_SAMBA3_SET_STRING(s3call->response.data.auth.nt_status_string,
-                               nt_errstr(status));
-       WBSRV_SAMBA3_SET_STRING(s3call->response.data.auth.error_string,
-                               nt_errstr(status));
-       s3call->response.data.auth.pam_error = nt_status_to_pam(status);
+       status = wb_cmd_userdomgroups_recv(ctx, s3call, &num_sids, &sids);
+       if (!NT_STATUS_IS_OK(status)) goto done;
 
-       if (!NT_STATUS_IS_OK(status)) {
+       sids_string = talloc_strdup(s3call, "");
+       if (sids_string == NULL) {
+               status = NT_STATUS_NO_MEMORY;
                goto done;
        }
 
-       state->conn = talloc(state, struct smb_composite_connect);
-       if (state->conn == NULL) {
+       for (i=0; i<num_sids; i++) {
+               sids_string = talloc_asprintf_append(
+                       sids_string, "%s\n", dom_sid_string(s3call, sids[i]));
+       }
+
+       if (sids_string == NULL) {
                status = NT_STATUS_NO_MEMORY;
                goto done;
        }
 
-       state->conn->in.dest_host = state->io->out.dcs[0].address;
-       state->conn->in.port = 0;
-       state->conn->in.called_name = state->io->out.dcs[0].name;
-       state->conn->in.service = "IPC$";
-       state->conn->in.service_type = "IPC";
-       state->conn->in.workgroup = lp_workgroup();
+       s3call->response.result = WINBINDD_OK;
+       s3call->response.extra_data = sids_string;
+       s3call->response.length += strlen(sids_string)+1;
+       s3call->response.data.num_entries = num_sids;
 
-       state->conn->in.credentials = cli_credentials_init(state->conn);
-       if (state->conn->in.credentials == NULL) {
-               status = NT_STATUS_NO_MEMORY;
-               goto done;
+ done:
+       wbsrv_samba3_async_epilogue(status, s3call);
+}
+
+/* 
+   Lookup the list of SIDs for a user 
+*/
+static void usersids_recv_sids(struct composite_context *ctx);
+
+NTSTATUS wbsrv_samba3_usersids(struct wbsrv_samba3_call *s3call)
+{
+       struct composite_context *ctx;
+       struct dom_sid *sid;
+
+       DEBUG(5, ("wbsrv_samba3_usersids called\n"));
+
+       sid = dom_sid_parse_talloc(s3call, s3call->request.data.sid);
+       if (sid == NULL) {
+               DEBUG(5, ("Could not parse sid %s\n",
+                         s3call->request.data.sid));
+               return NT_STATUS_NO_MEMORY;
        }
-       cli_credentials_set_conf(state->conn->in.credentials);
-       cli_credentials_set_anonymous(state->conn->in.credentials);
 
-       ctx = smb_composite_connect_send(state->conn, s3call->call->event_ctx);
-       if (ctx == NULL) {
+       ctx = wb_cmd_usersids_send(
+               s3call, s3call->wbconn->listen_socket->service, sid);
+       NT_STATUS_HAVE_NO_MEMORY(ctx);
+
+       ctx->async.fn = usersids_recv_sids;
+       ctx->async.private_data = s3call;
+       s3call->flags |= WBSRV_CALL_FLAGS_REPLY_ASYNC;
+       return NT_STATUS_OK;
+}
+
+static void usersids_recv_sids(struct composite_context *ctx)
+{
+       struct wbsrv_samba3_call *s3call =
+               talloc_get_type(ctx->async.private_data,
+                               struct wbsrv_samba3_call);
+       int i, num_sids;
+       struct dom_sid **sids;
+       char *sids_string;
+       NTSTATUS status;
+
+       status = wb_cmd_usersids_recv(ctx, s3call, &num_sids, &sids);
+       if (!NT_STATUS_IS_OK(status)) goto done;
+
+       sids_string = talloc_strdup(s3call, "");
+       if (sids_string == NULL) {
                status = NT_STATUS_NO_MEMORY;
                goto done;
        }
 
-       ctx->async.fn = wbsrv_samba3_check_machacc_receive_tree;
+       for (i=0; i<num_sids; i++) {
+               sids_string = talloc_asprintf_append(
+                       sids_string, "%s\n", dom_sid_string(s3call, sids[i]));
+               if (sids_string == NULL) {
+                       status = NT_STATUS_NO_MEMORY;
+                       goto done;
+               }
+       }
+
+       s3call->response.result = WINBINDD_OK;
+       s3call->response.extra_data = sids_string;
+       s3call->response.length += strlen(sids_string);
+       s3call->response.data.num_entries = num_sids;
+
+       /* Hmmmm. Nasty protocol -- who invented the zeros between the
+        * SIDs? Hmmm. Could have been me -- vl */
+
+       while (*sids_string != '\0') {
+               if ((*sids_string) == '\n') {
+                       *sids_string = '\0';
+               }
+               sids_string += 1;
+       }
+
+ done:
+       wbsrv_samba3_async_epilogue(status, s3call);
+}
+
+/* 
+   Lookup a DOMAIN\\user style name, and return a SID
+*/
+
+static void lookupname_recv_sid(struct composite_context *ctx);
+
+NTSTATUS wbsrv_samba3_lookupname(struct wbsrv_samba3_call *s3call)
+{
+       struct composite_context *ctx;
+       struct wbsrv_service *service =
+               s3call->wbconn->listen_socket->service;
+
+       DEBUG(5, ("wbsrv_samba3_lookupname called\n"));
+
+       ctx = wb_cmd_lookupname_send(s3call, service,
+                                    s3call->request.data.name.dom_name,
+                                    s3call->request.data.name.name);
+       NT_STATUS_HAVE_NO_MEMORY(ctx);
+
+       /* setup the callbacks */
+       ctx->async.fn = lookupname_recv_sid;
+       ctx->async.private_data = s3call;
+       s3call->flags |= WBSRV_CALL_FLAGS_REPLY_ASYNC;
+       return NT_STATUS_OK;
+}
+
+static void lookupname_recv_sid(struct composite_context *ctx)
+{
+       struct wbsrv_samba3_call *s3call =
+               talloc_get_type(ctx->async.private_data,
+                               struct wbsrv_samba3_call);
+       struct wb_sid_object *sid;
+       NTSTATUS status;
+
+       status = wb_cmd_lookupname_recv(ctx, s3call, &sid);
+       if (!NT_STATUS_IS_OK(status)) goto done;
+
+       s3call->response.result = WINBINDD_OK;
+       s3call->response.data.sid.type = sid->type;
+       WBSRV_SAMBA3_SET_STRING(s3call->response.data.sid.sid,
+                               dom_sid_string(s3call, sid->sid));
+
+ done:
+       wbsrv_samba3_async_epilogue(status, s3call);
+}
+
+/* 
+   Lookup a SID, and return a DOMAIN\\user style name
+*/
+
+static void lookupsid_recv_name(struct composite_context *ctx);
+
+NTSTATUS wbsrv_samba3_lookupsid(struct wbsrv_samba3_call *s3call)
+{
+       struct composite_context *ctx;
+       struct wbsrv_service *service =
+               s3call->wbconn->listen_socket->service;
+       struct dom_sid *sid;
+
+       DEBUG(5, ("wbsrv_samba3_lookupsid called\n"));
+
+       sid = dom_sid_parse_talloc(s3call, s3call->request.data.sid);
+       if (sid == NULL) {
+               DEBUG(5, ("Could not parse sid %s\n",
+                         s3call->request.data.sid));
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       ctx = wb_cmd_lookupsid_send(s3call, service, sid);
+       NT_STATUS_HAVE_NO_MEMORY(ctx);
+
+       /* setup the callbacks */
+       ctx->async.fn = lookupsid_recv_name;
+       ctx->async.private_data = s3call;
+       s3call->flags |= WBSRV_CALL_FLAGS_REPLY_ASYNC;
+       return NT_STATUS_OK;
+}
+
+static void lookupsid_recv_name(struct composite_context *ctx)
+{
+       struct wbsrv_samba3_call *s3call =
+               talloc_get_type(ctx->async.private_data,
+                               struct wbsrv_samba3_call);
+       struct wb_sid_object *sid;
+       NTSTATUS status;
+
+       status = wb_cmd_lookupsid_recv(ctx, s3call, &sid);
+       if (!NT_STATUS_IS_OK(status)) goto done;
+
+       s3call->response.result = WINBINDD_OK;
+       s3call->response.data.name.type = sid->type;
+       WBSRV_SAMBA3_SET_STRING(s3call->response.data.name.dom_name,
+                               sid->domain);
+       WBSRV_SAMBA3_SET_STRING(s3call->response.data.name.name, sid->name);
+
+ done:
+       wbsrv_samba3_async_epilogue(status, s3call);
+}
+
+/*
+  Challenge-response authentication.  This interface is used by
+  ntlm_auth and the smbd auth subsystem to pass NTLM authentication
+  requests along a common pipe to the domain controller.  
+
+  The return value (in the async reply) may include the 'info3'
+  (effectivly most things you would want to know about the user), or
+  the NT and LM session keys seperated.
+*/
+
+static void pam_auth_crap_recv(struct composite_context *ctx);
+
+NTSTATUS wbsrv_samba3_pam_auth_crap(struct wbsrv_samba3_call *s3call)
+{
+       struct composite_context *ctx;
+       struct wbsrv_service *service =
+               s3call->wbconn->listen_socket->service;
+       DATA_BLOB chal, nt_resp, lm_resp;
+
+       DEBUG(5, ("wbsrv_samba3_pam_auth_crap called\n"));
+
+       chal.data       = s3call->request.data.auth_crap.chal;
+       chal.length     = sizeof(s3call->request.data.auth_crap.chal);
+       nt_resp.data    = (uint8_t *)s3call->request.data.auth_crap.nt_resp;
+       nt_resp.length  = s3call->request.data.auth_crap.nt_resp_len;
+       lm_resp.data    = (uint8_t *)s3call->request.data.auth_crap.lm_resp;
+       lm_resp.length  = s3call->request.data.auth_crap.lm_resp_len;
+
+       ctx = wb_cmd_pam_auth_crap_send(
+               s3call, service,
+               s3call->request.data.auth_crap.logon_parameters,
+               s3call->request.data.auth_crap.domain,
+               s3call->request.data.auth_crap.user,
+               s3call->request.data.auth_crap.workstation,
+               chal, nt_resp, lm_resp);
+       NT_STATUS_HAVE_NO_MEMORY(ctx);
+
+       ctx->async.fn = pam_auth_crap_recv;
        ctx->async.private_data = s3call;
-       return;
+       s3call->flags |= WBSRV_CALL_FLAGS_REPLY_ASYNC;
+       return NT_STATUS_OK;
+}
+
+static void pam_auth_crap_recv(struct composite_context *ctx)
+{
+       struct wbsrv_samba3_call *s3call =
+               talloc_get_type(ctx->async.private_data,
+                               struct wbsrv_samba3_call);
+       NTSTATUS status;
+       DATA_BLOB info3;
+       struct netr_UserSessionKey user_session_key;
+       struct netr_LMSessionKey lm_key;
+       char *unix_username;
+       
+       status = wb_cmd_pam_auth_crap_recv(ctx, s3call, &info3,
+                                          &user_session_key, &lm_key, &unix_username);
+       if (!NT_STATUS_IS_OK(status)) goto done;
+
+       if (s3call->request.flags & WBFLAG_PAM_USER_SESSION_KEY) {
+               memcpy(s3call->response.data.auth.user_session_key, 
+                      &user_session_key.key,
+                      sizeof(s3call->response.data.auth.user_session_key));
+       }
+
+       if (s3call->request.flags & WBFLAG_PAM_INFO3_NDR) {
+               s3call->response.extra_data = info3.data;
+               s3call->response.length += info3.length;
+       }
+
+       if (s3call->request.flags & WBFLAG_PAM_LMKEY) {
+               memcpy(s3call->response.data.auth.first_8_lm_hash, 
+                      lm_key.key,
+                      sizeof(s3call->response.data.auth.first_8_lm_hash));
+       }
+       
+       if (s3call->request.flags & WBFLAG_PAM_UNIX_NAME) {
+               s3call->response.extra_data = unix_username;
+               s3call->response.length += strlen(unix_username)+1;
+       }
 
  done:
-       if (!NT_STATUS_IS_OK(status)) {
-               s3call->response.result = WINBINDD_ERROR;
+       wbsrv_samba3_async_auth_epilogue(status, s3call);
+}
+
+/* Helper function: Split a domain\\user string into it's parts,
+ * because the client supplies it as one string */
+
+static BOOL samba3_parse_domuser(TALLOC_CTX *mem_ctx, const char *domuser,
+                                char **domain, char **user)
+{
+       char *p = strchr(domuser, *lp_winbind_separator());
+
+       if (p == NULL) {
+               *domain = talloc_strdup(mem_ctx, lp_workgroup());
+       } else {
+               *domain = talloc_strndup(mem_ctx, domuser,
+                                        PTR_DIFF(p, domuser));
+               domuser = p+1;
        }
 
-       status = wbsrv_send_reply(s3call->call);
-       if (!NT_STATUS_IS_OK(status)) {
-               wbsrv_terminate_connection(s3call->call->wbconn,
-                                          "wbsrv_queue_reply() failed");
-               return;
+       *user = talloc_strdup(mem_ctx, domuser);
+
+       return ((*domain != NULL) && (*user != NULL));
+}
+
+/* Plaintext authentication 
+   
+   This interface is used by ntlm_auth in it's 'basic' authentication
+   mode, as well as by pam_winbind to authenticate users where we are
+   given a plaintext password.
+*/
+
+static void pam_auth_recv(struct composite_context *ctx);
+
+NTSTATUS wbsrv_samba3_pam_auth(struct wbsrv_samba3_call *s3call)
+{
+       struct composite_context *ctx;
+       struct wbsrv_service *service =
+               s3call->wbconn->listen_socket->service;
+       char *user, *domain;
+
+       if (!samba3_parse_domuser(s3call, 
+                                s3call->request.data.auth.user,
+                                &domain, &user)) {
+               return NT_STATUS_NO_SUCH_USER;
        }
+
+       ctx = wb_cmd_pam_auth_send(s3call, service, domain, user,
+                                  s3call->request.data.auth.pass);
+       NT_STATUS_HAVE_NO_MEMORY(ctx);
+
+       ctx->async.fn = pam_auth_recv;
+       ctx->async.private_data = s3call;
+       s3call->flags |= WBSRV_CALL_FLAGS_REPLY_ASYNC;
+       return NT_STATUS_OK;
 }
 
-NTSTATUS wbsrv_samba3_check_machacc(struct wbsrv_samba3_call *s3call)
+static void pam_auth_recv(struct composite_context *ctx)
 {
-       struct composite_context *resolve_req;
-       struct check_machacc_state *state;
+       struct wbsrv_samba3_call *s3call =
+               talloc_get_type(ctx->async.private_data,
+                               struct wbsrv_samba3_call);
+       NTSTATUS status;
 
-       DEBUG(5, ("check_machacc called\n"));
+       status = wb_cmd_pam_auth_recv(ctx);
+
+       if (!NT_STATUS_IS_OK(status)) goto done;
+
+ done:
+       wbsrv_samba3_async_auth_epilogue(status, s3call);
+}
 
-       state = talloc(s3call, struct check_machacc_state);
-       NT_STATUS_HAVE_NO_MEMORY(state);
+/* 
+   List trusted domains
+*/
 
-       state->io = talloc(s3call, struct wb_finddcs);
-       NT_STATUS_HAVE_NO_MEMORY(state->io);
-       s3call->private_data = state;
+static void list_trustdom_recv_doms(struct composite_context *ctx);
 
-       state->io->in.msg_ctx = s3call->call->wbconn->conn->msg_ctx;
-       state->io->in.domain = lp_workgroup();
+NTSTATUS wbsrv_samba3_list_trustdom(struct wbsrv_samba3_call *s3call)
+{
+       struct composite_context *ctx;
+       struct wbsrv_service *service =
+               s3call->wbconn->listen_socket->service;
 
-       resolve_req = wb_finddcs_send(state->io, s3call->call->event_ctx);
-       NT_STATUS_HAVE_NO_MEMORY(resolve_req);
+       DEBUG(5, ("wbsrv_samba3_list_trustdom called\n"));
 
-       /* setup the callbacks */
-       resolve_req->async.fn = wbsrv_samba3_check_machacc_receive_dcs;
-       resolve_req->async.private_data = s3call;
+       ctx = wb_cmd_list_trustdoms_send(s3call, service);
+       NT_STATUS_HAVE_NO_MEMORY(ctx);
 
-       /* tell the caller we reply later */
-       s3call->call->flags |= WBSRV_CALL_FLAGS_REPLY_ASYNC;
+       ctx->async.fn = list_trustdom_recv_doms;
+       ctx->async.private_data = s3call;
+       s3call->flags |= WBSRV_CALL_FLAGS_REPLY_ASYNC;
        return NT_STATUS_OK;
 }
+
+static void list_trustdom_recv_doms(struct composite_context *ctx)
+{
+       struct wbsrv_samba3_call *s3call =
+               talloc_get_type(ctx->async.private_data,
+                               struct wbsrv_samba3_call);
+       int i, num_domains;
+       struct wb_dom_info **domains;
+       NTSTATUS status;
+       char *result;
+
+       status = wb_cmd_list_trustdoms_recv(ctx, s3call, &num_domains,
+                                           &domains);
+       if (!NT_STATUS_IS_OK(status)) goto done;
+
+       result = talloc_strdup(s3call, "");
+       if (result == NULL) {
+               status = NT_STATUS_NO_MEMORY;
+               goto done;
+       }
+
+       for (i=0; i<num_domains; i++) {
+               result = talloc_asprintf_append(
+                       result, "%s\\%s\\%s",
+                       domains[i]->name, domains[i]->name,
+                       dom_sid_string(s3call, domains[i]->sid));
+       }
+
+       if (result == NULL) {
+               status = NT_STATUS_NO_MEMORY;
+               goto done;
+       }
+
+       s3call->response.result = WINBINDD_OK;
+       if (num_domains > 0) {
+               s3call->response.extra_data = result;
+               s3call->response.length += strlen(result)+1;
+       }
+
+ done:
+       wbsrv_samba3_async_epilogue(status, s3call);
+}