smbd: Remove two unnecessary return; statements
[samba.git] / source3 / rpcclient / cmd_netlogon.c
index 9e3f35545c3c81da674c9448de01253c173fbab6..4db23793c63909ed8872bfba320991e96351c166 100644 (file)
 
 #include "includes.h"
 #include "rpcclient.h"
+#include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
+#include "../librpc/gen_ndr/ndr_netlogon_c.h"
+#include "rpc_client/cli_netlogon.h"
+#include "secrets.h"
+#include "../libcli/auth/netlogon_creds_cli.h"
+#include "rpc_client/util_netlogon.h"
 
 static WERROR cmd_netlogon_logon_ctrl2(struct rpc_pipe_client *cli,
                                       TALLOC_CTX *mem_ctx, int argc,
@@ -34,10 +41,35 @@ static WERROR cmd_netlogon_logon_ctrl2(struct rpc_pipe_client *cli,
        union netr_CONTROL_DATA_INFORMATION data;
        union netr_CONTROL_QUERY_INFORMATION query;
        const char *domain = lp_workgroup();
-
-       if (argc > 5) {
+       struct dcerpc_binding_handle *b = cli->binding_handle;
+       int i;
+#define fn_code_level(x, item) { x, #x, #item }
+       struct {
+               enum netr_LogonControlCode code;
+               const char *name;
+               const char *argument;
+       } supported_levels[] = {
+               fn_code_level(NETLOGON_CONTROL_REDISCOVER, domain),
+               fn_code_level(NETLOGON_CONTROL_TC_QUERY, domain),
+               fn_code_level(NETLOGON_CONTROL_TRANSPORT_NOTIFY, domain),
+               fn_code_level(NETLOGON_CONTROL_FIND_USER, user),
+               fn_code_level(NETLOGON_CONTROL_CHANGE_PASSWORD, domain),
+               fn_code_level(NETLOGON_CONTROL_TC_VERIFY, domain),
+               fn_code_level(NETLOGON_CONTROL_SET_DBFLAG, debug_level),
+               {0, 0, 0}
+       };
+#undef fn_code_level
+       if ((argc > 5) || (argc < 2)) {
                fprintf(stderr, "Usage: %s <logon_server> <function_code> "
-                       "<level> <domain>\n", argv[0]);
+                       "<level:1..4> <argument>\n", argv[0]);
+               fprintf(stderr, "Supported combinations:\n");
+               fprintf(stderr, "function_code\targument\n");
+               for(i=0; supported_levels[i].code; i++) {
+                       fprintf(stderr, "%7d\t\t%s\t(%s)\n",
+                               supported_levels[i].code,
+                               supported_levels[i].argument,
+                               supported_levels[i].name);
+               }
                return WERR_OK;
        }
 
@@ -60,13 +92,21 @@ static WERROR cmd_netlogon_logon_ctrl2(struct rpc_pipe_client *cli,
        switch (function_code) {
                case NETLOGON_CONTROL_REDISCOVER:
                case NETLOGON_CONTROL_TC_QUERY:
+               case NETLOGON_CONTROL_CHANGE_PASSWORD:
+               case NETLOGON_CONTROL_TRANSPORT_NOTIFY:
+               case NETLOGON_CONTROL_TC_VERIFY:
                        data.domain = domain;
                        break;
+               case NETLOGON_CONTROL_FIND_USER:
+                       data.user = domain;
+                       break;
+               case NETLOGON_CONTROL_SET_DBFLAG:
+                       data.debug_level = atoi(domain);
                default:
                        break;
        }
 
-       status = rpccli_netr_LogonControl2(cli, mem_ctx,
+       status = dcerpc_netr_LogonControl2(b, mem_ctx,
                                          logon_server,
                                          function_code,
                                          level,
@@ -94,6 +134,7 @@ static WERROR cmd_netlogon_getanydcname(struct rpc_pipe_client *cli,
        WERROR werr;
        NTSTATUS status;
        int old_timeout;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc != 2) {
                fprintf(stderr, "Usage: %s domainname\n", argv[0]);
@@ -104,7 +145,7 @@ static WERROR cmd_netlogon_getanydcname(struct rpc_pipe_client *cli,
        old_timeout = rpccli_set_timeout(cli, 30000); /* 30 seconds. */
        rpccli_set_timeout(cli, MAX(old_timeout, 30000)); /* At least 30 sec */
 
-       status = rpccli_netr_GetAnyDCName(cli, mem_ctx,
+       status = dcerpc_netr_GetAnyDCName(b, mem_ctx,
                                          cli->desthost,
                                          argv[1],
                                          &dcname,
@@ -134,6 +175,7 @@ static WERROR cmd_netlogon_getdcname(struct rpc_pipe_client *cli,
        NTSTATUS status;
        WERROR werr;
        int old_timeout;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc != 2) {
                fprintf(stderr, "Usage: %s domainname\n", argv[0]);
@@ -144,7 +186,7 @@ static WERROR cmd_netlogon_getdcname(struct rpc_pipe_client *cli,
        old_timeout = rpccli_set_timeout(cli, 30000); /* 30 seconds. */
        rpccli_set_timeout(cli, MAX(30000, old_timeout)); /* At least 30 sec */
 
-       status = rpccli_netr_GetDcName(cli, mem_ctx,
+       status = dcerpc_netr_GetDcName(b, mem_ctx,
                                       cli->desthost,
                                       argv[1],
                                       &dcname,
@@ -172,12 +214,13 @@ static WERROR cmd_netlogon_dsr_getdcname(struct rpc_pipe_client *cli,
 {
        NTSTATUS result;
        WERROR werr = WERR_OK;
-       uint32 flags = DS_RETURN_DNS_NAME;
+       uint32_t flags = DS_RETURN_DNS_NAME;
        const char *server_name = cli->desthost;
-       const char *domain_name;
+       const char *domain_name = NULL;
        struct GUID domain_guid = GUID_zero();
        struct GUID site_guid = GUID_zero();
        struct netr_DsRGetDCNameInfo *info = NULL;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc < 2) {
                fprintf(stderr, "Usage: %s [domain_name] [domain_guid] "
@@ -190,22 +233,20 @@ static WERROR cmd_netlogon_dsr_getdcname(struct rpc_pipe_client *cli,
 
        if (argc >= 3) {
                if (!NT_STATUS_IS_OK(GUID_from_string(argv[2], &domain_guid))) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
        }
 
        if (argc >= 4) {
                if (!NT_STATUS_IS_OK(GUID_from_string(argv[3], &site_guid))) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
        }
 
        if (argc >= 5)
                sscanf(argv[4], "%x", &flags);
 
-       debug_dsdcinfo_flags(1,flags);
-
-       result = rpccli_netr_DsRGetDCName(cli, mem_ctx,
+       result = dcerpc_netr_DsRGetDCName(b, mem_ctx,
                                          server_name,
                                          domain_name,
                                          &domain_guid,
@@ -213,6 +254,9 @@ static WERROR cmd_netlogon_dsr_getdcname(struct rpc_pipe_client *cli,
                                          flags,
                                          &info,
                                          &werr);
+       if (!NT_STATUS_IS_OK(result)) {
+               return ntstatus_to_werror(result);
+       }
 
        if (W_ERROR_IS_OK(werr)) {
                d_printf("DsGetDcName gave: %s\n",
@@ -238,6 +282,7 @@ static WERROR cmd_netlogon_dsr_getdcnameex(struct rpc_pipe_client *cli,
        const char *site_name = NULL;
        struct GUID domain_guid = GUID_zero();
        struct netr_DsRGetDCNameInfo *info = NULL;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc < 2) {
                fprintf(stderr, "Usage: %s [domain_name] [domain_guid] "
@@ -249,7 +294,7 @@ static WERROR cmd_netlogon_dsr_getdcnameex(struct rpc_pipe_client *cli,
 
        if (argc >= 3) {
                if (!NT_STATUS_IS_OK(GUID_from_string(argv[2], &domain_guid))) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
        }
 
@@ -261,9 +306,7 @@ static WERROR cmd_netlogon_dsr_getdcnameex(struct rpc_pipe_client *cli,
                sscanf(argv[4], "%x", &flags);
        }
 
-       debug_dsdcinfo_flags(1,flags);
-
-       status = rpccli_netr_DsRGetDCNameEx(cli, mem_ctx,
+       status = dcerpc_netr_DsRGetDCNameEx(b, mem_ctx,
                                            server_name,
                                            domain_name,
                                            &domain_guid,
@@ -299,6 +342,7 @@ static WERROR cmd_netlogon_dsr_getdcnameex2(struct rpc_pipe_client *cli,
        const char *site_name = NULL;
        struct GUID domain_guid = GUID_zero();
        struct netr_DsRGetDCNameInfo *info = NULL;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc < 2) {
                fprintf(stderr, "Usage: %s [client_account] [acb_mask] "
@@ -321,7 +365,7 @@ static WERROR cmd_netlogon_dsr_getdcnameex2(struct rpc_pipe_client *cli,
 
        if (argc >= 5) {
                if (!NT_STATUS_IS_OK(GUID_from_string(argv[4], &domain_guid))) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
        }
 
@@ -333,9 +377,7 @@ static WERROR cmd_netlogon_dsr_getdcnameex2(struct rpc_pipe_client *cli,
                sscanf(argv[6], "%x", &flags);
        }
 
-       debug_dsdcinfo_flags(1,flags);
-
-       status = rpccli_netr_DsRGetDCNameEx2(cli, mem_ctx,
+       status = dcerpc_netr_DsRGetDCNameEx2(b, mem_ctx,
                                             server_name,
                                             client_account,
                                             mask,
@@ -367,13 +409,14 @@ static WERROR cmd_netlogon_dsr_getsitename(struct rpc_pipe_client *cli,
        WERROR werr;
        NTSTATUS status;
        const char *sitename = NULL;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc != 2) {
                fprintf(stderr, "Usage: %s computername\n", argv[0]);
                return WERR_OK;
        }
 
-       status = rpccli_netr_DsRGetSiteName(cli, mem_ctx,
+       status = dcerpc_netr_DsRGetSiteName(b, mem_ctx,
                                            argv[1],
                                            &sitename,
                                            &werr);
@@ -402,6 +445,7 @@ static WERROR cmd_netlogon_logon_ctrl(struct rpc_pipe_client *cli,
        enum netr_LogonControlCode function_code = 1;
        uint32_t level = 1;
        union netr_CONTROL_QUERY_INFORMATION info;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc > 4) {
                fprintf(stderr, "Usage: %s <logon_server> <function_code> "
@@ -421,7 +465,7 @@ static WERROR cmd_netlogon_logon_ctrl(struct rpc_pipe_client *cli,
                level = atoi(argv[3]);
        }
 
-       status = rpccli_netr_LogonControl(cli, mem_ctx,
+       status = dcerpc_netr_LogonControl(b, mem_ctx,
                                          logon_server,
                                          function_code,
                                          level,
@@ -440,247 +484,6 @@ static WERROR cmd_netlogon_logon_ctrl(struct rpc_pipe_client *cli,
        return werr;
 }
 
-/* Display sam synchronisation information */
-
-static void display_sam_sync(struct netr_DELTA_ENUM_ARRAY *r)
-{
-       uint32_t i, j;
-
-       for (i=0; i < r->num_deltas; i++) {
-
-               union netr_DELTA_UNION u = r->delta_enum[i].delta_union;
-               union netr_DELTA_ID_UNION id = r->delta_enum[i].delta_id_union;
-
-               switch (r->delta_enum[i].delta_type) {
-               case NETR_DELTA_DOMAIN:
-                       printf("Domain: %s\n",
-                               u.domain->domain_name.string);
-                       break;
-               case NETR_DELTA_GROUP:
-                       printf("Group: %s\n",
-                               u.group->group_name.string);
-                       break;
-               case NETR_DELTA_DELETE_GROUP:
-                       printf("Delete Group: %d\n",
-                               u.delete_account.unknown);
-                       break;
-               case NETR_DELTA_RENAME_GROUP:
-                       printf("Rename Group: %s -> %s\n",
-                               u.rename_group->OldName.string,
-                               u.rename_group->NewName.string);
-                       break;
-               case NETR_DELTA_USER:
-                       printf("Account: %s\n",
-                               u.user->account_name.string);
-                       break;
-               case NETR_DELTA_DELETE_USER:
-                       printf("Delete User: %d\n",
-                               id.rid);
-                       break;
-               case NETR_DELTA_RENAME_USER:
-                       printf("Rename user: %s -> %s\n",
-                               u.rename_user->OldName.string,
-                               u.rename_user->NewName.string);
-                       break;
-               case NETR_DELTA_GROUP_MEMBER:
-                       for (j=0; j < u.group_member->num_rids; j++) {
-                               printf("rid 0x%x, attrib 0x%08x\n",
-                                       u.group_member->rids[j],
-                                       u.group_member->attribs[j]);
-                       }
-                       break;
-               case NETR_DELTA_ALIAS:
-                       printf("Alias: %s\n",
-                               u.alias->alias_name.string);
-                       break;
-               case NETR_DELTA_DELETE_ALIAS:
-                       printf("Delete Alias: %d\n",
-                               r->delta_enum[i].delta_id_union.rid);
-                       break;
-               case NETR_DELTA_RENAME_ALIAS:
-                       printf("Rename alias: %s -> %s\n",
-                               u.rename_alias->OldName.string,
-                               u.rename_alias->NewName.string);
-                       break;
-               case NETR_DELTA_ALIAS_MEMBER:
-                       for (j=0; j < u.alias_member->sids.num_sids; j++) {
-                               fstring sid_str;
-                               sid_to_fstring(sid_str,
-                                       u.alias_member->sids.sids[j].sid);
-                               printf("%s\n", sid_str);
-                       }
-                       break;
-               case NETR_DELTA_POLICY:
-                       printf("Policy\n");
-                       break;
-               case NETR_DELTA_TRUSTED_DOMAIN:
-                       printf("Trusted Domain: %s\n",
-                               u.trusted_domain->domain_name.string);
-                       break;
-               case NETR_DELTA_DELETE_TRUST:
-                       printf("Delete Trust: %d\n",
-                               u.delete_trust.unknown);
-                       break;
-               case NETR_DELTA_ACCOUNT:
-                       printf("Account\n");
-                       break;
-               case NETR_DELTA_DELETE_ACCOUNT:
-                       printf("Delete Account: %d\n",
-                               u.delete_account.unknown);
-                       break;
-               case NETR_DELTA_SECRET:
-                       printf("Secret\n");
-                       break;
-               case NETR_DELTA_DELETE_SECRET:
-                       printf("Delete Secret: %d\n",
-                               u.delete_secret.unknown);
-                       break;
-               case NETR_DELTA_DELETE_GROUP2:
-                       printf("Delete Group2: %s\n",
-                               u.delete_group->account_name);
-                       break;
-               case NETR_DELTA_DELETE_USER2:
-                       printf("Delete User2: %s\n",
-                               u.delete_user->account_name);
-                       break;
-               case NETR_DELTA_MODIFY_COUNT:
-                       printf("sam sequence update: 0x%016llx\n",
-                               (unsigned long long) *u.modified_count);
-                       break;
-               default:
-                       printf("unknown delta type 0x%02x\n",
-                               r->delta_enum[i].delta_type);
-                       break;
-               }
-       }
-}
-
-/* Perform sam synchronisation */
-
-static NTSTATUS cmd_netlogon_sam_sync(struct rpc_pipe_client *cli,
-                                      TALLOC_CTX *mem_ctx, int argc,
-                                      const char **argv)
-{
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-       const char *logon_server = cli->desthost;
-       const char *computername = global_myname();
-       struct netr_Authenticator credential;
-       struct netr_Authenticator return_authenticator;
-       enum netr_SamDatabaseID database_id = SAM_DATABASE_DOMAIN;
-       uint16_t restart_state = 0;
-       uint32_t sync_context = 0;
-
-        if (argc > 2) {
-                fprintf(stderr, "Usage: %s [database_id]\n", argv[0]);
-                return NT_STATUS_OK;
-        }
-
-       if (argc == 2) {
-               database_id = atoi(argv[1]);
-       }
-
-       /* Synchronise sam database */
-
-       do {
-               struct netr_DELTA_ENUM_ARRAY *delta_enum_array = NULL;
-
-               netlogon_creds_client_step(cli->dc, &credential);
-
-               result = rpccli_netr_DatabaseSync2(cli, mem_ctx,
-                                                  logon_server,
-                                                  computername,
-                                                  &credential,
-                                                  &return_authenticator,
-                                                  database_id,
-                                                  restart_state,
-                                                  &sync_context,
-                                                  &delta_enum_array,
-                                                  0xffff);
-
-               /* Check returned credentials. */
-               if (!netlogon_creds_client_check(cli->dc,
-                                                &return_authenticator.cred)) {
-                       DEBUG(0,("credentials chain check failed\n"));
-                       return NT_STATUS_ACCESS_DENIED;
-               }
-
-               if (NT_STATUS_IS_ERR(result)) {
-                       break;
-               }
-
-               /* Display results */
-
-               display_sam_sync(delta_enum_array);
-
-               TALLOC_FREE(delta_enum_array);
-
-       } while (NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES));
-
-       return result;
-}
-
-/* Perform sam delta synchronisation */
-
-static NTSTATUS cmd_netlogon_sam_deltas(struct rpc_pipe_client *cli,
-                                       TALLOC_CTX *mem_ctx, int argc,
-                                       const char **argv)
-{
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-       uint32_t tmp;
-       const char *logon_server = cli->desthost;
-       const char *computername = global_myname();
-       struct netr_Authenticator credential;
-       struct netr_Authenticator return_authenticator;
-       enum netr_SamDatabaseID database_id = SAM_DATABASE_DOMAIN;
-       uint64_t sequence_num;
-
-       if (argc != 3) {
-               fprintf(stderr, "Usage: %s database_id seqnum\n", argv[0]);
-               return NT_STATUS_OK;
-       }
-
-       database_id = atoi(argv[1]);
-       tmp = atoi(argv[2]);
-
-       sequence_num = tmp & 0xffff;
-
-       do {
-               struct netr_DELTA_ENUM_ARRAY *delta_enum_array = NULL;
-
-               netlogon_creds_client_step(cli->dc, &credential);
-
-               result = rpccli_netr_DatabaseDeltas(cli, mem_ctx,
-                                                   logon_server,
-                                                   computername,
-                                                   &credential,
-                                                   &return_authenticator,
-                                                   database_id,
-                                                   &sequence_num,
-                                                   &delta_enum_array,
-                                                   0xffff);
-
-               /* Check returned credentials. */
-               if (!netlogon_creds_client_check(cli->dc,
-                                                &return_authenticator.cred)) {
-                       DEBUG(0,("credentials chain check failed\n"));
-                       return NT_STATUS_ACCESS_DENIED;
-               }
-
-               if (NT_STATUS_IS_ERR(result)) {
-                       break;
-               }
-
-               /* Display results */
-
-               display_sam_sync(delta_enum_array);
-
-               TALLOC_FREE(delta_enum_array);
-
-       } while (NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES));
-
-        return result;
-}
-
 /* Log on a domain user */
 
 static NTSTATUS cmd_netlogon_sam_logon(struct rpc_pipe_client *cli, 
@@ -690,15 +493,20 @@ static NTSTATUS cmd_netlogon_sam_logon(struct rpc_pipe_client *cli,
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        int logon_type = NetlogonNetworkInformation;
        const char *username, *password;
-       int auth_level = 2;
-       uint32 logon_param = 0;
+       uint32_t logon_param = 0;
        const char *workstation = NULL;
+       struct netr_SamInfo3 *info3 = NULL;
+       uint8_t authoritative = 0;
+       uint32_t flags = 0;
+       uint16_t validation_level;
+       union netr_Validation *validation = NULL;
+       uint64_t logon_id = 0;
 
        /* Check arguments */
 
-       if (argc < 3 || argc > 7) {
+       if (argc < 3 || argc > 6) {
                fprintf(stderr, "Usage: samlogon <username> <password> [workstation]"
-                       "[logon_type (1 or 2)] [auth level (2 or 3)] [logon_parameter]\n");
+                       "[logon_type (1 or 2)] [logon_parameter]\n");
                return NT_STATUS_OK;
        }
 
@@ -711,19 +519,42 @@ static NTSTATUS cmd_netlogon_sam_logon(struct rpc_pipe_client *cli,
        if (argc >= 5)
                sscanf(argv[4], "%i", &logon_type);
 
-       if (argc >= 6)
-               sscanf(argv[5], "%i", &auth_level);
+       if (argc == 6)
+               sscanf(argv[5], "%x", &logon_param);
 
-       if (argc == 7)
-               sscanf(argv[6], "%x", &logon_param);
+       if (rpcclient_netlogon_creds == NULL) {
+               result = NT_STATUS_UNSUCCESSFUL;
+               goto done;
+       }
+       logon_id = generate_random_u64();
 
        /* Perform the sam logon */
 
-       result = rpccli_netlogon_sam_logon(cli, mem_ctx, logon_param, lp_workgroup(), username, password, workstation, logon_type);
-
+       result = rpccli_netlogon_password_logon(rpcclient_netlogon_creds,
+                                               cli->binding_handle,
+                                               mem_ctx,
+                                               logon_param,
+                                               lp_workgroup(),
+                                               username,
+                                               password,
+                                               workstation,
+                                               logon_id,
+                                               logon_type,
+                                               &authoritative,
+                                               &flags,
+                                               &validation_level,
+                                               &validation);
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
+       result = map_validation_to_info3(mem_ctx,
+                                        validation_level,
+                                        validation,
+                                        &info3);
+       if (!NT_STATUS_IS_OK(result)) {
+               return result;
+       }
+
  done:
        return result;
 }
@@ -735,6 +566,7 @@ static NTSTATUS cmd_netlogon_change_trust_pw(struct rpc_pipe_client *cli,
                                             const char **argv)
 {
         NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       const char *dcname = cli->desthost;
 
         /* Check arguments */
 
@@ -743,11 +575,12 @@ static NTSTATUS cmd_netlogon_change_trust_pw(struct rpc_pipe_client *cli,
                 return NT_STATUS_OK;
         }
 
-        /* Perform the sam logon */
-
-       result = trust_pw_find_change_and_store_it(cli, mem_ctx,
-                                                  lp_workgroup());
-
+       result = trust_pw_change(rpcclient_netlogon_creds,
+                                rpcclient_msg_ctx,
+                                cli->binding_handle,
+                                lp_workgroup(),
+                                dcname,
+                                true); /* force */
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
@@ -760,10 +593,11 @@ static WERROR cmd_netlogon_gettrustrid(struct rpc_pipe_client *cli,
                                       const char **argv)
 {
        NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
-       WERROR werr = WERR_GENERAL_FAILURE;
+       WERROR werr = WERR_GEN_FAILURE;
        const char *server_name = cli->desthost;
        const char *domain_name = lp_workgroup();
        uint32_t rid = 0;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc < 1 || argc > 3) {
                fprintf(stderr, "Usage: %s <server_name> <domain_name>\n",
@@ -779,12 +613,13 @@ static WERROR cmd_netlogon_gettrustrid(struct rpc_pipe_client *cli,
                domain_name = argv[2];
        }
 
-       status = rpccli_netr_LogonGetTrustRid(cli, mem_ctx,
+       status = dcerpc_netr_LogonGetTrustRid(b, mem_ctx,
                                              server_name,
                                              domain_name,
                                              &rid,
                                              &werr);
        if (!NT_STATUS_IS_OK(status)) {
+               werr = ntstatus_to_werror(status);
                goto done;
        }
 
@@ -800,10 +635,11 @@ static WERROR cmd_netlogon_dsr_enumtrustdom(struct rpc_pipe_client *cli,
                                            const char **argv)
 {
        NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
-       WERROR werr = WERR_GENERAL_FAILURE;
+       WERROR werr = WERR_GEN_FAILURE;
        const char *server_name = cli->desthost;
        uint32_t trust_flags = NETR_TRUST_FLAG_IN_FOREST;
        struct netr_DomainTrustList trusts;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc < 1 || argc > 3) {
                fprintf(stderr, "Usage: %s <server_name> <trust_flags>\n",
@@ -819,12 +655,13 @@ static WERROR cmd_netlogon_dsr_enumtrustdom(struct rpc_pipe_client *cli,
                sscanf(argv[2], "%x", &trust_flags);
        }
 
-       status = rpccli_netr_DsrEnumerateDomainTrusts(cli, mem_ctx,
+       status = dcerpc_netr_DsrEnumerateDomainTrusts(b, mem_ctx,
                                                      server_name,
                                                      trust_flags,
                                                      &trusts,
                                                      &werr);
        if (!NT_STATUS_IS_OK(status)) {
+               werr = ntstatus_to_werror(status);
                goto done;
        }
 
@@ -848,10 +685,11 @@ static WERROR cmd_netlogon_deregisterdnsrecords(struct rpc_pipe_client *cli,
                                                const char **argv)
 {
        NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
-       WERROR werr = WERR_GENERAL_FAILURE;
+       WERROR werr = WERR_GEN_FAILURE;
        const char *server_name = cli->desthost;
        const char *domain = lp_workgroup();
        const char *dns_host = NULL;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc < 1 || argc > 4) {
                fprintf(stderr, "Usage: %s <server_name> <domain_name> "
@@ -871,7 +709,7 @@ static WERROR cmd_netlogon_deregisterdnsrecords(struct rpc_pipe_client *cli,
                dns_host = argv[3];
        }
 
-       status = rpccli_netr_DsrDeregisterDNSHostRecords(cli, mem_ctx,
+       status = dcerpc_netr_DsrDeregisterDNSHostRecords(b, mem_ctx,
                                                         server_name,
                                                         domain,
                                                         NULL,
@@ -879,6 +717,7 @@ static WERROR cmd_netlogon_deregisterdnsrecords(struct rpc_pipe_client *cli,
                                                         dns_host,
                                                         &werr);
        if (!NT_STATUS_IS_OK(status)) {
+               werr = ntstatus_to_werror(status);
                goto done;
        }
 
@@ -894,11 +733,12 @@ static WERROR cmd_netlogon_dsr_getforesttrustinfo(struct rpc_pipe_client *cli,
                                                  const char **argv)
 {
        NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
-       WERROR werr = WERR_GENERAL_FAILURE;
+       WERROR werr = WERR_GEN_FAILURE;
        const char *server_name = cli->desthost;
        const char *trusted_domain_name = NULL;
        struct lsa_ForestTrustInformation *info = NULL;
        uint32_t flags = 0;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc < 1 || argc > 4) {
                fprintf(stderr, "Usage: %s <server_name> <trusted_domain_name> "
@@ -918,13 +758,14 @@ static WERROR cmd_netlogon_dsr_getforesttrustinfo(struct rpc_pipe_client *cli,
                sscanf(argv[3], "%x", &flags);
        }
 
-       status = rpccli_netr_DsRGetForestTrustInformation(cli, mem_ctx,
+       status = dcerpc_netr_DsRGetForestTrustInformation(b, mem_ctx,
                                                         server_name,
                                                         trusted_domain_name,
                                                         flags,
                                                         &info,
                                                         &werr);
        if (!NT_STATUS_IS_OK(status)) {
+               werr = ntstatus_to_werror(status);
                goto done;
        }
 
@@ -935,39 +776,43 @@ static WERROR cmd_netlogon_dsr_getforesttrustinfo(struct rpc_pipe_client *cli,
        return werr;
 }
 
-static WERROR cmd_netlogon_enumtrusteddomains(struct rpc_pipe_client *cli,
-                                             TALLOC_CTX *mem_ctx, int argc,
-                                             const char **argv)
+static NTSTATUS cmd_netlogon_enumtrusteddomains(struct rpc_pipe_client *cli,
+                                               TALLOC_CTX *mem_ctx, int argc,
+                                               const char **argv)
 {
        NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
-       WERROR werr = WERR_GENERAL_FAILURE;
+       NTSTATUS result;
        const char *server_name = cli->desthost;
        struct netr_Blob blob;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
 
        if (argc < 1 || argc > 3) {
                fprintf(stderr, "Usage: %s <server_name>\n", argv[0]);
-               return WERR_OK;
+               return NT_STATUS_OK;
        }
 
        if (argc >= 2) {
                server_name = argv[1];
        }
 
-       status = rpccli_netr_NetrEnumerateTrustedDomains(cli, mem_ctx,
+       status = dcerpc_netr_NetrEnumerateTrustedDomains(b, mem_ctx,
                                                         server_name,
                                                         &blob,
-                                                        &werr);
+                                                        &result);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
 
-       if (W_ERROR_IS_OK(werr)) {
-               printf("success\n");
-               dump_data(1, blob.data, blob.length);
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
+               goto done;
        }
+
+       printf("success\n");
+       dump_data(1, blob.data, blob.length);
  done:
-       return werr;
+       return status;
 }
 
 static WERROR cmd_netlogon_enumtrusteddomainsex(struct rpc_pipe_client *cli,
@@ -975,9 +820,10 @@ static WERROR cmd_netlogon_enumtrusteddomainsex(struct rpc_pipe_client *cli,
                                                const char **argv)
 {
        NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
-       WERROR werr = WERR_GENERAL_FAILURE;
+       WERROR werr = WERR_GEN_FAILURE;
        const char *server_name = cli->desthost;
        struct netr_DomainTrustList list;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc < 1 || argc > 3) {
                fprintf(stderr, "Usage: %s <server_name>\n", argv[0]);
@@ -988,11 +834,12 @@ static WERROR cmd_netlogon_enumtrusteddomainsex(struct rpc_pipe_client *cli,
                server_name = argv[1];
        }
 
-       status = rpccli_netr_NetrEnumerateTrustedDomainsEx(cli, mem_ctx,
+       status = dcerpc_netr_NetrEnumerateTrustedDomainsEx(b, mem_ctx,
                                                           server_name,
                                                           &list,
                                                           &werr);
        if (!NT_STATUS_IS_OK(status)) {
+               werr = ntstatus_to_werror(status);
                goto done;
        }
 
@@ -1008,9 +855,10 @@ static WERROR cmd_netlogon_getdcsitecoverage(struct rpc_pipe_client *cli,
                                             const char **argv)
 {
        NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
-       WERROR werr = WERR_GENERAL_FAILURE;
+       WERROR werr = WERR_GEN_FAILURE;
        const char *server_name = cli->desthost;
        struct DcSitesCtr *ctr = NULL;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc < 1 || argc > 3) {
                fprintf(stderr, "Usage: %s <server_name>\n", argv[0]);
@@ -1021,11 +869,12 @@ static WERROR cmd_netlogon_getdcsitecoverage(struct rpc_pipe_client *cli,
                server_name = argv[1];
        }
 
-       status = rpccli_netr_DsrGetDcSiteCoverageW(cli, mem_ctx,
+       status = dcerpc_netr_DsrGetDcSiteCoverageW(b, mem_ctx,
                                                   server_name,
                                                   &ctr,
                                                   &werr);
        if (!NT_STATUS_IS_OK(status)) {
+               werr = ntstatus_to_werror(status);
                goto done;
        }
 
@@ -1040,33 +889,247 @@ static WERROR cmd_netlogon_getdcsitecoverage(struct rpc_pipe_client *cli,
        return werr;
 }
 
+static NTSTATUS cmd_netlogon_capabilities(struct rpc_pipe_client *cli,
+                                         TALLOC_CTX *mem_ctx, int argc,
+                                         const char **argv)
+{
+       struct netlogon_creds_cli_lck *lck;
+       union netr_Capabilities capabilities;
+       NTSTATUS status;
+
+       if (argc > 1) {
+               fprintf(stderr, "Usage: %s\n", argv[0]);
+               return NT_STATUS_OK;
+       }
+
+       status = netlogon_creds_cli_lck(rpcclient_netlogon_creds,
+                                       NETLOGON_CREDS_CLI_LCK_EXCLUSIVE,
+                                       mem_ctx, &lck);
+       if (!NT_STATUS_IS_OK(status)) {
+               fprintf(stderr, "netlogon_creds_cli_lck failed: %s\n",
+                       nt_errstr(status));
+               return status;
+       }
+
+       status = netlogon_creds_cli_check(rpcclient_netlogon_creds,
+                                         cli->binding_handle,
+                                         &capabilities);
+       if (!NT_STATUS_IS_OK(status)) {
+               fprintf(stderr, "netlogon_creds_cli_check failed: %s\n",
+                       nt_errstr(status));
+               return status;
+       }
+
+       TALLOC_FREE(lck);
+
+       printf("capabilities: 0x%08x\n", capabilities.server_capabilities);
+
+       return NT_STATUS_OK;
+}
 
 /* List of commands exported by this module */
 
 struct cmd_set netlogon_commands[] = {
 
-       { "NETLOGON" },
-
-       { "logonctrl2", RPC_RTYPE_WERROR, NULL, cmd_netlogon_logon_ctrl2, &ndr_table_netlogon.syntax_id, NULL, "Logon Control 2",     "" },
-       { "getanydcname", RPC_RTYPE_WERROR, NULL, cmd_netlogon_getanydcname, &ndr_table_netlogon.syntax_id, NULL, "Get trusted DC name",     "" },
-       { "getdcname", RPC_RTYPE_WERROR, NULL, cmd_netlogon_getdcname, &ndr_table_netlogon.syntax_id, NULL, "Get trusted PDC name",     "" },
-       { "dsr_getdcname", RPC_RTYPE_WERROR, NULL, cmd_netlogon_dsr_getdcname, &ndr_table_netlogon.syntax_id, NULL, "Get trusted DC name",     "" },
-       { "dsr_getdcnameex", RPC_RTYPE_WERROR, NULL, cmd_netlogon_dsr_getdcnameex, &ndr_table_netlogon.syntax_id, NULL, "Get trusted DC name",     "" },
-       { "dsr_getdcnameex2", RPC_RTYPE_WERROR, NULL, cmd_netlogon_dsr_getdcnameex2, &ndr_table_netlogon.syntax_id, NULL, "Get trusted DC name",     "" },
-       { "dsr_getsitename", RPC_RTYPE_WERROR, NULL, cmd_netlogon_dsr_getsitename, &ndr_table_netlogon.syntax_id, NULL, "Get sitename",     "" },
-       { "dsr_getforesttrustinfo", RPC_RTYPE_WERROR, NULL, cmd_netlogon_dsr_getforesttrustinfo, &ndr_table_netlogon.syntax_id, NULL, "Get Forest Trust Info",     "" },
-       { "logonctrl",  RPC_RTYPE_WERROR, NULL, cmd_netlogon_logon_ctrl, &ndr_table_netlogon.syntax_id, NULL, "Logon Control",       "" },
-       { "samsync",    RPC_RTYPE_NTSTATUS, cmd_netlogon_sam_sync,    NULL, &ndr_table_netlogon.syntax_id, NULL, "Sam Synchronisation", "" },
-       { "samdeltas",  RPC_RTYPE_NTSTATUS, cmd_netlogon_sam_deltas,  NULL, &ndr_table_netlogon.syntax_id, NULL, "Query Sam Deltas",    "" },
-       { "samlogon",   RPC_RTYPE_NTSTATUS, cmd_netlogon_sam_logon,   NULL, &ndr_table_netlogon.syntax_id, NULL, "Sam Logon",           "" },
-       { "change_trust_pw",   RPC_RTYPE_NTSTATUS, cmd_netlogon_change_trust_pw,   NULL, &ndr_table_netlogon.syntax_id, NULL, "Change Trust Account Password",           "" },
-       { "gettrustrid", RPC_RTYPE_WERROR, NULL, cmd_netlogon_gettrustrid, &ndr_table_netlogon.syntax_id, NULL, "Get trust rid",     "" },
-       { "dsr_enumtrustdom", RPC_RTYPE_WERROR, NULL, cmd_netlogon_dsr_enumtrustdom, &ndr_table_netlogon.syntax_id, NULL, "Enumerate trusted domains",     "" },
-       { "dsenumdomtrusts",  RPC_RTYPE_WERROR, NULL, cmd_netlogon_dsr_enumtrustdom, &ndr_table_netlogon.syntax_id, NULL, "Enumerate all trusted domains in an AD forest",     "" },
-       { "deregisterdnsrecords", RPC_RTYPE_WERROR, NULL, cmd_netlogon_deregisterdnsrecords, &ndr_table_netlogon.syntax_id, NULL, "Deregister DNS records",     "" },
-       { "netrenumtrusteddomains", RPC_RTYPE_WERROR, NULL, cmd_netlogon_enumtrusteddomains, &ndr_table_netlogon.syntax_id, NULL, "Enumerate trusted domains",     "" },
-       { "netrenumtrusteddomainsex", RPC_RTYPE_WERROR, NULL, cmd_netlogon_enumtrusteddomainsex, &ndr_table_netlogon.syntax_id, NULL, "Enumerate trusted domains",     "" },
-       { "getdcsitecoverage", RPC_RTYPE_WERROR, NULL, cmd_netlogon_getdcsitecoverage, &ndr_table_netlogon.syntax_id, NULL, "Get the Site-Coverage from a DC",     "" },
-
-       { NULL }
+       {
+               .name = "NETLOGON",
+       },
+
+       {
+               .name               = "logonctrl2",
+               .returntype         = RPC_RTYPE_WERROR,
+               .ntfn               = NULL,
+               .wfn                = cmd_netlogon_logon_ctrl2,
+               .table              = &ndr_table_netlogon,
+               .rpc_pipe           = NULL,
+               .description        = "Logon Control 2",
+               .usage              = "",
+       },
+       {
+               .name               = "getanydcname",
+               .returntype         = RPC_RTYPE_WERROR,
+               .ntfn               = NULL,
+               .wfn                = cmd_netlogon_getanydcname,
+               .table              = &ndr_table_netlogon,
+               .rpc_pipe           = NULL,
+               .description        = "Get trusted DC name",
+               .usage              = "",
+       },
+       {
+               .name               = "getdcname",
+               .returntype         = RPC_RTYPE_WERROR,
+               .ntfn               = NULL,
+               .wfn                = cmd_netlogon_getdcname,
+               .table              = &ndr_table_netlogon,
+               .rpc_pipe           = NULL,
+               .description        = "Get trusted PDC name",
+               .usage              = "",
+       },
+       {
+               .name               = "dsr_getdcname",
+               .returntype         = RPC_RTYPE_WERROR,
+               .ntfn               = NULL,
+               .wfn                = cmd_netlogon_dsr_getdcname,
+               .table              = &ndr_table_netlogon,
+               .rpc_pipe           = NULL,
+               .description        = "Get trusted DC name",
+               .usage              = "",
+       },
+       {
+               .name               = "dsr_getdcnameex",
+               .returntype         = RPC_RTYPE_WERROR,
+               .ntfn               = NULL,
+               .wfn                = cmd_netlogon_dsr_getdcnameex,
+               .table              = &ndr_table_netlogon,
+               .rpc_pipe           = NULL,
+               .description        = "Get trusted DC name",
+               .usage              = "",
+       },
+       {
+               .name               = "dsr_getdcnameex2",
+               .returntype         = RPC_RTYPE_WERROR,
+               .ntfn               = NULL,
+               .wfn                = cmd_netlogon_dsr_getdcnameex2,
+               .table              = &ndr_table_netlogon,
+               .rpc_pipe           = NULL,
+               .description        = "Get trusted DC name",
+               .usage              = "",
+       },
+       {
+               .name               = "dsr_getsitename",
+               .returntype         = RPC_RTYPE_WERROR,
+               .ntfn               = NULL,
+               .wfn                = cmd_netlogon_dsr_getsitename,
+               .table              = &ndr_table_netlogon,
+               .rpc_pipe           = NULL,
+               .description        = "Get sitename",
+               .usage              = "",
+       },
+       {
+               .name               = "dsr_getforesttrustinfo",
+               .returntype         = RPC_RTYPE_WERROR,
+               .ntfn               = NULL,
+               .wfn                = cmd_netlogon_dsr_getforesttrustinfo,
+               .table              = &ndr_table_netlogon,
+               .rpc_pipe           = NULL,
+               .description        = "Get Forest Trust Info",
+               .usage              = "",
+       },
+       {
+               .name               = "logonctrl",
+               .returntype         =  RPC_RTYPE_WERROR,
+               .ntfn               = NULL,
+               .wfn                = cmd_netlogon_logon_ctrl,
+               .table              = &ndr_table_netlogon,
+               .rpc_pipe           = NULL,
+               .description        = "Logon Control",
+               .usage              = "",
+       },
+       {
+               .name               = "samlogon",
+               .returntype         = RPC_RTYPE_NTSTATUS,
+               .ntfn               = cmd_netlogon_sam_logon,
+               .wfn                = NULL,
+               .table              = &ndr_table_netlogon,
+               .rpc_pipe           = NULL,
+               .description        = "Sam Logon",
+               .usage              = "",
+               .use_netlogon_creds = true,
+       },
+       {
+               .name               = "change_trust_pw",
+               .returntype         = RPC_RTYPE_NTSTATUS,
+               .ntfn               = cmd_netlogon_change_trust_pw,
+               .wfn                = NULL,
+               .table              = &ndr_table_netlogon,
+               .rpc_pipe           = NULL,
+               .description        = "Change Trust Account Password",
+               .usage              = "",
+               .use_netlogon_creds = true,
+       },
+       {
+               .name               = "gettrustrid",
+               .returntype         = RPC_RTYPE_WERROR,
+               .ntfn               = NULL,
+               .wfn                = cmd_netlogon_gettrustrid,
+               .table              = &ndr_table_netlogon,
+               .rpc_pipe           = NULL,
+               .description        = "Get trust rid",
+               .usage              = "",
+       },
+       {
+               .name               = "dsr_enumtrustdom",
+               .returntype         = RPC_RTYPE_WERROR,
+               .ntfn               = NULL,
+               .wfn                = cmd_netlogon_dsr_enumtrustdom,
+               .table              = &ndr_table_netlogon,
+               .rpc_pipe           = NULL,
+               .description        = "Enumerate trusted domains",
+               .usage              = "",
+       },
+       {
+               .name               = "dsenumdomtrusts",
+               .returntype         = RPC_RTYPE_WERROR,
+               .ntfn               = NULL,
+               .wfn                = cmd_netlogon_dsr_enumtrustdom,
+               .table              = &ndr_table_netlogon,
+               .rpc_pipe           = NULL,
+               .description        = "Enumerate all trusted domains in an AD forest",
+               .usage              = "",
+       },
+       {
+               .name               = "deregisterdnsrecords",
+               .returntype         = RPC_RTYPE_WERROR,
+               .ntfn               = NULL,
+               .wfn                = cmd_netlogon_deregisterdnsrecords,
+               .table              = &ndr_table_netlogon,
+               .rpc_pipe           = NULL,
+               .description        = "Deregister DNS records",
+               .usage              = "",
+       },
+       {
+               .name               = "netrenumtrusteddomains",
+               .returntype         = RPC_RTYPE_NTSTATUS,
+               .ntfn               = cmd_netlogon_enumtrusteddomains,
+               .wfn                = NULL,
+               .table              = &ndr_table_netlogon,
+               .rpc_pipe           = NULL,
+               .description        = "Enumerate trusted domains",
+               .usage              = "",
+       },
+       {
+               .name               = "netrenumtrusteddomainsex",
+               .returntype         = RPC_RTYPE_WERROR,
+               .ntfn               = NULL,
+               .wfn                = cmd_netlogon_enumtrusteddomainsex,
+               .table              = &ndr_table_netlogon,
+               .rpc_pipe           = NULL,
+               .description        = "Enumerate trusted domains",
+               .usage              = "",
+       },
+       {
+               .name               = "getdcsitecoverage",
+               .returntype         = RPC_RTYPE_WERROR,
+               .ntfn               = NULL,
+               .wfn                = cmd_netlogon_getdcsitecoverage,
+               .table              = &ndr_table_netlogon,
+               .rpc_pipe           = NULL,
+               .description        = "Get the Site-Coverage from a DC",
+               .usage              = "",
+       },
+       {
+               .name               = "capabilities",
+               .returntype         = RPC_RTYPE_NTSTATUS,
+               .ntfn               = cmd_netlogon_capabilities,
+               .wfn                = NULL,
+               .table              = &ndr_table_netlogon,
+               .rpc_pipe           = NULL,
+               .description        = "Return Capabilities",
+               .usage              = "",
+               .use_netlogon_creds = true,
+       },
+
+       {
+               .name = NULL,
+       }
 };