s3: Use dbwrap_parse_record in fetch_share_mode_unlocked
[kai/samba.git] / source3 / rpcclient / cmd_lsarpc.c
index 5000255c84cee75a4d19ccaaa2ee4cb4e1e36595..cbc089f73915806eb51f0ea5f707ba6b79071b9c 100644 (file)
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "includes.h"
 #include "rpcclient.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/ndr_lsa.h"
+#include "../librpc/gen_ndr/ndr_lsa_c.h"
+#include "rpc_client/cli_lsarpc.h"
+#include "rpc_client/init_lsa.h"
+#include "../libcli/security/security.h"
 
 /* useful function to allow entering a name instead of a SID and
  * looking it up automatically */
 static NTSTATUS name_to_sid(struct rpc_pipe_client *cli, 
                            TALLOC_CTX *mem_ctx,
-                           DOM_SID *sid, const char *name)
+                           struct dom_sid *sid, const char *name)
 {
        struct policy_handle pol;
        enum lsa_SidType *sid_types;
-       NTSTATUS result;
-       DOM_SID *sids;
+       NTSTATUS status, result;
+       struct dom_sid *sids;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        /* maybe its a raw SID */
        if (strncmp(name, "S-", 2) == 0 &&
@@ -41,22 +47,22 @@ static NTSTATUS name_to_sid(struct rpc_pipe_client *cli,
                return NT_STATUS_OK;
        }
 
-       result = rpccli_lsa_open_policy(cli, mem_ctx, True, 
+       status = rpccli_lsa_open_policy(cli, mem_ctx, True,
                                     SEC_FLAG_MAXIMUM_ALLOWED,
                                     &pol);
-       if (!NT_STATUS_IS_OK(result))
+       if (!NT_STATUS_IS_OK(status))
                goto done;
 
-       result = rpccli_lsa_lookup_names(cli, mem_ctx, &pol, 1, &name, NULL, 1, &sids, &sid_types);
-       if (!NT_STATUS_IS_OK(result))
+       status = rpccli_lsa_lookup_names(cli, mem_ctx, &pol, 1, &name, NULL, 1, &sids, &sid_types);
+       if (!NT_STATUS_IS_OK(status))
                goto done;
 
-       rpccli_lsa_Close(cli, mem_ctx, &pol);
+       dcerpc_lsa_Close(b, mem_ctx, &pol, &result);
 
        *sid = sids[0];
 
 done:
-       return result;
+       return status;
 }
 
 static void display_query_info_1(struct lsa_AuditLogInfo *r)
@@ -151,8 +157,9 @@ static NTSTATUS cmd_lsa_query_info_policy(struct rpc_pipe_client *cli,
                                           const char **argv) 
 {
        struct policy_handle pol;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       NTSTATUS status, result;
        union lsa_PolicyInformation *info = NULL;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        uint32 info_class = 3;
 
@@ -166,40 +173,46 @@ static NTSTATUS cmd_lsa_query_info_policy(struct rpc_pipe_client *cli,
 
        switch (info_class) {
        case 12:
-               result = rpccli_lsa_open_policy2(cli, mem_ctx, True, 
+               status = rpccli_lsa_open_policy2(cli, mem_ctx, True,
                                                 SEC_FLAG_MAXIMUM_ALLOWED,
                                                 &pol);
 
-               if (!NT_STATUS_IS_OK(result))
+               if (!NT_STATUS_IS_OK(status))
                        goto done;
-                       
-               result = rpccli_lsa_QueryInfoPolicy2(cli, mem_ctx,
+
+               status = dcerpc_lsa_QueryInfoPolicy2(b, mem_ctx,
                                                     &pol,
                                                     info_class,
-                                                    &info);
+                                                    &info,
+                                                    &result);
                break;
        default:
-               result = rpccli_lsa_open_policy(cli, mem_ctx, True, 
+               status = rpccli_lsa_open_policy(cli, mem_ctx, True,
                                                SEC_FLAG_MAXIMUM_ALLOWED,
                                                &pol);
 
-               if (!NT_STATUS_IS_OK(result))
+               if (!NT_STATUS_IS_OK(status))
                        goto done;
-               
-               result = rpccli_lsa_QueryInfoPolicy(cli, mem_ctx,
+
+               status = dcerpc_lsa_QueryInfoPolicy(b, mem_ctx,
                                                    &pol,
                                                    info_class,
-                                                   &info);
+                                                   &info,
+                                                   &result);
        }
 
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
+       status = result;
        if (NT_STATUS_IS_OK(result)) {
                display_lsa_query_info(info, info_class);
        }
 
-       rpccli_lsa_Close(cli, mem_ctx, &pol);
+       dcerpc_lsa_Close(b, mem_ctx, &pol, &result);
 
  done:
-       return result;
+       return status;
 }
 
 /* Resolve a list of names to a list of sids */
@@ -209,31 +222,32 @@ static NTSTATUS cmd_lsa_lookup_names(struct rpc_pipe_client *cli,
                                      const char **argv)
 {
        struct policy_handle pol;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-       DOM_SID *sids;
+       NTSTATUS status, result;
+       struct dom_sid *sids;
        enum lsa_SidType *types;
        int i;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc == 1) {
                printf("Usage: %s [name1 [name2 [...]]]\n", argv[0]);
                return NT_STATUS_OK;
        }
 
-       result = rpccli_lsa_open_policy(cli, mem_ctx, True, 
+       status = rpccli_lsa_open_policy(cli, mem_ctx, True,
                                     SEC_FLAG_MAXIMUM_ALLOWED,
                                     &pol);
 
-       if (!NT_STATUS_IS_OK(result))
+       if (!NT_STATUS_IS_OK(status))
                goto done;
 
-       result = rpccli_lsa_lookup_names(cli, mem_ctx, &pol, argc - 1, 
+       status = rpccli_lsa_lookup_names(cli, mem_ctx, &pol, argc - 1,
                                      (const char**)(argv + 1), NULL, 1, &sids, &types);
 
-       if (!NT_STATUS_IS_OK(result) && NT_STATUS_V(result) != 
+       if (!NT_STATUS_IS_OK(status) && NT_STATUS_V(status) !=
            NT_STATUS_V(STATUS_SOME_UNMAPPED))
                goto done;
 
-       result = NT_STATUS_OK;
+       status = NT_STATUS_OK;
 
        /* Print results */
 
@@ -244,10 +258,10 @@ static NTSTATUS cmd_lsa_lookup_names(struct rpc_pipe_client *cli,
                       sid_type_lookup(types[i]), types[i]);
        }
 
-       rpccli_lsa_Close(cli, mem_ctx, &pol);
+       dcerpc_lsa_Close(b, mem_ctx, &pol, &result);
 
  done:
-       return result;
+       return status;
 }
 
 /* Resolve a list of names to a list of sids */
@@ -257,33 +271,34 @@ static NTSTATUS cmd_lsa_lookup_names_level(struct rpc_pipe_client *cli,
                                           const char **argv)
 {
        struct policy_handle pol;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-       DOM_SID *sids;
+       NTSTATUS status, result;
+       struct dom_sid *sids;
        enum lsa_SidType *types;
        int i, level;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc < 3) {
                printf("Usage: %s [level] [name1 [name2 [...]]]\n", argv[0]);
                return NT_STATUS_OK;
        }
 
-       result = rpccli_lsa_open_policy(cli, mem_ctx, True, 
+       status = rpccli_lsa_open_policy(cli, mem_ctx, True,
                                     SEC_FLAG_MAXIMUM_ALLOWED,
                                     &pol);
 
-       if (!NT_STATUS_IS_OK(result))
+       if (!NT_STATUS_IS_OK(status))
                goto done;
 
        level = atoi(argv[1]);
 
-       result = rpccli_lsa_lookup_names(cli, mem_ctx, &pol, argc - 2, 
+       status = rpccli_lsa_lookup_names(cli, mem_ctx, &pol, argc - 2,
                                      (const char**)(argv + 2), NULL, level, &sids, &types);
 
-       if (!NT_STATUS_IS_OK(result) && NT_STATUS_V(result) != 
+       if (!NT_STATUS_IS_OK(status) && NT_STATUS_V(status) !=
            NT_STATUS_V(STATUS_SOME_UNMAPPED))
                goto done;
 
-       result = NT_STATUS_OK;
+       status = NT_STATUS_OK;
 
        /* Print results */
 
@@ -294,12 +309,68 @@ static NTSTATUS cmd_lsa_lookup_names_level(struct rpc_pipe_client *cli,
                       sid_type_lookup(types[i]), types[i]);
        }
 
-       rpccli_lsa_Close(cli, mem_ctx, &pol);
+       dcerpc_lsa_Close(b, mem_ctx, &pol, &result);
 
  done:
-       return result;
+       return status;
 }
 
+static NTSTATUS cmd_lsa_lookup_names4(struct rpc_pipe_client *cli,
+                                     TALLOC_CTX *mem_ctx, int argc,
+                                     const char **argv)
+{
+       NTSTATUS status, result;
+
+       uint32_t num_names;
+       struct lsa_String *names;
+       struct lsa_RefDomainList *domains;
+       struct lsa_TransSidArray3 sids;
+       uint32_t count = 0;
+       int i;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
+
+       if (argc == 1) {
+               printf("Usage: %s [name1 [name2 [...]]]\n", argv[0]);
+               return NT_STATUS_OK;
+       }
+
+       ZERO_STRUCT(sids);
+
+       num_names = argc-1;
+       names = talloc_array(mem_ctx, struct lsa_String, num_names);
+       NT_STATUS_HAVE_NO_MEMORY(names);
+
+       for (i=0; i < num_names; i++) {
+               init_lsa_String(&names[i], argv[i+1]);
+       }
+
+       status = dcerpc_lsa_LookupNames4(b, mem_ctx,
+                                        num_names,
+                                        names,
+                                        &domains,
+                                        &sids,
+                                        1,
+                                        &count,
+                                        0,
+                                        0,
+                                        &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+       if (!NT_STATUS_IS_OK(result)) {
+               return result;
+       }
+
+       for (i = 0; i < sids.count; i++) {
+               fstring sid_str;
+               sid_to_fstring(sid_str, sids.sids[i].sid);
+               printf("%s %s (%s: %d)\n", argv[i+1], sid_str,
+                      sid_type_lookup(sids.sids[i].sid_type),
+                      sids.sids[i].sid_type);
+       }
+
+       return status;
+}
 
 /* Resolve a list of SIDs to a list of names */
 
@@ -307,28 +378,29 @@ static NTSTATUS cmd_lsa_lookup_sids(struct rpc_pipe_client *cli, TALLOC_CTX *mem
                                     int argc, const char **argv)
 {
        struct policy_handle pol;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-       DOM_SID *sids;
+       NTSTATUS status, result;
+       struct dom_sid *sids;
        char **domains;
        char **names;
        enum lsa_SidType *types;
        int i;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc == 1) {
                printf("Usage: %s [sid1 [sid2 [...]]]\n", argv[0]);
                return NT_STATUS_OK;
        }
 
-       result = rpccli_lsa_open_policy(cli, mem_ctx, True, 
+       status = rpccli_lsa_open_policy(cli, mem_ctx, True,
                                     SEC_FLAG_MAXIMUM_ALLOWED,
                                     &pol);
 
-       if (!NT_STATUS_IS_OK(result))
+       if (!NT_STATUS_IS_OK(status))
                goto done;
 
        /* Convert arguments to sids */
 
-       sids = TALLOC_ARRAY(mem_ctx, DOM_SID, argc - 1);
+       sids = talloc_array(mem_ctx, struct dom_sid, argc - 1);
 
        if (!sids) {
                printf("could not allocate memory for %d sids\n", argc - 1);
@@ -337,20 +409,20 @@ static NTSTATUS cmd_lsa_lookup_sids(struct rpc_pipe_client *cli, TALLOC_CTX *mem
 
        for (i = 0; i < argc - 1; i++) 
                if (!string_to_sid(&sids[i], argv[i + 1])) {
-                       result = NT_STATUS_INVALID_SID;
+                       status = NT_STATUS_INVALID_SID;
                        goto done;
                }
 
        /* Lookup the SIDs */
 
-       result = rpccli_lsa_lookup_sids(cli, mem_ctx, &pol, argc - 1, sids, 
+       status = rpccli_lsa_lookup_sids(cli, mem_ctx, &pol, argc - 1, sids,
                                     &domains, &names, &types);
 
-       if (!NT_STATUS_IS_OK(result) && NT_STATUS_V(result) != 
+       if (!NT_STATUS_IS_OK(status) && NT_STATUS_V(status) !=
            NT_STATUS_V(STATUS_SOME_UNMAPPED))
                goto done;
 
-       result = NT_STATUS_OK;
+       status = NT_STATUS_OK;
 
        /* Print results */
 
@@ -363,12 +435,91 @@ static NTSTATUS cmd_lsa_lookup_sids(struct rpc_pipe_client *cli, TALLOC_CTX *mem
                       names[i] ? names[i] : "*unknown*", types[i]);
        }
 
-       rpccli_lsa_Close(cli, mem_ctx, &pol);
+       dcerpc_lsa_Close(b, mem_ctx, &pol, &result);
+
+ done:
+       return status;
+}
+
+/* Resolve a list of SIDs to a list of names */
+
+static NTSTATUS cmd_lsa_lookup_sids3(struct rpc_pipe_client *cli,
+                                    TALLOC_CTX *mem_ctx,
+                                    int argc, const char **argv)
+{
+       NTSTATUS status = NT_STATUS_UNSUCCESSFUL, result;
+       int i;
+       struct lsa_SidArray sids;
+       struct lsa_RefDomainList *domains;
+       struct lsa_TransNameArray2 names;
+       uint32_t count = 0;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
+
+       if (argc == 1) {
+               printf("Usage: %s [sid1 [sid2 [...]]]\n", argv[0]);
+               return NT_STATUS_OK;
+       }
+
+       ZERO_STRUCT(names);
+
+       /* Convert arguments to sids */
+
+       sids.num_sids = argc-1;
+       sids.sids = talloc_array(mem_ctx, struct lsa_SidPtr, sids.num_sids);
+       if (!sids.sids) {
+               printf("could not allocate memory for %d sids\n", sids.num_sids);
+               goto done;
+       }
+
+       for (i = 0; i < sids.num_sids; i++) {
+               sids.sids[i].sid = talloc(sids.sids, struct dom_sid);
+               if (sids.sids[i].sid == NULL) {
+                       status = NT_STATUS_NO_MEMORY;
+                       goto done;
+               }
+               if (!string_to_sid(sids.sids[i].sid, argv[i+1])) {
+                       status = NT_STATUS_INVALID_SID;
+                       goto done;
+               }
+       }
+
+       /* Lookup the SIDs */
+       status = dcerpc_lsa_LookupSids3(b, mem_ctx,
+                                       &sids,
+                                       &domains,
+                                       &names,
+                                       1,
+                                       &count,
+                                       0,
+                                       0,
+                                       &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
+       if (!NT_STATUS_IS_OK(result) && NT_STATUS_V(result) !=
+           NT_STATUS_V(STATUS_SOME_UNMAPPED)) {
+               status = result;
+               goto done;
+       }
+
+       status = NT_STATUS_OK;
+
+       /* Print results */
+
+       for (i = 0; i < count; i++) {
+               fstring sid_str;
+
+               sid_to_fstring(sid_str, sids.sids[i].sid);
+               printf("%s %s (%d)\n", sid_str,
+                      names.names[i].name.string,
+                      names.names[i].sid_type);
+       }
 
  done:
-       return result;
+       return status;
 }
 
+
 /* Enumerate list of trusted domains */
 
 static NTSTATUS cmd_lsa_enum_trust_dom(struct rpc_pipe_client *cli, 
@@ -376,8 +527,9 @@ static NTSTATUS cmd_lsa_enum_trust_dom(struct rpc_pipe_client *cli,
                                        const char **argv)
 {
        struct policy_handle pol;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       NTSTATUS status, result;
        struct lsa_DomainList domain_list;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        /* defaults, but may be changed using params */
        uint32 enum_ctx = 0;
@@ -393,28 +545,34 @@ static NTSTATUS cmd_lsa_enum_trust_dom(struct rpc_pipe_client *cli,
                enum_ctx = atoi(argv[2]);
        }       
 
-       result = rpccli_lsa_open_policy(cli, mem_ctx, True, 
+       status = rpccli_lsa_open_policy(cli, mem_ctx, True,
                                     LSA_POLICY_VIEW_LOCAL_INFORMATION,
                                     &pol);
 
-       if (!NT_STATUS_IS_OK(result))
+       if (!NT_STATUS_IS_OK(status))
                goto done;
 
-       result = STATUS_MORE_ENTRIES;
+       status = STATUS_MORE_ENTRIES;
 
-       while (NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES)) {
+       while (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES)) {
 
                /* Lookup list of trusted domains */
 
-               result = rpccli_lsa_EnumTrustDom(cli, mem_ctx,
+               status = dcerpc_lsa_EnumTrustDom(b, mem_ctx,
                                                 &pol,
                                                 &enum_ctx,
                                                 &domain_list,
-                                                max_size);
+                                                max_size,
+                                                &result);
+               if (!NT_STATUS_IS_OK(status)) {
+                       goto done;
+               }
                if (!NT_STATUS_IS_OK(result) &&
                    !NT_STATUS_EQUAL(result, NT_STATUS_NO_MORE_ENTRIES) &&
-                   !NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES))
+                   !NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES)) {
+                       status = result;
                        goto done;
+               }
 
                /* Print results: list of names and sids returned in this
                 * response. */  
@@ -429,9 +587,9 @@ static NTSTATUS cmd_lsa_enum_trust_dom(struct rpc_pipe_client *cli,
                }
        }
 
-       rpccli_lsa_Close(cli, mem_ctx, &pol);
+       dcerpc_lsa_Close(b, mem_ctx, &pol, &result);
  done:
-       return result;
+       return status;
 }
 
 /* Enumerates privileges */
@@ -441,8 +599,9 @@ static NTSTATUS cmd_lsa_enum_privilege(struct rpc_pipe_client *cli,
                                       const char **argv) 
 {
        struct policy_handle pol;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       NTSTATUS status, result;
        struct lsa_PrivArray priv_array;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        uint32 enum_context=0;
        uint32 pref_max_length=0x1000;
@@ -459,20 +618,25 @@ static NTSTATUS cmd_lsa_enum_privilege(struct rpc_pipe_client *cli,
        if (argc==3)
                pref_max_length=atoi(argv[2]);
 
-       result = rpccli_lsa_open_policy(cli, mem_ctx, True, 
+       status = rpccli_lsa_open_policy(cli, mem_ctx, True,
                                     SEC_FLAG_MAXIMUM_ALLOWED,
                                     &pol);
 
-       if (!NT_STATUS_IS_OK(result))
+       if (!NT_STATUS_IS_OK(status))
                goto done;
 
-       result = rpccli_lsa_EnumPrivs(cli, mem_ctx,
+       status = dcerpc_lsa_EnumPrivs(b, mem_ctx,
                                      &pol,
                                      &enum_context,
                                      &priv_array,
-                                     pref_max_length);
-       if (!NT_STATUS_IS_OK(result))
+                                     pref_max_length,
+                                     &result);
+       if (!NT_STATUS_IS_OK(status))
                goto done;
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
+               goto done;
+       }
 
        /* Print results */
        printf("found %d privileges\n\n", priv_array.count);
@@ -486,9 +650,9 @@ static NTSTATUS cmd_lsa_enum_privilege(struct rpc_pipe_client *cli,
                       priv_array.privs[i].luid.low);
        }
 
-       rpccli_lsa_Close(cli, mem_ctx, &pol);
+       dcerpc_lsa_Close(b, mem_ctx, &pol, &result);
  done:
-       return result;
+       return status;
 }
 
 /* Get privilege name */
@@ -498,7 +662,8 @@ static NTSTATUS cmd_lsa_get_dispname(struct rpc_pipe_client *cli,
                                      const char **argv) 
 {
        struct policy_handle pol;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       NTSTATUS status, result;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        uint16 lang_id=0;
        uint16 lang_id_sys=0;
@@ -511,32 +676,36 @@ static NTSTATUS cmd_lsa_get_dispname(struct rpc_pipe_client *cli,
                return NT_STATUS_OK;
        }
 
-       result = rpccli_lsa_open_policy(cli, mem_ctx, True, 
+       status = rpccli_lsa_open_policy(cli, mem_ctx, True,
                                     SEC_FLAG_MAXIMUM_ALLOWED,
                                     &pol);
 
-       if (!NT_STATUS_IS_OK(result))
+       if (!NT_STATUS_IS_OK(status))
                goto done;
 
        init_lsa_String(&lsa_name, argv[1]);
 
-       result = rpccli_lsa_LookupPrivDisplayName(cli, mem_ctx,
+       status = dcerpc_lsa_LookupPrivDisplayName(b, mem_ctx,
                                                  &pol,
                                                  &lsa_name,
                                                  lang_id,
                                                  lang_id_sys,
                                                  &description,
-                                                 &lang_id_desc);
-
-       if (!NT_STATUS_IS_OK(result))
+                                                 &lang_id_desc,
+                                                 &result);
+       if (!NT_STATUS_IS_OK(status))
+               goto done;
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
                goto done;
+       }
 
        /* Print results */
        printf("%s -> %s (language: 0x%x)\n", argv[1], description->string, lang_id_desc);
 
-       rpccli_lsa_Close(cli, mem_ctx, &pol);
+       dcerpc_lsa_Close(b, mem_ctx, &pol, &result);
  done:
-       return result;
+       return status;
 }
 
 /* Enumerate the LSA SIDS */
@@ -546,7 +715,8 @@ static NTSTATUS cmd_lsa_enum_sids(struct rpc_pipe_client *cli,
                                  const char **argv) 
 {
        struct policy_handle pol;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       NTSTATUS status, result;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        uint32 enum_context=0;
        uint32 pref_max_length=0x1000;
@@ -564,21 +734,25 @@ static NTSTATUS cmd_lsa_enum_sids(struct rpc_pipe_client *cli,
        if (argc==3)
                pref_max_length=atoi(argv[2]);
 
-       result = rpccli_lsa_open_policy(cli, mem_ctx, True, 
+       status = rpccli_lsa_open_policy(cli, mem_ctx, True,
                                     SEC_FLAG_MAXIMUM_ALLOWED,
                                     &pol);
 
-       if (!NT_STATUS_IS_OK(result))
+       if (!NT_STATUS_IS_OK(status))
                goto done;
 
-       result = rpccli_lsa_EnumAccounts(cli, mem_ctx,
+       status = dcerpc_lsa_EnumAccounts(b, mem_ctx,
                                         &pol,
                                         &enum_context,
                                         &sid_array,
-                                        pref_max_length);
-
-       if (!NT_STATUS_IS_OK(result))
+                                        pref_max_length,
+                                        &result);
+       if (!NT_STATUS_IS_OK(status))
                goto done;
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
+               goto done;
+       }
 
        /* Print results */
        printf("found %d SIDs\n\n", sid_array.num_sids);
@@ -590,9 +764,9 @@ static NTSTATUS cmd_lsa_enum_sids(struct rpc_pipe_client *cli,
                printf("%s\n", sid_str);
        }
 
-       rpccli_lsa_Close(cli, mem_ctx, &pol);
+       dcerpc_lsa_Close(b, mem_ctx, &pol, &result);
  done:
-       return result;
+       return status;
 }
 
 /* Create a new account */
@@ -603,42 +777,47 @@ static NTSTATUS cmd_lsa_create_account(struct rpc_pipe_client *cli,
 {
        struct policy_handle dom_pol;
        struct policy_handle user_pol;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       NTSTATUS status, result;
        uint32 des_access = 0x000f000f;
-       
-       DOM_SID sid;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
+
+       struct dom_sid sid;
 
        if (argc != 2 ) {
                printf("Usage: %s SID\n", argv[0]);
                return NT_STATUS_OK;
        }
 
-       result = name_to_sid(cli, mem_ctx, &sid, argv[1]);
-       if (!NT_STATUS_IS_OK(result))
+       status = name_to_sid(cli, mem_ctx, &sid, argv[1]);
+       if (!NT_STATUS_IS_OK(status))
                goto done;      
 
-       result = rpccli_lsa_open_policy2(cli, mem_ctx, True, 
+       status = rpccli_lsa_open_policy2(cli, mem_ctx, True,
                                     SEC_FLAG_MAXIMUM_ALLOWED,
                                     &dom_pol);
 
-       if (!NT_STATUS_IS_OK(result))
+       if (!NT_STATUS_IS_OK(status))
                goto done;
 
-       result = rpccli_lsa_CreateAccount(cli, mem_ctx,
+       status = dcerpc_lsa_CreateAccount(b, mem_ctx,
                                          &dom_pol,
                                          &sid,
                                          des_access,
-                                         &user_pol);
-
-       if (!NT_STATUS_IS_OK(result))
+                                         &user_pol,
+                                         &result);
+       if (!NT_STATUS_IS_OK(status))
+               goto done;
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
                goto done;
+       }
 
        printf("Account for SID %s successfully created\n\n", argv[1]);
-       result = NT_STATUS_OK;
+       status = NT_STATUS_OK;
 
-       rpccli_lsa_Close(cli, mem_ctx, &dom_pol);
+       dcerpc_lsa_Close(b, mem_ctx, &dom_pol, &result);
  done:
-       return result;
+       return status;
 }
 
 
@@ -650,43 +829,52 @@ static NTSTATUS cmd_lsa_enum_privsaccounts(struct rpc_pipe_client *cli,
 {
        struct policy_handle dom_pol;
        struct policy_handle user_pol;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       NTSTATUS status, result;
        uint32 access_desired = 0x000f000f;
-       DOM_SID sid;
+       struct dom_sid sid;
        struct lsa_PrivilegeSet *privs = NULL;
        int i;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc != 2 ) {
                printf("Usage: %s SID\n", argv[0]);
                return NT_STATUS_OK;
        }
 
-       result = name_to_sid(cli, mem_ctx, &sid, argv[1]);
-       if (!NT_STATUS_IS_OK(result))
+       status = name_to_sid(cli, mem_ctx, &sid, argv[1]);
+       if (!NT_STATUS_IS_OK(status))
                goto done;      
 
-       result = rpccli_lsa_open_policy2(cli, mem_ctx, True, 
+       status = rpccli_lsa_open_policy2(cli, mem_ctx, True,
                                     SEC_FLAG_MAXIMUM_ALLOWED,
                                     &dom_pol);
 
-       if (!NT_STATUS_IS_OK(result))
+       if (!NT_STATUS_IS_OK(status))
                goto done;
 
-       result = rpccli_lsa_OpenAccount(cli, mem_ctx,
+       status = dcerpc_lsa_OpenAccount(b, mem_ctx,
                                        &dom_pol,
                                        &sid,
                                        access_desired,
-                                       &user_pol);
-
-       if (!NT_STATUS_IS_OK(result))
+                                       &user_pol,
+                                       &result);
+       if (!NT_STATUS_IS_OK(status))
                goto done;
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
+               goto done;
+       }
 
-       result = rpccli_lsa_EnumPrivsAccount(cli, mem_ctx,
+       status = dcerpc_lsa_EnumPrivsAccount(b, mem_ctx,
                                             &user_pol,
-                                            &privs);
-
-       if (!NT_STATUS_IS_OK(result))
+                                            &privs,
+                                            &result);
+       if (!NT_STATUS_IS_OK(status))
+               goto done;
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
                goto done;
+       }
 
        /* Print results */
        printf("found %d privileges for SID %s\n\n", privs->count, argv[1]);
@@ -699,9 +887,9 @@ static NTSTATUS cmd_lsa_enum_privsaccounts(struct rpc_pipe_client *cli,
                        privs->set[i].attribute);
        }
 
-       rpccli_lsa_Close(cli, mem_ctx, &dom_pol);
+       dcerpc_lsa_Close(b, mem_ctx, &dom_pol, &result);
  done:
-       return result;
+       return status;
 }
 
 
@@ -712,9 +900,10 @@ static NTSTATUS cmd_lsa_enum_acct_rights(struct rpc_pipe_client *cli,
                                         const char **argv) 
 {
        struct policy_handle dom_pol;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-       DOM_SID sid;
+       NTSTATUS status, result;
+       struct dom_sid sid;
        struct lsa_RightSet rights;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        int i;
 
@@ -723,24 +912,28 @@ static NTSTATUS cmd_lsa_enum_acct_rights(struct rpc_pipe_client *cli,
                return NT_STATUS_OK;
        }
 
-       result = name_to_sid(cli, mem_ctx, &sid, argv[1]);
-       if (!NT_STATUS_IS_OK(result))
+       status = name_to_sid(cli, mem_ctx, &sid, argv[1]);
+       if (!NT_STATUS_IS_OK(status))
                goto done;      
 
-       result = rpccli_lsa_open_policy2(cli, mem_ctx, True, 
+       status = rpccli_lsa_open_policy2(cli, mem_ctx, True,
                                     SEC_FLAG_MAXIMUM_ALLOWED,
                                     &dom_pol);
 
-       if (!NT_STATUS_IS_OK(result))
+       if (!NT_STATUS_IS_OK(status))
                goto done;
 
-       result = rpccli_lsa_EnumAccountRights(cli, mem_ctx,
+       status = dcerpc_lsa_EnumAccountRights(b, mem_ctx,
                                              &dom_pol,
                                              &sid,
-                                             &rights);
-
-       if (!NT_STATUS_IS_OK(result))
+                                             &rights,
+                                             &result);
+       if (!NT_STATUS_IS_OK(status))
                goto done;
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
+               goto done;
+       }
 
        printf("found %d privileges for SID %s\n", rights.count,
               sid_string_tos(&sid));
@@ -749,9 +942,9 @@ static NTSTATUS cmd_lsa_enum_acct_rights(struct rpc_pipe_client *cli,
                printf("\t%s\n", rights.names[i].string);
        }
 
-       rpccli_lsa_Close(cli, mem_ctx, &dom_pol);
+       dcerpc_lsa_Close(b, mem_ctx, &dom_pol, &result);
  done:
-       return result;
+       return status;
 }
 
 
@@ -762,29 +955,30 @@ static NTSTATUS cmd_lsa_add_acct_rights(struct rpc_pipe_client *cli,
                                        const char **argv) 
 {
        struct policy_handle dom_pol;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       NTSTATUS status, result;
        struct lsa_RightSet rights;
-       DOM_SID sid;
+       struct dom_sid sid;
        int i;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc < 3 ) {
                printf("Usage: %s SID [rights...]\n", argv[0]);
                return NT_STATUS_OK;
        }
 
-       result = name_to_sid(cli, mem_ctx, &sid, argv[1]);
-       if (!NT_STATUS_IS_OK(result))
+       status = name_to_sid(cli, mem_ctx, &sid, argv[1]);
+       if (!NT_STATUS_IS_OK(status))
                goto done;      
 
-       result = rpccli_lsa_open_policy2(cli, mem_ctx, True, 
+       status = rpccli_lsa_open_policy2(cli, mem_ctx, True,
                                     SEC_FLAG_MAXIMUM_ALLOWED,
                                     &dom_pol);
 
-       if (!NT_STATUS_IS_OK(result))
+       if (!NT_STATUS_IS_OK(status))
                goto done;
 
        rights.count = argc-2;
-       rights.names = TALLOC_ARRAY(mem_ctx, struct lsa_StringLarge,
+       rights.names = talloc_array(mem_ctx, struct lsa_StringLarge,
                                    rights.count);
        if (!rights.names) {
                return NT_STATUS_NO_MEMORY;
@@ -794,17 +988,21 @@ static NTSTATUS cmd_lsa_add_acct_rights(struct rpc_pipe_client *cli,
                init_lsa_StringLarge(&rights.names[i], argv[i+2]);
        }
 
-       result = rpccli_lsa_AddAccountRights(cli, mem_ctx,
+       status = dcerpc_lsa_AddAccountRights(b, mem_ctx,
                                             &dom_pol,
                                             &sid,
-                                            &rights);
-
-       if (!NT_STATUS_IS_OK(result))
+                                            &rights,
+                                            &result);
+       if (!NT_STATUS_IS_OK(status))
+               goto done;
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
                goto done;
+       }
 
-       rpccli_lsa_Close(cli, mem_ctx, &dom_pol);
+       dcerpc_lsa_Close(b, mem_ctx, &dom_pol, &result);
  done:
-       return result;
+       return status;
 }
 
 
@@ -815,29 +1013,30 @@ static NTSTATUS cmd_lsa_remove_acct_rights(struct rpc_pipe_client *cli,
                                        const char **argv) 
 {
        struct policy_handle dom_pol;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       NTSTATUS status, result;
        struct lsa_RightSet rights;
-       DOM_SID sid;
+       struct dom_sid sid;
        int i;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc < 3 ) {
                printf("Usage: %s SID [rights...]\n", argv[0]);
                return NT_STATUS_OK;
        }
 
-       result = name_to_sid(cli, mem_ctx, &sid, argv[1]);
-       if (!NT_STATUS_IS_OK(result))
+       status = name_to_sid(cli, mem_ctx, &sid, argv[1]);
+       if (!NT_STATUS_IS_OK(status))
                goto done;      
 
-       result = rpccli_lsa_open_policy2(cli, mem_ctx, True, 
+       status = rpccli_lsa_open_policy2(cli, mem_ctx, True,
                                     SEC_FLAG_MAXIMUM_ALLOWED,
                                     &dom_pol);
 
-       if (!NT_STATUS_IS_OK(result))
+       if (!NT_STATUS_IS_OK(status))
                goto done;
 
        rights.count = argc-2;
-       rights.names = TALLOC_ARRAY(mem_ctx, struct lsa_StringLarge,
+       rights.names = talloc_array(mem_ctx, struct lsa_StringLarge,
                                    rights.count);
        if (!rights.names) {
                return NT_STATUS_NO_MEMORY;
@@ -847,19 +1046,23 @@ static NTSTATUS cmd_lsa_remove_acct_rights(struct rpc_pipe_client *cli,
                init_lsa_StringLarge(&rights.names[i], argv[i+2]);
        }
 
-       result = rpccli_lsa_RemoveAccountRights(cli, mem_ctx,
+       status = dcerpc_lsa_RemoveAccountRights(b, mem_ctx,
                                                &dom_pol,
                                                &sid,
                                                false,
-                                               &rights);
-
-       if (!NT_STATUS_IS_OK(result))
+                                               &rights,
+                                               &result);
+       if (!NT_STATUS_IS_OK(status))
+               goto done;
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
                goto done;
+       }
 
-       rpccli_lsa_Close(cli, mem_ctx, &dom_pol);
+       dcerpc_lsa_Close(b, mem_ctx, &dom_pol, &result);
 
  done:
-       return result;
+       return status;
 }
 
 
@@ -870,39 +1073,44 @@ static NTSTATUS cmd_lsa_lookup_priv_value(struct rpc_pipe_client *cli,
                                        const char **argv) 
 {
        struct policy_handle pol;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       NTSTATUS status, result;
        struct lsa_LUID luid;
        struct lsa_String name;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc != 2 ) {
                printf("Usage: %s name\n", argv[0]);
                return NT_STATUS_OK;
        }
 
-       result = rpccli_lsa_open_policy2(cli, mem_ctx, True, 
+       status = rpccli_lsa_open_policy2(cli, mem_ctx, True,
                                     SEC_FLAG_MAXIMUM_ALLOWED,
                                     &pol);
 
-       if (!NT_STATUS_IS_OK(result))
+       if (!NT_STATUS_IS_OK(status))
                goto done;
 
        init_lsa_String(&name, argv[1]);
 
-       result = rpccli_lsa_LookupPrivValue(cli, mem_ctx,
+       status = dcerpc_lsa_LookupPrivValue(b, mem_ctx,
                                            &pol,
                                            &name,
-                                           &luid);
-
-       if (!NT_STATUS_IS_OK(result))
+                                           &luid,
+                                           &result);
+       if (!NT_STATUS_IS_OK(status))
                goto done;
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
+               goto done;
+       }
 
        /* Print results */
 
        printf("%u:%u (0x%x:0x%x)\n", luid.high, luid.low, luid.high, luid.low);
 
-       rpccli_lsa_Close(cli, mem_ctx, &pol);
+       dcerpc_lsa_Close(b, mem_ctx, &pol, &result);
  done:
-       return result;
+       return status;
 }
 
 /* Query LSA security object */
@@ -912,53 +1120,58 @@ static NTSTATUS cmd_lsa_query_secobj(struct rpc_pipe_client *cli,
                                     const char **argv) 
 {
        struct policy_handle pol;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-       SEC_DESC_BUF *sdb;
-       uint32 sec_info = DACL_SECURITY_INFORMATION;
+       NTSTATUS status, result;
+       struct sec_desc_buf *sdb;
+       uint32 sec_info = SECINFO_DACL;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc < 1 || argc > 2) {
                printf("Usage: %s [sec_info]\n", argv[0]);
                return NT_STATUS_OK;
        }
 
-       result = rpccli_lsa_open_policy2(cli, mem_ctx, True, 
+       status = rpccli_lsa_open_policy2(cli, mem_ctx, True,
                                      SEC_FLAG_MAXIMUM_ALLOWED,
                                      &pol);
 
        if (argc == 2) 
                sscanf(argv[1], "%x", &sec_info);
 
-       if (!NT_STATUS_IS_OK(result))
+       if (!NT_STATUS_IS_OK(status))
                goto done;
 
-       result = rpccli_lsa_QuerySecurity(cli, mem_ctx,
+       status = dcerpc_lsa_QuerySecurity(b, mem_ctx,
                                          &pol,
                                          sec_info,
-                                         &sdb);
-       if (!NT_STATUS_IS_OK(result))
+                                         &sdb,
+                                         &result);
+       if (!NT_STATUS_IS_OK(status))
+               goto done;
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
                goto done;
+       }
 
        /* Print results */
 
        display_sec_desc(sdb->sd);
 
-       rpccli_lsa_Close(cli, mem_ctx, &pol);
+       dcerpc_lsa_Close(b, mem_ctx, &pol, &result);
  done:
-       return result;
+       return status;
 }
 
 static void display_trust_dom_info_4(struct lsa_TrustDomainInfoPassword *p,
-                                    uint8_t session_key[16])
+                                    DATA_BLOB session_key)
 {
        char *pwd, *pwd_old;
-       
+
        DATA_BLOB data     = data_blob_const(p->password->data, p->password->length);
        DATA_BLOB data_old = data_blob_const(p->old_password->data, p->old_password->length);
-       DATA_BLOB session_key_blob = data_blob_const(session_key, sizeof(session_key));
 
-       pwd     = sess_decrypt_string(talloc_tos(), &data, &session_key_blob);
-       pwd_old = sess_decrypt_string(talloc_tos(), &data_old, &session_key_blob);
-       
+       pwd     = sess_decrypt_string(talloc_tos(), &data, &session_key);
+       pwd_old = sess_decrypt_string(talloc_tos(), &data_old, &session_key);
+
        d_printf("Password:\t%s\n", pwd);
        d_printf("Old Password:\t%s\n", pwd_old);
 
@@ -969,11 +1182,11 @@ static void display_trust_dom_info_4(struct lsa_TrustDomainInfoPassword *p,
 static void display_trust_dom_info(TALLOC_CTX *mem_ctx,
                                   union lsa_TrustedDomainInfo *info,
                                   enum lsa_TrustDomInfoEnum info_class,
-                                  uint8_t nt_hash[16])
+                                  DATA_BLOB session_key)
 {
        switch (info_class) {
                case LSA_TRUSTED_DOMAIN_INFO_PASSWORD:
-                       display_trust_dom_info_4(&info->password, nt_hash);
+                       display_trust_dom_info_4(&info->password, session_key);
                        break;
                default: {
                        const char *str = NULL;
@@ -993,12 +1206,13 @@ static NTSTATUS cmd_lsa_query_trustdominfobysid(struct rpc_pipe_client *cli,
                                                const char **argv) 
 {
        struct policy_handle pol;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-       DOM_SID dom_sid;
+       NTSTATUS status, result;
+       struct dom_sid dom_sid;
        uint32 access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        union lsa_TrustedDomainInfo *info = NULL;
        enum lsa_TrustDomInfoEnum info_class = 1;
-       uint8_t nt_hash[16];
+       DATA_BLOB session_key;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc > 3 || argc < 2) {
                printf("Usage: %s [sid] [info_class]\n", argv[0]);
@@ -1011,30 +1225,36 @@ static NTSTATUS cmd_lsa_query_trustdominfobysid(struct rpc_pipe_client *cli,
        if (argc == 3)
                info_class = atoi(argv[2]);
 
-       result = rpccli_lsa_open_policy2(cli, mem_ctx, True, access_mask, &pol);
+       status = rpccli_lsa_open_policy2(cli, mem_ctx, True, access_mask, &pol);
 
-       if (!NT_STATUS_IS_OK(result))
+       if (!NT_STATUS_IS_OK(status))
                goto done;
 
-       result = rpccli_lsa_QueryTrustedDomainInfoBySid(cli, mem_ctx,
+       status = dcerpc_lsa_QueryTrustedDomainInfoBySid(b, mem_ctx,
                                                        &pol,
                                                        &dom_sid,
                                                        info_class,
-                                                       &info);
-       if (!NT_STATUS_IS_OK(result))
+                                                       &info,
+                                                       &result);
+       if (!NT_STATUS_IS_OK(status))
+               goto done;
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
                goto done;
+       }
 
-       if (!rpccli_get_pwd_hash(cli, nt_hash)) {
-               d_fprintf(stderr, "Could not get pwd hash\n");
+       status = cli_get_session_key(mem_ctx, cli, &session_key);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("Could not retrieve session key: %s\n", nt_errstr(status)));
                goto done;
        }
 
-       display_trust_dom_info(mem_ctx, info, info_class, nt_hash);
+       display_trust_dom_info(mem_ctx, info, info_class, session_key);
 
  done:
-       rpccli_lsa_Close(cli, mem_ctx, &pol);
+       dcerpc_lsa_Close(b, mem_ctx, &pol, &result);
 
-       return result;
+       return status;
 }
 
 static NTSTATUS cmd_lsa_query_trustdominfobyname(struct rpc_pipe_client *cli,
@@ -1042,12 +1262,13 @@ static NTSTATUS cmd_lsa_query_trustdominfobyname(struct rpc_pipe_client *cli,
                                                 const char **argv) 
 {
        struct policy_handle pol;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       NTSTATUS status, result;
        uint32 access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        union lsa_TrustedDomainInfo *info = NULL;
        enum lsa_TrustDomInfoEnum info_class = 1;
        struct lsa_String trusted_domain;
-       uint8_t nt_hash[16];
+       struct dcerpc_binding_handle *b = cli->binding_handle;
+       DATA_BLOB session_key;
 
        if (argc > 3 || argc < 2) {
                printf("Usage: %s [name] [info_class]\n", argv[0]);
@@ -1057,32 +1278,108 @@ static NTSTATUS cmd_lsa_query_trustdominfobyname(struct rpc_pipe_client *cli,
        if (argc == 3)
                info_class = atoi(argv[2]);
 
-       result = rpccli_lsa_open_policy2(cli, mem_ctx, True, access_mask, &pol);
+       status = rpccli_lsa_open_policy2(cli, mem_ctx, True, access_mask, &pol);
 
-       if (!NT_STATUS_IS_OK(result))
+       if (!NT_STATUS_IS_OK(status))
                goto done;
 
        init_lsa_String(&trusted_domain, argv[1]);
 
-       result = rpccli_lsa_QueryTrustedDomainInfoByName(cli, mem_ctx,
+       status = dcerpc_lsa_QueryTrustedDomainInfoByName(b, mem_ctx,
                                                         &pol,
                                                         &trusted_domain,
                                                         info_class,
-                                                        &info);
-       if (!NT_STATUS_IS_OK(result))
+                                                        &info,
+                                                        &result);
+       if (!NT_STATUS_IS_OK(status))
+               goto done;
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
                goto done;
+       }
 
-       if (!rpccli_get_pwd_hash(cli, nt_hash)) {
-               d_fprintf(stderr, "Could not get pwd hash\n");
+       status = cli_get_session_key(mem_ctx, cli, &session_key);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("Could not retrieve session key: %s\n", nt_errstr(status)));
                goto done;
        }
 
-       display_trust_dom_info(mem_ctx, info, info_class, nt_hash);
+       display_trust_dom_info(mem_ctx, info, info_class, session_key);
 
  done:
-       rpccli_lsa_Close(cli, mem_ctx, &pol);
+       dcerpc_lsa_Close(b, mem_ctx, &pol, &result);
 
-       return result;
+       return status;
+}
+
+static NTSTATUS cmd_lsa_set_trustdominfo(struct rpc_pipe_client *cli,
+                                        TALLOC_CTX *mem_ctx, int argc,
+                                        const char **argv)
+{
+       struct policy_handle pol, trustdom_pol;
+       NTSTATUS status, result;
+       uint32 access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+       union lsa_TrustedDomainInfo info;
+       struct dom_sid dom_sid;
+       enum lsa_TrustDomInfoEnum info_class = 1;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
+
+       if (argc > 4 || argc < 3) {
+               printf("Usage: %s [sid] [info_class] [value]\n", argv[0]);
+               return NT_STATUS_OK;
+       }
+
+       if (!string_to_sid(&dom_sid, argv[1])) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+
+       info_class = atoi(argv[2]);
+
+       switch (info_class) {
+       case 13: /* LSA_TRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES */
+               info.enc_types.enc_types = atoi(argv[3]);
+               break;
+       default:
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       status = rpccli_lsa_open_policy2(cli, mem_ctx, True, access_mask, &pol);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
+
+       status = dcerpc_lsa_OpenTrustedDomain(b, mem_ctx,
+                                             &pol,
+                                             &dom_sid,
+                                             access_mask,
+                                             &trustdom_pol,
+                                             &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
+               goto done;
+       }
+
+       status = dcerpc_lsa_SetInformationTrustedDomain(b, mem_ctx,
+                                                       &trustdom_pol,
+                                                       info_class,
+                                                       &info,
+                                                       &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
+               goto done;
+       }
+ done:
+       dcerpc_lsa_Close(b, mem_ctx, &trustdom_pol, &result);
+       dcerpc_lsa_Close(b, mem_ctx, &pol, &result);
+
+       return status;
 }
 
 static NTSTATUS cmd_lsa_query_trustdominfo(struct rpc_pipe_client *cli,
@@ -1090,12 +1387,13 @@ static NTSTATUS cmd_lsa_query_trustdominfo(struct rpc_pipe_client *cli,
                                           const char **argv) 
 {
        struct policy_handle pol, trustdom_pol;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       NTSTATUS status, result;
        uint32 access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        union lsa_TrustedDomainInfo *info = NULL;
-       DOM_SID dom_sid;
+       struct dom_sid dom_sid;
        enum lsa_TrustDomInfoEnum info_class = 1;
-       uint8_t nt_hash[16];
+       DATA_BLOB session_key;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc > 3 || argc < 2) {
                printf("Usage: %s [sid] [info_class]\n", argv[0]);
@@ -1109,39 +1407,48 @@ static NTSTATUS cmd_lsa_query_trustdominfo(struct rpc_pipe_client *cli,
        if (argc == 3)
                info_class = atoi(argv[2]);
 
-       result = rpccli_lsa_open_policy2(cli, mem_ctx, True, access_mask, &pol);
+       status = rpccli_lsa_open_policy2(cli, mem_ctx, True, access_mask, &pol);
 
-       if (!NT_STATUS_IS_OK(result))
+       if (!NT_STATUS_IS_OK(status))
                goto done;
 
-       result = rpccli_lsa_OpenTrustedDomain(cli, mem_ctx,
+       status = dcerpc_lsa_OpenTrustedDomain(b, mem_ctx,
                                              &pol,
                                              &dom_sid,
                                              access_mask,
-                                             &trustdom_pol);
-
-       if (!NT_STATUS_IS_OK(result))
+                                             &trustdom_pol,
+                                             &result);
+       if (!NT_STATUS_IS_OK(status))
+               goto done;
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
                goto done;
+       }
 
-       result = rpccli_lsa_QueryTrustedDomainInfo(cli, mem_ctx,
+       status = dcerpc_lsa_QueryTrustedDomainInfo(b, mem_ctx,
                                                   &trustdom_pol,
                                                   info_class,
-                                                  &info);
-
-       if (!NT_STATUS_IS_OK(result))
+                                                  &info,
+                                                  &result);
+       if (!NT_STATUS_IS_OK(status))
                goto done;
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
+               goto done;
+       }
 
-       if (!rpccli_get_pwd_hash(cli, nt_hash)) {
-               d_fprintf(stderr, "Could not get pwd hash\n");
+       status = cli_get_session_key(mem_ctx, cli, &session_key);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("Could not retrieve session key: %s\n", nt_errstr(status)));
                goto done;
        }
 
-       display_trust_dom_info(mem_ctx, info, info_class, nt_hash);
+       display_trust_dom_info(mem_ctx, info, info_class, session_key);
 
  done:
-       rpccli_lsa_Close(cli, mem_ctx, &pol);
+       dcerpc_lsa_Close(b, mem_ctx, &pol, &result);
 
-       return result;
+       return status;
 }
 
 static NTSTATUS cmd_lsa_get_username(struct rpc_pipe_client *cli,
@@ -1149,29 +1456,35 @@ static NTSTATUS cmd_lsa_get_username(struct rpc_pipe_client *cli,
                                      const char **argv)
 {
        struct policy_handle pol;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       NTSTATUS status, result;
        const char *servername = cli->desthost;
        struct lsa_String *account_name = NULL;
        struct lsa_String *authority_name = NULL;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc > 2) {
                printf("Usage: %s servername\n", argv[0]);
                return NT_STATUS_OK;
        }
 
-       result = rpccli_lsa_open_policy(cli, mem_ctx, true,
+       status = rpccli_lsa_open_policy(cli, mem_ctx, true,
                                        SEC_FLAG_MAXIMUM_ALLOWED,
                                        &pol);
 
-       if (!NT_STATUS_IS_OK(result)) {
+       if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
 
-       result = rpccli_lsa_GetUserName(cli, mem_ctx,
+       status = dcerpc_lsa_GetUserName(b, mem_ctx,
                                        servername,
                                        &account_name,
-                                       &authority_name);
+                                       &authority_name,
+                                       &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
        if (!NT_STATUS_IS_OK(result)) {
+               status = result;
                goto done;
        }
 
@@ -1181,9 +1494,9 @@ static NTSTATUS cmd_lsa_get_username(struct rpc_pipe_client *cli,
                account_name->string, authority_name ? authority_name->string :
                "");
 
-       rpccli_lsa_Close(cli, mem_ctx, &pol);
+       dcerpc_lsa_Close(b, mem_ctx, &pol, &result);
  done:
-       return result;
+       return status;
 }
 
 static NTSTATUS cmd_lsa_add_priv(struct rpc_pipe_client *cli,
@@ -1191,11 +1504,12 @@ static NTSTATUS cmd_lsa_add_priv(struct rpc_pipe_client *cli,
                                 const char **argv)
 {
        struct policy_handle dom_pol, user_pol;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       NTSTATUS status, result;
        struct lsa_PrivilegeSet privs;
        struct lsa_LUIDAttribute *set = NULL;
-       DOM_SID sid;
+       struct dom_sid sid;
        int i;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        ZERO_STRUCT(privs);
 
@@ -1204,26 +1518,30 @@ static NTSTATUS cmd_lsa_add_priv(struct rpc_pipe_client *cli,
                return NT_STATUS_OK;
        }
 
-       result = name_to_sid(cli, mem_ctx, &sid, argv[1]);
-       if (!NT_STATUS_IS_OK(result)) {
+       status = name_to_sid(cli, mem_ctx, &sid, argv[1]);
+       if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
 
-       result = rpccli_lsa_open_policy2(cli, mem_ctx, True,
+       status = rpccli_lsa_open_policy2(cli, mem_ctx, True,
                                         SEC_FLAG_MAXIMUM_ALLOWED,
                                         &dom_pol);
 
-       if (!NT_STATUS_IS_OK(result)) {
+       if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
 
-       result = rpccli_lsa_OpenAccount(cli, mem_ctx,
+       status = dcerpc_lsa_OpenAccount(b, mem_ctx,
                                        &dom_pol,
                                        &sid,
                                        SEC_FLAG_MAXIMUM_ALLOWED,
-                                       &user_pol);
-
+                                       &user_pol,
+                                       &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
        if (!NT_STATUS_IS_OK(result)) {
+               status = result;
                goto done;
        }
 
@@ -1234,16 +1552,21 @@ static NTSTATUS cmd_lsa_add_priv(struct rpc_pipe_client *cli,
 
                init_lsa_String(&priv_name, argv[i]);
 
-               result = rpccli_lsa_LookupPrivValue(cli, mem_ctx,
+               status = dcerpc_lsa_LookupPrivValue(b, mem_ctx,
                                                    &dom_pol,
                                                    &priv_name,
-                                                   &luid);
+                                                   &luid,
+                                                   &result);
+               if (!NT_STATUS_IS_OK(status)) {
+                       continue;
+               }
                if (!NT_STATUS_IS_OK(result)) {
+                       status = result;
                        continue;
                }
 
                privs.count++;
-               set = TALLOC_REALLOC_ARRAY(mem_ctx, set,
+               set = talloc_realloc(mem_ctx, set,
                                           struct lsa_LUIDAttribute,
                                           privs.count);
                if (!set) {
@@ -1256,18 +1579,22 @@ static NTSTATUS cmd_lsa_add_priv(struct rpc_pipe_client *cli,
 
        privs.set = set;
 
-       result = rpccli_lsa_AddPrivilegesToAccount(cli, mem_ctx,
+       status = dcerpc_lsa_AddPrivilegesToAccount(b, mem_ctx,
                                                   &user_pol,
-                                                  &privs);
-
+                                                  &privs,
+                                                  &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
        if (!NT_STATUS_IS_OK(result)) {
+               status = result;
                goto done;
        }
 
-       rpccli_lsa_Close(cli, mem_ctx, &user_pol);
-       rpccli_lsa_Close(cli, mem_ctx, &dom_pol);
+       dcerpc_lsa_Close(b, mem_ctx, &user_pol, &result);
+       dcerpc_lsa_Close(b, mem_ctx, &dom_pol, &result);
  done:
-       return result;
+       return status;
 }
 
 static NTSTATUS cmd_lsa_del_priv(struct rpc_pipe_client *cli,
@@ -1275,11 +1602,12 @@ static NTSTATUS cmd_lsa_del_priv(struct rpc_pipe_client *cli,
                                 const char **argv)
 {
        struct policy_handle dom_pol, user_pol;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       NTSTATUS status, result;
        struct lsa_PrivilegeSet privs;
        struct lsa_LUIDAttribute *set = NULL;
-       DOM_SID sid;
+       struct dom_sid sid;
        int i;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        ZERO_STRUCT(privs);
 
@@ -1288,26 +1616,30 @@ static NTSTATUS cmd_lsa_del_priv(struct rpc_pipe_client *cli,
                return NT_STATUS_OK;
        }
 
-       result = name_to_sid(cli, mem_ctx, &sid, argv[1]);
-       if (!NT_STATUS_IS_OK(result)) {
+       status = name_to_sid(cli, mem_ctx, &sid, argv[1]);
+       if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
 
-       result = rpccli_lsa_open_policy2(cli, mem_ctx, True,
+       status = rpccli_lsa_open_policy2(cli, mem_ctx, True,
                                         SEC_FLAG_MAXIMUM_ALLOWED,
                                         &dom_pol);
 
-       if (!NT_STATUS_IS_OK(result)) {
+       if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
 
-       result = rpccli_lsa_OpenAccount(cli, mem_ctx,
+       status = dcerpc_lsa_OpenAccount(b, mem_ctx,
                                        &dom_pol,
                                        &sid,
                                        SEC_FLAG_MAXIMUM_ALLOWED,
-                                       &user_pol);
-
+                                       &user_pol,
+                                       &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
        if (!NT_STATUS_IS_OK(result)) {
+               status = result;
                goto done;
        }
 
@@ -1318,16 +1650,21 @@ static NTSTATUS cmd_lsa_del_priv(struct rpc_pipe_client *cli,
 
                init_lsa_String(&priv_name, argv[i]);
 
-               result = rpccli_lsa_LookupPrivValue(cli, mem_ctx,
+               status = dcerpc_lsa_LookupPrivValue(b, mem_ctx,
                                                    &dom_pol,
                                                    &priv_name,
-                                                   &luid);
+                                                   &luid,
+                                                   &result);
+               if (!NT_STATUS_IS_OK(status)) {
+                       continue;
+               }
                if (!NT_STATUS_IS_OK(result)) {
+                       status = result;
                        continue;
                }
 
                privs.count++;
-               set = TALLOC_REALLOC_ARRAY(mem_ctx, set,
+               set = talloc_realloc(mem_ctx, set,
                                           struct lsa_LUIDAttribute,
                                           privs.count);
                if (!set) {
@@ -1341,28 +1678,33 @@ static NTSTATUS cmd_lsa_del_priv(struct rpc_pipe_client *cli,
        privs.set = set;
 
 
-       result = rpccli_lsa_RemovePrivilegesFromAccount(cli, mem_ctx,
+       status = dcerpc_lsa_RemovePrivilegesFromAccount(b, mem_ctx,
                                                        &user_pol,
                                                        false,
-                                                       &privs);
-
+                                                       &privs,
+                                                       &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
        if (!NT_STATUS_IS_OK(result)) {
+               status = result;
                goto done;
        }
 
-       rpccli_lsa_Close(cli, mem_ctx, &user_pol);
-       rpccli_lsa_Close(cli, mem_ctx, &dom_pol);
+       dcerpc_lsa_Close(b, mem_ctx, &user_pol, &result);
+       dcerpc_lsa_Close(b, mem_ctx, &dom_pol, &result);
  done:
-       return result;
+       return status;
 }
 
 static NTSTATUS cmd_lsa_create_secret(struct rpc_pipe_client *cli,
                                      TALLOC_CTX *mem_ctx, int argc,
                                      const char **argv)
 {
-       NTSTATUS status;
+       NTSTATUS status, result;
        struct policy_handle handle, sec_handle;
        struct lsa_String name;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc < 2) {
                printf("Usage: %s name\n", argv[0]);
@@ -1379,21 +1721,26 @@ static NTSTATUS cmd_lsa_create_secret(struct rpc_pipe_client *cli,
 
        init_lsa_String(&name, argv[1]);
 
-       status = rpccli_lsa_CreateSecret(cli, mem_ctx,
+       status = dcerpc_lsa_CreateSecret(b, mem_ctx,
                                         &handle,
                                         name,
                                         SEC_FLAG_MAXIMUM_ALLOWED,
-                                        &sec_handle);
+                                        &sec_handle,
+                                        &result);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
+               goto done;
+       }
 
  done:
        if (is_valid_policy_hnd(&sec_handle)) {
-               rpccli_lsa_Close(cli, mem_ctx, &sec_handle);
+               dcerpc_lsa_Close(b, mem_ctx, &sec_handle, &result);
        }
        if (is_valid_policy_hnd(&handle)) {
-               rpccli_lsa_Close(cli, mem_ctx, &handle);
+               dcerpc_lsa_Close(b, mem_ctx, &handle, &result);
        }
 
        return status;
@@ -1403,9 +1750,10 @@ static NTSTATUS cmd_lsa_delete_secret(struct rpc_pipe_client *cli,
                                      TALLOC_CTX *mem_ctx, int argc,
                                      const char **argv)
 {
-       NTSTATUS status;
+       NTSTATUS status, result;
        struct policy_handle handle, sec_handle;
        struct lsa_String name;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc < 2) {
                printf("Usage: %s name\n", argv[0]);
@@ -1422,27 +1770,37 @@ static NTSTATUS cmd_lsa_delete_secret(struct rpc_pipe_client *cli,
 
        init_lsa_String(&name, argv[1]);
 
-       status = rpccli_lsa_OpenSecret(cli, mem_ctx,
+       status = dcerpc_lsa_OpenSecret(b, mem_ctx,
                                       &handle,
                                       name,
                                       SEC_FLAG_MAXIMUM_ALLOWED,
-                                      &sec_handle);
+                                      &sec_handle,
+                                      &result);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
+               goto done;
+       }
 
-       status = rpccli_lsa_DeleteObject(cli, mem_ctx,
-                                        &sec_handle);
+       status = dcerpc_lsa_DeleteObject(b, mem_ctx,
+                                        &sec_handle,
+                                        &result);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
+               goto done;
+       }
 
  done:
        if (is_valid_policy_hnd(&sec_handle)) {
-               rpccli_lsa_Close(cli, mem_ctx, &sec_handle);
+               dcerpc_lsa_Close(b, mem_ctx, &sec_handle, &result);
        }
        if (is_valid_policy_hnd(&handle)) {
-               rpccli_lsa_Close(cli, mem_ctx, &handle);
+               dcerpc_lsa_Close(b, mem_ctx, &handle, &result);
        }
 
        return status;
@@ -1452,7 +1810,7 @@ static NTSTATUS cmd_lsa_query_secret(struct rpc_pipe_client *cli,
                                     TALLOC_CTX *mem_ctx, int argc,
                                     const char **argv)
 {
-       NTSTATUS status;
+       NTSTATUS status, result;
        struct policy_handle handle, sec_handle;
        struct lsa_String name;
        struct lsa_DATA_BUF_PTR new_val;
@@ -1463,6 +1821,7 @@ static NTSTATUS cmd_lsa_query_secret(struct rpc_pipe_client *cli,
        DATA_BLOB new_blob = data_blob_null;
        DATA_BLOB old_blob = data_blob_null;
        char *new_secret, *old_secret;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc < 2) {
                printf("Usage: %s name\n", argv[0]);
@@ -1479,27 +1838,37 @@ static NTSTATUS cmd_lsa_query_secret(struct rpc_pipe_client *cli,
 
        init_lsa_String(&name, argv[1]);
 
-       status = rpccli_lsa_OpenSecret(cli, mem_ctx,
+       status = dcerpc_lsa_OpenSecret(b, mem_ctx,
                                       &handle,
                                       name,
                                       SEC_FLAG_MAXIMUM_ALLOWED,
-                                      &sec_handle);
+                                      &sec_handle,
+                                      &result);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
+               goto done;
+       }
 
        ZERO_STRUCT(new_val);
        ZERO_STRUCT(old_val);
 
-       status = rpccli_lsa_QuerySecret(cli, mem_ctx,
+       status = dcerpc_lsa_QuerySecret(b, mem_ctx,
                                        &sec_handle,
                                        &new_val,
                                        &new_mtime,
                                        &old_val,
-                                       &old_mtime);
+                                       &old_mtime,
+                                       &result);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
+               goto done;
+       }
 
        status = cli_get_session_key(mem_ctx, cli, &session_key);
        if (!NT_STATUS_IS_OK(status)) {
@@ -1524,10 +1893,10 @@ static NTSTATUS cmd_lsa_query_secret(struct rpc_pipe_client *cli,
 
  done:
        if (is_valid_policy_hnd(&sec_handle)) {
-               rpccli_lsa_Close(cli, mem_ctx, &sec_handle);
+               dcerpc_lsa_Close(b, mem_ctx, &sec_handle, &result);
        }
        if (is_valid_policy_hnd(&handle)) {
-               rpccli_lsa_Close(cli, mem_ctx, &handle);
+               dcerpc_lsa_Close(b, mem_ctx, &handle, &result);
        }
 
        return status;
@@ -1537,13 +1906,14 @@ static NTSTATUS cmd_lsa_set_secret(struct rpc_pipe_client *cli,
                                   TALLOC_CTX *mem_ctx, int argc,
                                   const char **argv)
 {
-       NTSTATUS status;
+       NTSTATUS status, result;
        struct policy_handle handle, sec_handle;
        struct lsa_String name;
        struct lsa_DATA_BUF new_val;
        struct lsa_DATA_BUF old_val;
        DATA_BLOB enc_key;
        DATA_BLOB session_key;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc < 3) {
                printf("Usage: %s name secret\n", argv[0]);
@@ -1560,14 +1930,19 @@ static NTSTATUS cmd_lsa_set_secret(struct rpc_pipe_client *cli,
 
        init_lsa_String(&name, argv[1]);
 
-       status = rpccli_lsa_OpenSecret(cli, mem_ctx,
+       status = dcerpc_lsa_OpenSecret(b, mem_ctx,
                                       &handle,
                                       name,
                                       SEC_FLAG_MAXIMUM_ALLOWED,
-                                      &sec_handle);
+                                      &sec_handle,
+                                      &result);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
+               goto done;
+       }
 
        ZERO_STRUCT(new_val);
        ZERO_STRUCT(old_val);
@@ -1583,20 +1958,308 @@ static NTSTATUS cmd_lsa_set_secret(struct rpc_pipe_client *cli,
        new_val.size = enc_key.length;
        new_val.data = enc_key.data;
 
-       status = rpccli_lsa_SetSecret(cli, mem_ctx,
+       status = dcerpc_lsa_SetSecret(b, mem_ctx,
                                      &sec_handle,
                                      &new_val,
-                                     NULL);
+                                     NULL,
+                                     &result);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
+               goto done;
+       }
 
  done:
        if (is_valid_policy_hnd(&sec_handle)) {
-               rpccli_lsa_Close(cli, mem_ctx, &sec_handle);
+               dcerpc_lsa_Close(b, mem_ctx, &sec_handle, &result);
+       }
+       if (is_valid_policy_hnd(&handle)) {
+               dcerpc_lsa_Close(b, mem_ctx, &handle, &result);
+       }
+
+       return status;
+}
+
+static NTSTATUS cmd_lsa_retrieve_private_data(struct rpc_pipe_client *cli,
+                                             TALLOC_CTX *mem_ctx, int argc,
+                                             const char **argv)
+{
+       NTSTATUS status, result;
+       struct policy_handle handle;
+       struct lsa_String name;
+       struct lsa_DATA_BUF *val;
+       DATA_BLOB session_key;
+       DATA_BLOB blob = data_blob_null;
+       char *secret;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
+
+       if (argc < 2) {
+               printf("Usage: %s name\n", argv[0]);
+               return NT_STATUS_OK;
+       }
+
+       status = rpccli_lsa_open_policy2(cli, mem_ctx,
+                                        true,
+                                        SEC_FLAG_MAXIMUM_ALLOWED,
+                                        &handle);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       init_lsa_String(&name, argv[1]);
+
+       ZERO_STRUCT(val);
+
+       status = dcerpc_lsa_RetrievePrivateData(b, mem_ctx,
+                                               &handle,
+                                               &name,
+                                               &val,
+                                               &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
+               goto done;
+       }
+
+       status = cli_get_session_key(mem_ctx, cli, &session_key);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
        }
+
+       if (val) {
+               blob = data_blob_const(val->data, val->length);
+       }
+
+       secret = sess_decrypt_string(mem_ctx, &blob, &session_key);
+       if (secret) {
+               d_printf("secret: %s\n", secret);
+       }
+
+ done:
+       if (is_valid_policy_hnd(&handle)) {
+               dcerpc_lsa_Close(b, mem_ctx, &handle, &result);
+       }
+
+       return status;
+}
+
+static NTSTATUS cmd_lsa_store_private_data(struct rpc_pipe_client *cli,
+                                          TALLOC_CTX *mem_ctx, int argc,
+                                          const char **argv)
+{
+       NTSTATUS status, result;
+       struct policy_handle handle;
+       struct lsa_String name;
+       struct lsa_DATA_BUF val;
+       DATA_BLOB session_key;
+       DATA_BLOB enc_key;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
+
+       if (argc < 3) {
+               printf("Usage: %s name secret\n", argv[0]);
+               return NT_STATUS_OK;
+       }
+
+       status = rpccli_lsa_open_policy2(cli, mem_ctx,
+                                        true,
+                                        SEC_FLAG_MAXIMUM_ALLOWED,
+                                        &handle);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       init_lsa_String(&name, argv[1]);
+
+       ZERO_STRUCT(val);
+
+       status = cli_get_session_key(mem_ctx, cli, &session_key);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
+
+       enc_key = sess_encrypt_string(argv[2], &session_key);
+
+       val.length = enc_key.length;
+       val.size = enc_key.length;
+       val.data = enc_key.data;
+
+       status = dcerpc_lsa_StorePrivateData(b, mem_ctx,
+                                            &handle,
+                                            &name,
+                                            &val,
+                                            &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
+               goto done;
+       }
+
+ done:
+       if (is_valid_policy_hnd(&handle)) {
+               dcerpc_lsa_Close(b, mem_ctx, &handle, &result);
+       }
+
+       return status;
+}
+
+static NTSTATUS cmd_lsa_create_trusted_domain(struct rpc_pipe_client *cli,
+                                             TALLOC_CTX *mem_ctx, int argc,
+                                             const char **argv)
+{
+       NTSTATUS status, result;
+       struct policy_handle handle, trustdom_handle;
+       struct dom_sid sid;
+       struct lsa_DomainInfo info;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
+
+       if (argc < 3) {
+               printf("Usage: %s name sid\n", argv[0]);
+               return NT_STATUS_OK;
+       }
+
+       status = rpccli_lsa_open_policy2(cli, mem_ctx,
+                                        true,
+                                        SEC_FLAG_MAXIMUM_ALLOWED,
+                                        &handle);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       init_lsa_StringLarge(&info.name, argv[1]);
+       info.sid = &sid;
+       string_to_sid(&sid, argv[2]);
+
+       status = dcerpc_lsa_CreateTrustedDomain(b, mem_ctx,
+                                               &handle,
+                                               &info,
+                                               SEC_FLAG_MAXIMUM_ALLOWED,
+                                               &trustdom_handle,
+                                               &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
+               goto done;
+       }
+
+ done:
+       if (is_valid_policy_hnd(&trustdom_handle)) {
+               dcerpc_lsa_Close(b, mem_ctx, &trustdom_handle, &result);
+       }
+
+       if (is_valid_policy_hnd(&handle)) {
+               dcerpc_lsa_Close(b, mem_ctx, &handle, &result);
+       }
+
+       return status;
+}
+
+static NTSTATUS cmd_lsa_delete_trusted_domain(struct rpc_pipe_client *cli,
+                                             TALLOC_CTX *mem_ctx, int argc,
+                                             const char **argv)
+{
+       NTSTATUS status, result;
+       struct policy_handle handle, trustdom_handle;
+       struct lsa_String name;
+       struct dom_sid *sid = NULL;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
+
+       if (argc < 2) {
+               printf("Usage: %s name\n", argv[0]);
+               return NT_STATUS_OK;
+       }
+
+       status = rpccli_lsa_open_policy2(cli, mem_ctx,
+                                        true,
+                                        SEC_FLAG_MAXIMUM_ALLOWED,
+                                        &handle);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       init_lsa_String(&name, argv[1]);
+
+       status = dcerpc_lsa_OpenTrustedDomainByName(b, mem_ctx,
+                                                   &handle,
+                                                   name,
+                                                   SEC_FLAG_MAXIMUM_ALLOWED,
+                                                   &trustdom_handle,
+                                                   &result);
+       if (NT_STATUS_IS_OK(status) && NT_STATUS_IS_OK(result)) {
+               goto delete_object;
+       }
+
+       {
+               uint32_t resume_handle = 0;
+               struct lsa_DomainList domains;
+               int i;
+
+               status = dcerpc_lsa_EnumTrustDom(b, mem_ctx,
+                                                &handle,
+                                                &resume_handle,
+                                                &domains,
+                                                0xffff,
+                                                &result);
+               if (!NT_STATUS_IS_OK(status)) {
+                       goto done;
+               }
+               if (!NT_STATUS_IS_OK(result)) {
+                       status = result;
+                       goto done;
+               }
+
+               for (i=0; i < domains.count; i++) {
+                       if (strequal(domains.domains[i].name.string, argv[1])) {
+                               sid = domains.domains[i].sid;
+                               break;
+                       }
+               }
+
+               if (!sid) {
+                       return NT_STATUS_INVALID_SID;
+               }
+       }
+
+       status = dcerpc_lsa_OpenTrustedDomain(b, mem_ctx,
+                                             &handle,
+                                             sid,
+                                             SEC_FLAG_MAXIMUM_ALLOWED,
+                                             &trustdom_handle,
+                                             &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
+               goto done;
+       }
+
+ delete_object:
+       status = dcerpc_lsa_DeleteObject(b, mem_ctx,
+                                        &trustdom_handle,
+                                        &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
+               goto done;
+       }
+
+ done:
+       if (is_valid_policy_hnd(&trustdom_handle)) {
+               dcerpc_lsa_Close(b, mem_ctx, &trustdom_handle, &result);
+       }
+
        if (is_valid_policy_hnd(&handle)) {
-               rpccli_lsa_Close(cli, mem_ctx, &handle);
+               dcerpc_lsa_Close(b, mem_ctx, &handle, &result);
        }
 
        return status;
@@ -1609,31 +2272,38 @@ struct cmd_set lsarpc_commands[] = {
 
        { "LSARPC" },
 
-       { "lsaquery",            RPC_RTYPE_NTSTATUS, cmd_lsa_query_info_policy,  NULL, &ndr_table_lsarpc.syntax_id, NULL, "Query info policy",                    "" },
-       { "lookupsids",          RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_sids,        NULL, &ndr_table_lsarpc.syntax_id, NULL, "Convert SIDs to names",                "" },
-       { "lookupnames",         RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_names,       NULL, &ndr_table_lsarpc.syntax_id, NULL, "Convert names to SIDs",                "" },
-       { "lookupnames_level",   RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_names_level, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Convert names to SIDs",                "" },
-       { "enumtrust",           RPC_RTYPE_NTSTATUS, cmd_lsa_enum_trust_dom,     NULL, &ndr_table_lsarpc.syntax_id, NULL, "Enumerate trusted domains",            "Usage: [preferred max number] [enum context (0)]" },
-       { "enumprivs",           RPC_RTYPE_NTSTATUS, cmd_lsa_enum_privilege,     NULL, &ndr_table_lsarpc.syntax_id, NULL, "Enumerate privileges",                 "" },
-       { "getdispname",         RPC_RTYPE_NTSTATUS, cmd_lsa_get_dispname,       NULL, &ndr_table_lsarpc.syntax_id, NULL, "Get the privilege name",               "" },
-       { "lsaenumsid",          RPC_RTYPE_NTSTATUS, cmd_lsa_enum_sids,          NULL, &ndr_table_lsarpc.syntax_id, NULL, "Enumerate the LSA SIDS",               "" },
-       { "lsacreateaccount",    RPC_RTYPE_NTSTATUS, cmd_lsa_create_account,     NULL, &ndr_table_lsarpc.syntax_id, NULL, "Create a new lsa account",   "" },
-       { "lsaenumprivsaccount", RPC_RTYPE_NTSTATUS, cmd_lsa_enum_privsaccounts, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Enumerate the privileges of an SID",   "" },
-       { "lsaenumacctrights",   RPC_RTYPE_NTSTATUS, cmd_lsa_enum_acct_rights,   NULL, &ndr_table_lsarpc.syntax_id, NULL, "Enumerate the rights of an SID",   "" },
-       { "lsaaddpriv",          RPC_RTYPE_NTSTATUS, cmd_lsa_add_priv,           NULL, &ndr_table_lsarpc.syntax_id, NULL, "Assign a privilege to a SID", "" },
-       { "lsadelpriv",          RPC_RTYPE_NTSTATUS, cmd_lsa_del_priv,           NULL, &ndr_table_lsarpc.syntax_id, NULL, "Revoke a privilege from a SID", "" },
-       { "lsaaddacctrights",    RPC_RTYPE_NTSTATUS, cmd_lsa_add_acct_rights,    NULL, &ndr_table_lsarpc.syntax_id, NULL, "Add rights to an account",   "" },
-       { "lsaremoveacctrights", RPC_RTYPE_NTSTATUS, cmd_lsa_remove_acct_rights, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Remove rights from an account",   "" },
-       { "lsalookupprivvalue",  RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_priv_value,  NULL, &ndr_table_lsarpc.syntax_id, NULL, "Get a privilege value given its name", "" },
-       { "lsaquerysecobj",      RPC_RTYPE_NTSTATUS, cmd_lsa_query_secobj,       NULL, &ndr_table_lsarpc.syntax_id, NULL, "Query LSA security object", "" },
-       { "lsaquerytrustdominfo",RPC_RTYPE_NTSTATUS, cmd_lsa_query_trustdominfo, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Query LSA trusted domains info (given a SID)", "" },
-       { "lsaquerytrustdominfobyname",RPC_RTYPE_NTSTATUS, cmd_lsa_query_trustdominfobyname, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Query LSA trusted domains info (given a name), only works for Windows > 2k", "" },
-       { "lsaquerytrustdominfobysid",RPC_RTYPE_NTSTATUS, cmd_lsa_query_trustdominfobysid, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Query LSA trusted domains info (given a SID)", "" },
-       { "getusername",          RPC_RTYPE_NTSTATUS, cmd_lsa_get_username, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Get username", "" },
-       { "createsecret",         RPC_RTYPE_NTSTATUS, cmd_lsa_create_secret, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Create Secret", "" },
-       { "deletesecret",         RPC_RTYPE_NTSTATUS, cmd_lsa_delete_secret, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Delete Secret", "" },
-       { "querysecret",          RPC_RTYPE_NTSTATUS, cmd_lsa_query_secret, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Query Secret", "" },
-       { "setsecret",            RPC_RTYPE_NTSTATUS, cmd_lsa_set_secret, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Set Secret", "" },
+       { "lsaquery",            RPC_RTYPE_NTSTATUS, cmd_lsa_query_info_policy,  NULL, &ndr_table_lsarpc, NULL, "Query info policy",                    "" },
+       { "lookupsids",          RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_sids,        NULL, &ndr_table_lsarpc, NULL, "Convert SIDs to names",                "" },
+       { "lookupsids3",         RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_sids3,       NULL, &ndr_table_lsarpc, NULL, "Convert SIDs to names",                "" },
+       { "lookupnames",         RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_names,       NULL, &ndr_table_lsarpc, NULL, "Convert names to SIDs",                "" },
+       { "lookupnames4",        RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_names4,      NULL, &ndr_table_lsarpc, NULL, "Convert names to SIDs",                "" },
+       { "lookupnames_level",   RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_names_level, NULL, &ndr_table_lsarpc, NULL, "Convert names to SIDs",                "" },
+       { "enumtrust",           RPC_RTYPE_NTSTATUS, cmd_lsa_enum_trust_dom,     NULL, &ndr_table_lsarpc, NULL, "Enumerate trusted domains",            "Usage: [preferred max number] [enum context (0)]" },
+       { "enumprivs",           RPC_RTYPE_NTSTATUS, cmd_lsa_enum_privilege,     NULL, &ndr_table_lsarpc, NULL, "Enumerate privileges",                 "" },
+       { "getdispname",         RPC_RTYPE_NTSTATUS, cmd_lsa_get_dispname,       NULL, &ndr_table_lsarpc, NULL, "Get the privilege name",               "" },
+       { "lsaenumsid",          RPC_RTYPE_NTSTATUS, cmd_lsa_enum_sids,          NULL, &ndr_table_lsarpc, NULL, "Enumerate the LSA SIDS",               "" },
+       { "lsacreateaccount",    RPC_RTYPE_NTSTATUS, cmd_lsa_create_account,     NULL, &ndr_table_lsarpc, NULL, "Create a new lsa account",   "" },
+       { "lsaenumprivsaccount", RPC_RTYPE_NTSTATUS, cmd_lsa_enum_privsaccounts, NULL, &ndr_table_lsarpc, NULL, "Enumerate the privileges of an SID",   "" },
+       { "lsaenumacctrights",   RPC_RTYPE_NTSTATUS, cmd_lsa_enum_acct_rights,   NULL, &ndr_table_lsarpc, NULL, "Enumerate the rights of an SID",   "" },
+       { "lsaaddpriv",          RPC_RTYPE_NTSTATUS, cmd_lsa_add_priv,           NULL, &ndr_table_lsarpc, NULL, "Assign a privilege to a SID", "" },
+       { "lsadelpriv",          RPC_RTYPE_NTSTATUS, cmd_lsa_del_priv,           NULL, &ndr_table_lsarpc, NULL, "Revoke a privilege from a SID", "" },
+       { "lsaaddacctrights",    RPC_RTYPE_NTSTATUS, cmd_lsa_add_acct_rights,    NULL, &ndr_table_lsarpc, NULL, "Add rights to an account",   "" },
+       { "lsaremoveacctrights", RPC_RTYPE_NTSTATUS, cmd_lsa_remove_acct_rights, NULL, &ndr_table_lsarpc, NULL, "Remove rights from an account",   "" },
+       { "lsalookupprivvalue",  RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_priv_value,  NULL, &ndr_table_lsarpc, NULL, "Get a privilege value given its name", "" },
+       { "lsaquerysecobj",      RPC_RTYPE_NTSTATUS, cmd_lsa_query_secobj,       NULL, &ndr_table_lsarpc, NULL, "Query LSA security object", "" },
+       { "lsaquerytrustdominfo",RPC_RTYPE_NTSTATUS, cmd_lsa_query_trustdominfo, NULL, &ndr_table_lsarpc, NULL, "Query LSA trusted domains info (given a SID)", "" },
+       { "lsaquerytrustdominfobyname",RPC_RTYPE_NTSTATUS, cmd_lsa_query_trustdominfobyname, NULL, &ndr_table_lsarpc, NULL, "Query LSA trusted domains info (given a name), only works for Windows > 2k", "" },
+       { "lsaquerytrustdominfobysid",RPC_RTYPE_NTSTATUS, cmd_lsa_query_trustdominfobysid, NULL, &ndr_table_lsarpc, NULL, "Query LSA trusted domains info (given a SID)", "" },
+       { "lsasettrustdominfo",   RPC_RTYPE_NTSTATUS, cmd_lsa_set_trustdominfo, NULL, &ndr_table_lsarpc, NULL, "Set LSA trusted domain info", "" },
+       { "getusername",          RPC_RTYPE_NTSTATUS, cmd_lsa_get_username, NULL, &ndr_table_lsarpc, NULL, "Get username", "" },
+       { "createsecret",         RPC_RTYPE_NTSTATUS, cmd_lsa_create_secret, NULL, &ndr_table_lsarpc, NULL, "Create Secret", "" },
+       { "deletesecret",         RPC_RTYPE_NTSTATUS, cmd_lsa_delete_secret, NULL, &ndr_table_lsarpc, NULL, "Delete Secret", "" },
+       { "querysecret",          RPC_RTYPE_NTSTATUS, cmd_lsa_query_secret, NULL, &ndr_table_lsarpc, NULL, "Query Secret", "" },
+       { "setsecret",            RPC_RTYPE_NTSTATUS, cmd_lsa_set_secret, NULL, &ndr_table_lsarpc, NULL, "Set Secret", "" },
+       { "retrieveprivatedata",  RPC_RTYPE_NTSTATUS, cmd_lsa_retrieve_private_data, NULL, &ndr_table_lsarpc, NULL, "Retrieve Private Data", "" },
+       { "storeprivatedata",     RPC_RTYPE_NTSTATUS, cmd_lsa_store_private_data, NULL, &ndr_table_lsarpc, NULL, "Store Private Data", "" },
+       { "createtrustdom",       RPC_RTYPE_NTSTATUS, cmd_lsa_create_trusted_domain, NULL, &ndr_table_lsarpc, NULL, "Create Trusted Domain", "" },
+       { "deletetrustdom",       RPC_RTYPE_NTSTATUS, cmd_lsa_delete_trusted_domain, NULL, &ndr_table_lsarpc, NULL, "Delete Trusted Domain", "" },
 
        { NULL }
 };