Changeset 988 for vendor/current/source3/rpcclient

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

Location:

vendor/current/source3/rpcclient

Files:

• cmd_clusapi.c (added)
• cmd_dfs.c (modified) (6 diffs)
• cmd_drsuapi.c (modified) (3 diffs)
• cmd_dssetup.c (modified) (1 diff)
• cmd_echo.c (modified) (5 diffs)
• cmd_epmapper.c (modified) (6 diffs)
• cmd_eventlog.c (modified) (6 diffs)
• cmd_fss.c (added)
• cmd_lsarpc.c (modified) (28 diffs)
• cmd_netlogon.c (modified) (24 diffs)
• cmd_ntsvcs.c (modified) (1 diff)
• cmd_samr.c (modified) (31 diffs)
• cmd_shutdown.c (modified) (1 diff)
• cmd_spoolss.c (modified) (32 diffs)
• cmd_srvsvc.c (modified) (15 diffs)
• cmd_test.c (modified) (2 diffs)
• cmd_winreg.c (modified) (1 diff)
• cmd_witness.c (added)
• cmd_wkssvc.c (modified) (1 diff)
• rpcclient.c (modified) (30 diffs)
• rpcclient.h (modified) (1 diff)

vendor/current/source3/rpcclient/cmd_dfs.c

@@ -59 +59 @@
         WERROR werr;
         const char *path, *servername, *sharename, *comment;
-        uint32 flags = 0;
+        uint32_t flags = 0;
         struct dcerpc_binding_handle *b = cli->binding_handle;
 
@@ -150 +150 @@
 
 /* Display a DFS_INFO_CTR structure */
-static void display_dfs_info(uint32 level, union dfs_Info *ctr)
+static void display_dfs_info(uint32_t level, union dfs_Info *ctr)
 {
         switch (level) {
@@ -203 +203 @@
         NTSTATUS result;
         WERROR werr;
-        uint32 total = 0;
+        uint32_t total = 0;
 
         if (argc > 2) {
@@ -254 +254 @@
         NTSTATUS result;
         WERROR werr;
-        uint32 total = 0;
+        uint32_t total = 0;
 
         if (argc < 2 || argc > 3) {
@@ -297 +297 @@
         WERROR werr;
         const char *path, *servername, *sharename;
-        uint32 info_level = 1;
+        uint32_t info_level = 1;
         union dfs_Info ctr;
         struct dcerpc_binding_handle *b = cli->binding_handle;
@@ -332 +332 @@
         { "DFS" },
 
-        { "dfsversion", RPC_RTYPE_WERROR, NULL, cmd_dfs_version, &ndr_table_netdfs.syntax_id, NULL, "Query DFS support",    "" },
-        { "dfsadd",     RPC_RTYPE_WERROR, NULL, cmd_dfs_add,     &ndr_table_netdfs.syntax_id, NULL, "Add a DFS share",      "" },
-        { "dfsremove",  RPC_RTYPE_WERROR, NULL, cmd_dfs_remove,  &ndr_table_netdfs.syntax_id, NULL, "Remove a DFS share",   "" },
-        { "dfsgetinfo", RPC_RTYPE_WERROR, NULL, cmd_dfs_getinfo, &ndr_table_netdfs.syntax_id, NULL, "Query DFS share info", "" },
-        { "dfsenum",    RPC_RTYPE_WERROR, NULL, cmd_dfs_enum,    &ndr_table_netdfs.syntax_id, NULL, "Enumerate dfs shares", "" },
-        { "dfsenumex",  RPC_RTYPE_WERROR, NULL, cmd_dfs_enumex,  &ndr_table_netdfs.syntax_id, NULL, "Enumerate dfs shares", "" },
+        { "dfsversion", RPC_RTYPE_WERROR, NULL, cmd_dfs_version, &ndr_table_netdfs, NULL, "Query DFS support",    "" },
+        { "dfsadd",     RPC_RTYPE_WERROR, NULL, cmd_dfs_add,     &ndr_table_netdfs, NULL, "Add a DFS share",      "" },
+        { "dfsremove",  RPC_RTYPE_WERROR, NULL, cmd_dfs_remove,  &ndr_table_netdfs, NULL, "Remove a DFS share",   "" },
+        { "dfsgetinfo", RPC_RTYPE_WERROR, NULL, cmd_dfs_getinfo, &ndr_table_netdfs, NULL, "Query DFS share info", "" },
+        { "dfsenum",    RPC_RTYPE_WERROR, NULL, cmd_dfs_enum,    &ndr_table_netdfs, NULL, "Enumerate dfs shares", "" },
+        { "dfsenumex",  RPC_RTYPE_WERROR, NULL, cmd_dfs_enumex,  &ndr_table_netdfs, NULL, "Enumerate dfs shares", "" },
 
         { NULL }

vendor/current/source3/rpcclient/cmd_drsuapi.c

@@ -41 +41 @@
         struct dcerpc_binding_handle *b = cli->binding_handle;
 
-        names = TALLOC_ZERO_ARRAY(mem_ctx, struct drsuapi_DsNameString, argc);
+        names = talloc_zero_array(mem_ctx, struct drsuapi_DsNameString, argc);
         W_ERROR_HAVE_NO_MEMORY(names);
 
@@ -421 +421 @@
         } else if (bind_info.length == 28) {
                 supported_extensions = bind_info.info.info28.supported_extensions;
+        } else if (bind_info.length == 32) {
+                supported_extensions = bind_info.info.info32.supported_extensions;
         } else if (bind_info.length == 48) {
                 supported_extensions = bind_info.info.info48.supported_extensions;
+        } else if (bind_info.length == 52) {
+                supported_extensions = bind_info.info.info52.supported_extensions;
         }
 
@@ -584 +588 @@
 
         { "DRSUAPI" },
-        { "dscracknames", RPC_RTYPE_WERROR, NULL, cmd_drsuapi_cracknames, &ndr_table_drsuapi.syntax_id, NULL, "Crack Name", "" },
-        { "dsgetdcinfo", RPC_RTYPE_WERROR, NULL, cmd_drsuapi_getdcinfo, &ndr_table_drsuapi.syntax_id, NULL, "Get Domain Controller Info", "" },
-        { "dsgetncchanges", RPC_RTYPE_WERROR, NULL, cmd_drsuapi_getncchanges, &ndr_table_drsuapi.syntax_id, NULL, "Get NC Changes", "" },
+        { "dscracknames", RPC_RTYPE_WERROR, NULL, cmd_drsuapi_cracknames, &ndr_table_drsuapi, NULL, "Crack Name", "" },
+        { "dsgetdcinfo", RPC_RTYPE_WERROR, NULL, cmd_drsuapi_getdcinfo, &ndr_table_drsuapi, NULL, "Get Domain Controller Info", "" },
+        { "dsgetncchanges", RPC_RTYPE_WERROR, NULL, cmd_drsuapi_getncchanges, &ndr_table_drsuapi, NULL, "Get NC Changes", "" },
         { NULL }
 };

vendor/current/source3/rpcclient/cmd_dssetup.c

@@ -66 +66 @@
         { "LSARPC-DS" },
 
-        { "dsroledominfo",   RPC_RTYPE_WERROR, NULL, cmd_ds_dsrole_getprimarydominfo, &ndr_table_dssetup.syntax_id, NULL, "Get Primary Domain Information", "" },
+        { "dsroledominfo",   RPC_RTYPE_WERROR, NULL, cmd_ds_dsrole_getprimarydominfo, &ndr_table_dssetup, NULL, "Get Primary Domain Information", "" },
 
 { NULL }

vendor/current/source3/rpcclient/cmd_echo.c

@@ -27 +27 @@
 {
         struct dcerpc_binding_handle *b = cli->binding_handle;
-        uint32 request = 1, response;
+        uint32_t request = 1, response;
         NTSTATUS status;
 
@@ -54 +54 @@
 {
         struct dcerpc_binding_handle *b = cli->binding_handle;
-        uint32 size, i;
+        uint32_t size, i;
         NTSTATUS status;
         uint8_t *in_data = NULL, *out_data = NULL;
@@ -106 +106 @@
 {
         struct dcerpc_binding_handle *b = cli->binding_handle;
-        uint32 size, i;
+        uint32_t size, i;
         NTSTATUS status;
         uint8_t *out_data = NULL;
@@ -147 +147 @@
 {
         struct dcerpc_binding_handle *b = cli->binding_handle;
-        uint32 size, i;
+        uint32_t size, i;
         NTSTATUS status;
         uint8_t *in_data = NULL;
@@ -185 +185 @@
         { "ECHO" },
 
-        { "echoaddone", RPC_RTYPE_NTSTATUS, cmd_echo_add_one,     NULL, &ndr_table_rpcecho.syntax_id, NULL, "Add one to a number", "" },
-        { "echodata",   RPC_RTYPE_NTSTATUS, cmd_echo_data,        NULL, &ndr_table_rpcecho.syntax_id, NULL, "Echo data",           "" },
-        { "sinkdata",   RPC_RTYPE_NTSTATUS, cmd_echo_sink_data,   NULL, &ndr_table_rpcecho.syntax_id, NULL, "Sink data",           "" },
-        { "sourcedata", RPC_RTYPE_NTSTATUS, cmd_echo_source_data, NULL, &ndr_table_rpcecho.syntax_id, NULL, "Source data",         "" },
+        { "echoaddone", RPC_RTYPE_NTSTATUS, cmd_echo_add_one,     NULL, &ndr_table_rpcecho, NULL, "Add one to a number", "" },
+        { "echodata",   RPC_RTYPE_NTSTATUS, cmd_echo_data,        NULL, &ndr_table_rpcecho, NULL, "Echo data",           "" },
+        { "sinkdata",   RPC_RTYPE_NTSTATUS, cmd_echo_sink_data,   NULL, &ndr_table_rpcecho, NULL, "Sink data",           "" },
+        { "sourcedata", RPC_RTYPE_NTSTATUS, cmd_echo_source_data, NULL, &ndr_table_rpcecho, NULL, "Source data",         "" },
         { NULL }
 };

vendor/current/source3/rpcclient/cmd_epmapper.c

@@ -29 +29 @@
 {
         struct dcerpc_binding_handle *b = p->binding_handle;
-        struct dcerpc_binding map_binding;
+        struct dcerpc_binding *map_binding;
         struct epm_twr_t map_tower;
         struct epm_twr_p_t towers[500];
@@ -42 +42 @@
         abstract_syntax = ndr_table_lsarpc.syntax_id;
 
-        map_binding.transport = NCACN_NP;
-        map_binding.object = abstract_syntax;
-        map_binding.host = "127.0.0.1"; /* needed? */
-        map_binding.endpoint = "0"; /* correct? needed? */
+        /* 127.0.0.1[0] => correct? needed? */
+        status = dcerpc_parse_binding(tmp_ctx, "ncacn_np:127.0.0.1[0]",
+                                      &map_binding);
+        if (!NT_STATUS_IS_OK(status)) {
+                d_fprintf(stderr, "dcerpc_parse_binding returned %s\n",
+                          nt_errstr(status));
+                goto done;
+        }
 
-        status = dcerpc_binding_build_tower(tmp_ctx, &map_binding,
+        status = dcerpc_binding_set_abstract_syntax(map_binding,
+                                                    &abstract_syntax);
+        if (!NT_STATUS_IS_OK(status)) {
+                d_fprintf(stderr, "dcerpc_binding_set_abstract_syntax returned %s\n",
+                          nt_errstr(status));
+                goto done;
+        }
+
+        status = dcerpc_binding_build_tower(tmp_ctx, map_binding,
                                             &map_tower.tower);
         if (!NT_STATUS_IS_OK(status)) {
                 d_fprintf(stderr, "dcerpc_binding_build_tower returned %s\n",
                           nt_errstr(status));
-                return status;
+                goto done;
         }
 
@@ -65 +77 @@
                 d_fprintf(stderr, "dcerpc_epm_Map returned %s\n",
                           nt_errstr(status));
-                return status;
+                goto done;
         }
 
@@ -71 +83 @@
                 d_fprintf(stderr, "epm_Map returned %u (0x%08X)\n",
                           result, result);
-                return NT_STATUS_UNSUCCESSFUL;
+                status = NT_STATUS_UNSUCCESSFUL;
+                goto done;
         }
 
@@ -92 +105 @@
                 d_printf("tower[%u] %s\n", i, dcerpc_binding_string(tmp_ctx, binding));
         }
-
-        return NT_STATUS_OK;
+done:
+        TALLOC_FREE(tmp_ctx);
+        return status;
 }
 
@@ -175 +189 @@
 
         { "epmmap", RPC_RTYPE_NTSTATUS, cmd_epmapper_map,     NULL,
-          &ndr_table_epmapper.syntax_id, NULL, "Map a binding", "" },
+          &ndr_table_epmapper, NULL, "Map a binding", "" },
         { "epmlookup", RPC_RTYPE_NTSTATUS, cmd_epmapper_lookup,     NULL,
-          &ndr_table_epmapper.syntax_id, NULL, "Lookup bindings", "" },
+          &ndr_table_epmapper, NULL, "Lookup bindings", "" },
         { NULL }
 };

vendor/current/source3/rpcclient/cmd_eventlog.c

@@ -70 +70 @@
         uint32_t offset = 0;
         uint32_t number_of_bytes = 0;
-        uint8_t *data = NULL;
+        uint8_t *data;
         uint32_t sent_size = 0;
         uint32_t real_size = 0;
@@ -85 +85 @@
         if (argc >= 4) {
                 number_of_bytes = atoi(argv[3]);
-                data = talloc_array(mem_ctx, uint8_t, number_of_bytes);
-                if (!data) {
-                        goto done;
-                }
-        }
-
-        status = get_eventlog_handle(cli, mem_ctx, argv[1], &handle);
-        if (!NT_STATUS_IS_OK(status)) {
-                return status;
+        }
+
+        status = get_eventlog_handle(cli, mem_ctx, argv[1], &handle);
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
+        }
+
+        data = talloc_array(mem_ctx, uint8_t, number_of_bytes);
+        if (data == NULL) {
+                goto done;
         }
 
@@ -119 +120 @@
                     real_size > 0 ) {
                         number_of_bytes = real_size;
-                        data = talloc_array(mem_ctx, uint8_t, real_size);
-                        if (!data) {
+                        data = talloc_realloc(mem_ctx, data, uint8_t, real_size);
+                        if (data == NULL) {
                                 goto done;
                         }
@@ -510 +511 @@
         }
 
+        buffer = talloc_array(mem_ctx, uint8_t, bytes_needed);
+        if (buffer == NULL) {
+                status = NT_STATUS_NO_MEMORY;
+                goto done;
+        }
+
         status = dcerpc_eventlog_GetLogInformation(b, mem_ctx,
                                                    &handle,
@@ -526 +533 @@
 
         buf_size = bytes_needed;
-        buffer = talloc_array(mem_ctx, uint8_t, bytes_needed);
-        if (!buffer) {
+        buffer = talloc_realloc(mem_ctx, buffer, uint8_t, bytes_needed);
+        if (buffer == NULL) {
                 status = NT_STATUS_NO_MEMORY;
                 goto done;
@@ -556 +563 @@
 struct cmd_set eventlog_commands[] = {
         { "EVENTLOG" },
-        { "eventlog_readlog",           RPC_RTYPE_NTSTATUS,     cmd_eventlog_readlog,           NULL,   &ndr_table_eventlog.syntax_id,  NULL,   "Read Eventlog", "" },
-        { "eventlog_numrecord",         RPC_RTYPE_NTSTATUS,     cmd_eventlog_numrecords,        NULL,   &ndr_table_eventlog.syntax_id,  NULL,   "Get number of records", "" },
-        { "eventlog_oldestrecord",      RPC_RTYPE_NTSTATUS,     cmd_eventlog_oldestrecord,      NULL,   &ndr_table_eventlog.syntax_id,  NULL,   "Get oldest record", "" },
-        { "eventlog_reportevent",       RPC_RTYPE_NTSTATUS,     cmd_eventlog_reportevent,       NULL,   &ndr_table_eventlog.syntax_id,  NULL,   "Report event", "" },
-        { "eventlog_reporteventsource", RPC_RTYPE_NTSTATUS,     cmd_eventlog_reporteventsource, NULL,   &ndr_table_eventlog.syntax_id,  NULL,   "Report event and source", "" },
-        { "eventlog_registerevsource",  RPC_RTYPE_NTSTATUS,     cmd_eventlog_registerevsource,  NULL,   &ndr_table_eventlog.syntax_id,  NULL,   "Register event source", "" },
-        { "eventlog_backuplog",         RPC_RTYPE_NTSTATUS,     cmd_eventlog_backuplog,         NULL,   &ndr_table_eventlog.syntax_id,  NULL,   "Backup Eventlog File", "" },
-        { "eventlog_loginfo",           RPC_RTYPE_NTSTATUS,     cmd_eventlog_loginfo,           NULL,   &ndr_table_eventlog.syntax_id,  NULL,   "Get Eventlog Information", "" },
+        { "eventlog_readlog",           RPC_RTYPE_NTSTATUS,     cmd_eventlog_readlog,           NULL,   &ndr_table_eventlog,    NULL,   "Read Eventlog", "" },
+        { "eventlog_numrecord",         RPC_RTYPE_NTSTATUS,     cmd_eventlog_numrecords,        NULL,   &ndr_table_eventlog,    NULL,   "Get number of records", "" },
+        { "eventlog_oldestrecord",      RPC_RTYPE_NTSTATUS,     cmd_eventlog_oldestrecord,      NULL,   &ndr_table_eventlog,    NULL,   "Get oldest record", "" },
+        { "eventlog_reportevent",       RPC_RTYPE_NTSTATUS,     cmd_eventlog_reportevent,       NULL,   &ndr_table_eventlog,    NULL,   "Report event", "" },
+        { "eventlog_reporteventsource", RPC_RTYPE_NTSTATUS,     cmd_eventlog_reporteventsource, NULL,   &ndr_table_eventlog,    NULL,   "Report event and source", "" },
+        { "eventlog_registerevsource",  RPC_RTYPE_NTSTATUS,     cmd_eventlog_registerevsource,  NULL,   &ndr_table_eventlog,    NULL,   "Register event source", "" },
+        { "eventlog_backuplog",         RPC_RTYPE_NTSTATUS,     cmd_eventlog_backuplog,         NULL,   &ndr_table_eventlog,    NULL,   "Backup Eventlog File", "" },
+        { "eventlog_loginfo",           RPC_RTYPE_NTSTATUS,     cmd_eventlog_loginfo,           NULL,   &ndr_table_eventlog,    NULL,   "Get Eventlog Information", "" },
         { NULL }
 };

vendor/current/source3/rpcclient/cmd_lsarpc.c

@@ -162 +162 @@
         struct dcerpc_binding_handle *b = cli->binding_handle;
 
-        uint32 info_class = 3;
+        uint32_t info_class = 3;
 
         if (argc > 2) {
@@ -405 +405 @@
         /* Convert arguments to sids */
 
-        sids = TALLOC_ARRAY(mem_ctx, struct dom_sid, argc - 1);
+        sids = talloc_array(mem_ctx, struct dom_sid, argc - 1);
 
         if (!sids) {
@@ -435 +435 @@
 
                 sid_to_fstring(sid_str, &sids[i]);
-                printf("%s %s\\%s (%d)\n", sid_str, 
-                       domains[i] ? domains[i] : "*unknown*", 
-                       names[i] ? names[i] : "*unknown*", types[i]);
+                if (types[i] == SID_NAME_DOMAIN) {
+                        printf("%s %s (%d)\n", sid_str,
+                               domains[i] ? domains[i] : "*unknown*",
+                               types[i]);
+                } else {
+                        printf("%s %s\\%s (%d)\n", sid_str,
+                               domains[i] ? domains[i] : "*unknown*",
+                               names[i] ? names[i] : "*unknown*",
+                               types[i]);
+                }
         }
 
@@ -540 +547 @@
 
         /* defaults, but may be changed using params */
-        uint32 enum_ctx = 0;
+        uint32_t enum_ctx = 0;
         int i;
         uint32_t max_size = (uint32_t)-1;
@@ -611 +618 @@
         struct dcerpc_binding_handle *b = cli->binding_handle;
 
-        uint32 enum_context=0;
-        uint32 pref_max_length=0x1000;
+        uint32_t enum_context=0;
+        uint32_t pref_max_length=0x1000;
         int i;
 
@@ -673 +680 @@
         struct dcerpc_binding_handle *b = cli->binding_handle;
 
-        uint16 lang_id=0;
-        uint16 lang_id_sys=0;
-        uint16 lang_id_desc;
+        uint16_t lang_id=0;
+        uint16_t lang_id_sys=0;
+        uint16_t lang_id_desc;
         struct lsa_String lsa_name;
         struct lsa_StringLarge *description = NULL;
@@ -726 +733 @@
         struct dcerpc_binding_handle *b = cli->binding_handle;
 
-        uint32 enum_context=0;
-        uint32 pref_max_length=0x1000;
+        uint32_t enum_context=0;
+        uint32_t pref_max_length=0x1000;
         struct lsa_SidArray sid_array;
         int i;
@@ -786 +793 @@
         struct policy_handle user_pol;
         NTSTATUS status, result;
-        uint32 des_access = 0x000f000f;
+        uint32_t des_access = 0x000f000f;
         struct dcerpc_binding_handle *b = cli->binding_handle;
 
@@ -838 +845 @@
         struct policy_handle user_pol;
         NTSTATUS status, result;
-        uint32 access_desired = 0x000f000f;
+        uint32_t access_desired = 0x000f000f;
         struct dom_sid sid;
         struct lsa_PrivilegeSet *privs = NULL;
@@ -986 +993 @@
 
         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) {
@@ -1044 +1051 @@
 
         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) {
@@ -1130 +1137 @@
         NTSTATUS status, result;
         struct sec_desc_buf *sdb;
-        uint32 sec_info = SECINFO_DACL;
+        uint32_t sec_info = SECINFO_DACL;
         struct dcerpc_binding_handle *b = cli->binding_handle;
 
@@ -1170 +1177 @@
 
 static void display_trust_dom_info_4(struct lsa_TrustDomainInfoPassword *p,
-                                     uint8_t session_key[16])
+                                     DATA_BLOB session_key)
 {
         char *pwd, *pwd_old;
@@ -1176 +1183 @@
         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, 16);
-
-        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);
@@ -1191 +1197 @@
                                    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: {
@@ -1217 +1223 @@
         NTSTATUS status, result;
         struct dom_sid dom_sid;
-        uint32 access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+        uint32_t 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;
 
@@ -1252 +1258 @@
         }
 
-        if (!rpccli_get_pwd_hash(cli, nt_hash)) {
-                d_fprintf(stderr, "Could not get pwd hash\n");
-                goto done;
-        }
-
-        display_trust_dom_info(mem_ctx, info, info_class, nt_hash);
+        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, session_key);
 
  done:
@@ -1271 +1278 @@
         struct policy_handle pol;
         NTSTATUS status, result;
-        uint32 access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+        uint32_t 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;
+        struct dcerpc_binding_handle *b = cli->binding_handle;
+        DATA_BLOB session_key;
 
         if (argc > 3 || argc < 2) {
@@ -1306 +1313 @@
         }
 
-        if (!rpccli_get_pwd_hash(cli, nt_hash)) {
-                d_fprintf(stderr, "Could not get pwd hash\n");
-                goto done;
-        }
-
-        display_trust_dom_info(mem_ctx, info, info_class, nt_hash);
+        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, session_key);
 
  done:
@@ -1319 +1327 @@
 }
 
-static NTSTATUS cmd_lsa_query_trustdominfo(struct rpc_pipe_client *cli,
-                                           TALLOC_CTX *mem_ctx, int argc,
-                                           const char **argv) 
+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 = NULL;
+        uint32_t access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+        union lsa_TrustedDomainInfo info;
         struct dom_sid dom_sid;
         enum lsa_TrustDomInfoEnum info_class = 1;
-        uint8_t nt_hash[16];
-        struct dcerpc_binding_handle *b = cli->binding_handle;
-
-        if (argc > 3 || argc < 2) {
-                printf("Usage: %s [sid] [info_class]\n", argv[0]);
-                return NT_STATUS_OK;
-        }
-
-        if (!string_to_sid(&dom_sid, argv[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;
-
-
-        if (argc == 3)
-                info_class = atoi(argv[2]);
+        }
+
+
+        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;
+        if (!NT_STATUS_IS_OK(status)) {
+                goto done;
+        }
 
         status = dcerpc_lsa_OpenTrustedDomain(b, mem_ctx,
@@ -1355 +1370 @@
                                               &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,
+                                           TALLOC_CTX *mem_ctx, int argc,
+                                           const char **argv) 
+{
+        struct policy_handle pol, trustdom_pol;
+        NTSTATUS status, result;
+        uint32_t access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+        union lsa_TrustedDomainInfo *info = NULL;
+        struct dom_sid dom_sid;
+        enum lsa_TrustDomInfoEnum info_class = 1;
+        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]);
+                return NT_STATUS_OK;
+        }
+
+        if (!string_to_sid(&dom_sid, argv[1]))
+                return NT_STATUS_NO_MEMORY;
+
+
+        if (argc == 3)
+                info_class = atoi(argv[2]);
+
+        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;
@@ -1374 +1452 @@
         }
 
-        if (!rpccli_get_pwd_hash(cli, nt_hash)) {
-                d_fprintf(stderr, "Could not get pwd hash\n");
-                goto done;
-        }
-
-        display_trust_dom_info(mem_ctx, info, info_class, nt_hash);
+        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, session_key);
 
  done:
@@ -1391 +1470 @@
                                      const char **argv)
 {
-        struct policy_handle pol;
         NTSTATUS status, result;
         const char *servername = cli->desthost;
@@ -1401 +1479 @@
                 printf("Usage: %s servername\n", argv[0]);
                 return NT_STATUS_OK;
-        }
-
-        status = rpccli_lsa_open_policy(cli, mem_ctx, true,
-                                        SEC_FLAG_MAXIMUM_ALLOWED,
-                                        &pol);
-
-        if (!NT_STATUS_IS_OK(status)) {
-                goto done;
         }
 
@@ -1430 +1500 @@
                 "");
 
-        dcerpc_lsa_Close(b, mem_ctx, &pol, &result);
  done:
         return status;
@@ -1502 +1571 @@
 
                 privs.count++;
-                set = TALLOC_REALLOC_ARRAY(mem_ctx, set,
+                set = talloc_realloc(mem_ctx, set,
                                            struct lsa_LUIDAttribute,
                                            privs.count);
@@ -1600 +1669 @@
 
                 privs.count++;
-                set = TALLOC_REALLOC_ARRAY(mem_ctx, set,
+                set = talloc_realloc(mem_ctx, set,
                                            struct lsa_LUIDAttribute,
                                            privs.count);
@@ -2208 +2277 @@
         { "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",                "" },
-        { "lookupsids3",         RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_sids3,       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",                "" },
-        { "lookupnames4",        RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_names4,      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", "" },
-        { "retrieveprivatedata",  RPC_RTYPE_NTSTATUS, cmd_lsa_retrieve_private_data, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Retrieve Private Data", "" },
-        { "storeprivatedata",     RPC_RTYPE_NTSTATUS, cmd_lsa_store_private_data, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Store Private Data", "" },
-        { "createtrustdom",       RPC_RTYPE_NTSTATUS, cmd_lsa_create_trusted_domain, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Create Trusted Domain", "" },
-        { "deletetrustdom",       RPC_RTYPE_NTSTATUS, cmd_lsa_delete_trusted_domain, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Delete Trusted Domain", "" },
+        { "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 }

vendor/current/source3/rpcclient/cmd_netlogon.c

@@ -27 +27 @@
 #include "rpc_client/cli_netlogon.h"
 #include "secrets.h"
+#include "../libcli/auth/netlogon_creds_cli.h"
 
 static WERROR cmd_netlogon_logon_ctrl2(struct rpc_pipe_client *cli,
@@ -41 +42 @@
         const char *domain = lp_workgroup();
         struct dcerpc_binding_handle *b = cli->binding_handle;
-
-        if (argc > 5) {
+        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;
         }
@@ -67 +92 @@
                 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;
@@ -181 +214 @@
         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;
@@ -212 +245 @@
         if (argc >= 5)
                 sscanf(argv[4], "%x", &flags);
-
-        debug_dsdcinfo_flags(1,flags);
 
         result = dcerpc_netr_DsRGetDCName(b, mem_ctx,
@@ -275 +306 @@
         }
 
-        debug_dsdcinfo_flags(1,flags);
-
         status = dcerpc_netr_DsRGetDCNameEx(b, mem_ctx,
                                             server_name,
@@ -348 +377 @@
         }
 
-        debug_dsdcinfo_flags(1,flags);
-
         status = dcerpc_netr_DsRGetDCNameEx2(b, mem_ctx,
                                              server_name,
@@ -584 +611 @@
         NTSTATUS status;
         const char *logon_server = cli->desthost;
-        const char *computername = global_myname();
+        const char *computername = lp_netbios_name();
         struct netr_Authenticator credential;
         struct netr_Authenticator return_authenticator;
@@ -605 +632 @@
         do {
                 struct netr_DELTA_ENUM_ARRAY *delta_enum_array = NULL;
-
-                netlogon_creds_client_authenticator(cli->dc, &credential);
+                struct netlogon_creds_CredentialState *creds = NULL;
+
+                if (rpcclient_netlogon_creds == NULL) {
+                        return NT_STATUS_UNSUCCESSFUL;
+                }
+
+                status = netlogon_creds_cli_lock(rpcclient_netlogon_creds,
+                                                 mem_ctx, &creds);
+                if (!NT_STATUS_IS_OK(status)) {
+                        return status;
+                }
+
+                netlogon_creds_client_authenticator(creds, &credential);
 
                 status = dcerpc_netr_DatabaseSync2(b, mem_ctx,
@@ -620 +658 @@
                                                    &result);
                 if (!NT_STATUS_IS_OK(status)) {
+                        TALLOC_FREE(creds);
                         return status;
                 }
 
                 /* Check returned credentials. */
-                if (!netlogon_creds_client_check(cli->dc,
+                if (!netlogon_creds_client_check(creds,
                                                  &return_authenticator.cred)) {
                         DEBUG(0,("credentials chain check failed\n"));
+                        TALLOC_FREE(creds);
                         return NT_STATUS_ACCESS_DENIED;
                 }
+                TALLOC_FREE(creds);
 
                 if (NT_STATUS_IS_ERR(result)) {
@@ -655 +696 @@
         uint32_t tmp;
         const char *logon_server = cli->desthost;
-        const char *computername = global_myname();
+        const char *computername = lp_netbios_name();
         struct netr_Authenticator credential;
         struct netr_Authenticator return_authenticator;
@@ -674 +715 @@
         do {
                 struct netr_DELTA_ENUM_ARRAY *delta_enum_array = NULL;
-
-                netlogon_creds_client_authenticator(cli->dc, &credential);
+                struct netlogon_creds_CredentialState *creds = NULL;
+
+                if (rpcclient_netlogon_creds == NULL) {
+                        return NT_STATUS_UNSUCCESSFUL;
+                }
+
+                status = netlogon_creds_cli_lock(rpcclient_netlogon_creds,
+                                                 mem_ctx, &creds);
+                if (!NT_STATUS_IS_OK(status)) {
+                        return status;
+                }
+
+                netlogon_creds_client_authenticator(creds, &credential);
 
                 status = dcerpc_netr_DatabaseDeltas(b, mem_ctx,
@@ -688 +740 @@
                                                     &result);
                 if (!NT_STATUS_IS_OK(status)) {
+                        TALLOC_FREE(creds);
                         return status;
                 }
 
                 /* Check returned credentials. */
-                if (!netlogon_creds_client_check(cli->dc,
+                if (!netlogon_creds_client_check(creds,
                                                  &return_authenticator.cred)) {
                         DEBUG(0,("credentials chain check failed\n"));
+                        TALLOC_FREE(creds);
                         return NT_STATUS_ACCESS_DENIED;
                 }
+                TALLOC_FREE(creds);
 
                 if (NT_STATUS_IS_ERR(result)) {
@@ -722 +777 @@
         int logon_type = NetlogonNetworkInformation;
         const char *username, *password;
-        uint16_t validation_level = 3;
-        uint32 logon_param = 0;
+        uint32_t logon_param = 0;
         const char *workstation = NULL;
+        struct netr_SamInfo3 *info3 = NULL;
 
         /* 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;
         }
@@ -743 +798 @@
                 sscanf(argv[4], "%i", &logon_type);
 
-        if (argc >= 6)
-                validation_level = atoi(argv[5]);
-
-        if (argc == 7)
-                sscanf(argv[6], "%x", &logon_param);
+        if (argc == 6)
+                sscanf(argv[5], "%x", &logon_param);
+
+        if (rpcclient_netlogon_creds == NULL) {
+                result = NT_STATUS_UNSUCCESSFUL;
+                goto done;
+        }
 
         /* Perform the sam logon */
 
-        result = rpccli_netlogon_sam_logon(cli, mem_ctx, logon_param, lp_workgroup(), username, password, workstation, validation_level, logon_type);
-
+        result = rpccli_netlogon_password_logon(rpcclient_netlogon_creds,
+                                                cli->binding_handle,
+                                                mem_ctx,
+                                                logon_param,
+                                                lp_workgroup(),
+                                                username,
+                                                password,
+                                                workstation,
+                                                logon_type,
+                                                &info3);
         if (!NT_STATUS_IS_OK(result))
                 goto done;
@@ -775 +840 @@
         }
 
-        /* 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(),
+                                 true); /* force */
         if (!NT_STATUS_IS_OK(result))
                 goto done;
@@ -1095 +1160 @@
         NTSTATUS result;
         const char *server_name = cli->desthost;
-        uint32_t neg_flags = NETLOGON_NEG_AUTH2_ADS_FLAGS;
         struct netr_Authenticator clnt_creds, srv_cred;
         struct netr_DELTA_ENUM_ARRAY *delta_enum_array = NULL;
-        unsigned char trust_passwd_hash[16];
-        enum netr_SchannelType sec_channel_type = 0;
         struct netr_ChangeLogEntry e;
         uint32_t rid = 500;
         struct dcerpc_binding_handle *b = cli->binding_handle;
+        struct netlogon_creds_CredentialState *creds = NULL;
 
         if (argc > 2) {
@@ -1113 +1176 @@
         }
 
-        if (!secrets_fetch_trust_account_password(lp_workgroup(),
-                                                  trust_passwd_hash,
-                                                  NULL, &sec_channel_type)) {
+        if (rpcclient_netlogon_creds == NULL) {
                 return NT_STATUS_UNSUCCESSFUL;
         }
 
-        status = rpccli_netlogon_setup_creds(cli,
-                                             server_name, /* server name */
-                                             lp_workgroup(), /* domain */
-                                             global_myname(), /* client name */
-                                             global_myname(), /* machine account name */
-                                             trust_passwd_hash,
-                                             sec_channel_type,
-                                             &neg_flags);
-
+        status = netlogon_creds_cli_lock(rpcclient_netlogon_creds,
+                                         mem_ctx, &creds);
         if (!NT_STATUS_IS_OK(status)) {
                 return status;
         }
 
-        netlogon_creds_client_authenticator(cli->dc, &clnt_creds);
+        netlogon_creds_client_authenticator(creds, &clnt_creds);
 
         ZERO_STRUCT(e);
@@ -1142 +1196 @@
         status = dcerpc_netr_DatabaseRedo(b, mem_ctx,
                                           server_name,
-                                          global_myname(),
+                                          lp_netbios_name(),
                                           &clnt_creds,
                                           &srv_cred,
@@ -1150 +1204 @@
                                           &result);
         if (!NT_STATUS_IS_OK(status)) {
+                TALLOC_FREE(creds);
                 return status;
         }
 
-        if (!netlogon_creds_client_check(cli->dc, &srv_cred.cred)) {
+        if (!netlogon_creds_client_check(creds, &srv_cred.cred)) {
                 DEBUG(0,("credentials chain check failed\n"));
+                TALLOC_FREE(creds);
                 return NT_STATUS_ACCESS_DENIED;
         }
+        TALLOC_FREE(creds);
 
         return result;
@@ -1172 +1229 @@
         uint32_t level = 1;
         struct dcerpc_binding_handle *b = cli->binding_handle;
+        struct netlogon_creds_CredentialState *creds = NULL;
 
         if (argc > 2) {
@@ -1184 +1242 @@
         ZERO_STRUCT(return_authenticator);
 
-        netlogon_creds_client_authenticator(cli->dc, &credential);
+        if (rpcclient_netlogon_creds == NULL) {
+                return NT_STATUS_UNSUCCESSFUL;
+        }
+
+        status = netlogon_creds_cli_lock(rpcclient_netlogon_creds,
+                                         mem_ctx, &creds);
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
+        }
+
+        netlogon_creds_client_authenticator(creds, &credential);
 
         status = dcerpc_netr_LogonGetCapabilities(b, mem_ctx,
                                                   cli->desthost,
-                                                  global_myname(),
+                                                  lp_netbios_name(),
                                                   &credential,
                                                   &return_authenticator,
@@ -1195 +1263 @@
                                                   &result);
         if (!NT_STATUS_IS_OK(status)) {
+                TALLOC_FREE(creds);
                 return status;
         }
 
-        if (!netlogon_creds_client_check(cli->dc,
+        if (!netlogon_creds_client_check(creds,
                                          &return_authenticator.cred)) {
                 DEBUG(0,("credentials chain check failed\n"));
+                TALLOC_FREE(creds);
                 return NT_STATUS_ACCESS_DENIED;
         }
+        TALLOC_FREE(creds);
 
         printf("capabilities: 0x%08x\n", capabilities.server_capabilities);
@@ -1215 +1286 @@
         { "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_NTSTATUS, cmd_netlogon_enumtrusteddomains, NULL, &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",     "" },
-        { "database_redo", RPC_RTYPE_NTSTATUS, cmd_netlogon_database_redo, NULL, &ndr_table_netlogon.syntax_id, NULL, "Replicate single object from a DC",     "" },
-        { "capabilities", RPC_RTYPE_NTSTATUS, cmd_netlogon_capabilities, NULL, &ndr_table_netlogon.syntax_id, NULL, "Return Capabilities",     "" },
+        { "logonctrl2", RPC_RTYPE_WERROR, NULL, cmd_netlogon_logon_ctrl2, &ndr_table_netlogon, NULL, "Logon Control 2",     "" },
+        { "getanydcname", RPC_RTYPE_WERROR, NULL, cmd_netlogon_getanydcname, &ndr_table_netlogon, NULL, "Get trusted DC name",     "" },
+        { "getdcname", RPC_RTYPE_WERROR, NULL, cmd_netlogon_getdcname, &ndr_table_netlogon, NULL, "Get trusted PDC name",     "" },
+        { "dsr_getdcname", RPC_RTYPE_WERROR, NULL, cmd_netlogon_dsr_getdcname, &ndr_table_netlogon, NULL, "Get trusted DC name",     "" },
+        { "dsr_getdcnameex", RPC_RTYPE_WERROR, NULL, cmd_netlogon_dsr_getdcnameex, &ndr_table_netlogon, NULL, "Get trusted DC name",     "" },
+        { "dsr_getdcnameex2", RPC_RTYPE_WERROR, NULL, cmd_netlogon_dsr_getdcnameex2, &ndr_table_netlogon, NULL, "Get trusted DC name",     "" },
+        { "dsr_getsitename", RPC_RTYPE_WERROR, NULL, cmd_netlogon_dsr_getsitename, &ndr_table_netlogon, NULL, "Get sitename",     "" },
+        { "dsr_getforesttrustinfo", RPC_RTYPE_WERROR, NULL, cmd_netlogon_dsr_getforesttrustinfo, &ndr_table_netlogon, NULL, "Get Forest Trust Info",     "" },
+        { "logonctrl",  RPC_RTYPE_WERROR, NULL, cmd_netlogon_logon_ctrl, &ndr_table_netlogon, NULL, "Logon Control",       "" },
+        { "samsync",    RPC_RTYPE_NTSTATUS, cmd_netlogon_sam_sync,    NULL, &ndr_table_netlogon, NULL, "Sam Synchronisation", "", .use_netlogon_creds = true, },
+        { "samdeltas",  RPC_RTYPE_NTSTATUS, cmd_netlogon_sam_deltas,  NULL, &ndr_table_netlogon, NULL, "Query Sam Deltas",    "", .use_netlogon_creds = true, },
+        { "samlogon",   RPC_RTYPE_NTSTATUS, cmd_netlogon_sam_logon,   NULL, &ndr_table_netlogon, NULL, "Sam Logon",           "", .use_netlogon_creds = true, },
+        { "change_trust_pw",   RPC_RTYPE_NTSTATUS, cmd_netlogon_change_trust_pw,   NULL, &ndr_table_netlogon, NULL, "Change Trust Account Password",           "", .use_netlogon_creds = true, },
+        { "gettrustrid", RPC_RTYPE_WERROR, NULL, cmd_netlogon_gettrustrid, &ndr_table_netlogon, NULL, "Get trust rid",     "" },
+        { "dsr_enumtrustdom", RPC_RTYPE_WERROR, NULL, cmd_netlogon_dsr_enumtrustdom, &ndr_table_netlogon, NULL, "Enumerate trusted domains",     "" },
+        { "dsenumdomtrusts",  RPC_RTYPE_WERROR, NULL, cmd_netlogon_dsr_enumtrustdom, &ndr_table_netlogon, NULL, "Enumerate all trusted domains in an AD forest",     "" },
+        { "deregisterdnsrecords", RPC_RTYPE_WERROR, NULL, cmd_netlogon_deregisterdnsrecords, &ndr_table_netlogon, NULL, "Deregister DNS records",     "" },
+        { "netrenumtrusteddomains", RPC_RTYPE_NTSTATUS, cmd_netlogon_enumtrusteddomains, NULL, &ndr_table_netlogon, NULL, "Enumerate trusted domains",     "" },
+        { "netrenumtrusteddomainsex", RPC_RTYPE_WERROR, NULL, cmd_netlogon_enumtrusteddomainsex, &ndr_table_netlogon, NULL, "Enumerate trusted domains",     "" },
+        { "getdcsitecoverage", RPC_RTYPE_WERROR, NULL, cmd_netlogon_getdcsitecoverage, &ndr_table_netlogon, NULL, "Get the Site-Coverage from a DC",     "" },
+        { "database_redo", RPC_RTYPE_NTSTATUS, cmd_netlogon_database_redo, NULL, &ndr_table_netlogon, NULL, "Replicate single object from a DC",     "", .use_netlogon_creds = true, },
+        { "capabilities", RPC_RTYPE_NTSTATUS, cmd_netlogon_capabilities, NULL, &ndr_table_netlogon, NULL, "Return Capabilities",     "", .use_netlogon_creds = true, },
 
         { NULL }

vendor/current/source3/rpcclient/cmd_ntsvcs.c

@@ -284 +284 @@
 
         { "NTSVCS" },
-        { "ntsvcs_getversion", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_get_version, &ndr_table_ntsvcs.syntax_id, NULL, "Query NTSVCS version", "" },
-        { "ntsvcs_validatedevinst", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_validate_dev_inst, &ndr_table_ntsvcs.syntax_id, NULL, "Query NTSVCS device instance", "" },
-        { "ntsvcs_hwprofflags", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_hw_prof_flags, &ndr_table_ntsvcs.syntax_id, NULL, "Query NTSVCS HW prof flags", "" },
-        { "ntsvcs_hwprofinfo", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_get_hw_prof_info, &ndr_table_ntsvcs.syntax_id, NULL, "Query NTSVCS HW prof info", "" },
-        { "ntsvcs_getdevregprop", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_get_dev_reg_prop, &ndr_table_ntsvcs.syntax_id, NULL, "Query NTSVCS device registry property", "" },
-        { "ntsvcs_getdevlistsize", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_get_dev_list_size, &ndr_table_ntsvcs.syntax_id, NULL, "Query NTSVCS device list size", "" },
-        { "ntsvcs_getdevlist", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_get_dev_list, &ndr_table_ntsvcs.syntax_id, NULL, "Query NTSVCS device list", "" },
+        { "ntsvcs_getversion", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_get_version, &ndr_table_ntsvcs, NULL, "Query NTSVCS version", "" },
+        { "ntsvcs_validatedevinst", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_validate_dev_inst, &ndr_table_ntsvcs, NULL, "Query NTSVCS device instance", "" },
+        { "ntsvcs_hwprofflags", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_hw_prof_flags, &ndr_table_ntsvcs, NULL, "Query NTSVCS HW prof flags", "" },
+        { "ntsvcs_hwprofinfo", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_get_hw_prof_info, &ndr_table_ntsvcs, NULL, "Query NTSVCS HW prof info", "" },
+        { "ntsvcs_getdevregprop", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_get_dev_reg_prop, &ndr_table_ntsvcs, NULL, "Query NTSVCS device registry property", "" },
+        { "ntsvcs_getdevlistsize", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_get_dev_list_size, &ndr_table_ntsvcs, NULL, "Query NTSVCS device list size", "" },
+        { "ntsvcs_getdevlist", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_get_dev_list, &ndr_table_ntsvcs, NULL, "Query NTSVCS device list", "" },
         { NULL }
 };

vendor/current/source3/rpcclient/cmd_samr.c

@@ -285 +285 @@
         NTSTATUS status = NT_STATUS_INVALID_PARAMETER, result;
 
-        if (StrCaseCmp(sam, "domain") == 0) {
+        if (strcasecmp_m(sam, "domain") == 0) {
                 status = dcerpc_samr_OpenDomain(b, mem_ctx,
                                               connect_pol,
@@ -292 +292 @@
                                               domain_pol,
                                               &result);
-        } else if (StrCaseCmp(sam, "builtin") == 0) {
+        } else if (strcasecmp_m(sam, "builtin") == 0) {
                 status = dcerpc_samr_OpenDomain(b, mem_ctx,
                                               connect_pol,
                                               access_mask,
-                                              CONST_DISCARD(struct dom_sid2 *, &global_sid_Builtin),
+                                              discard_const_p(struct dom_sid2, &global_sid_Builtin),
                                               domain_pol,
                                               &result);
@@ -317 +317 @@
         struct policy_handle connect_pol, domain_pol, user_pol;
         NTSTATUS status, result;
-        uint32 info_level = 21;
-        uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+        uint32_t info_level = 21;
+        uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
         union samr_UserInfo *info = NULL;
-        uint32 user_rid = 0;
+        uint32_t user_rid = 0;
         struct dcerpc_binding_handle *b = cli->binding_handle;
 
@@ -540 +540 @@
         NTSTATUS status, result;
         enum samr_GroupInfoEnum info_level = GROUPINFOALL;
-        uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+        uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
         union samr_GroupInfo *group_info = NULL;
-        uint32 group_rid;
+        uint32_t group_rid;
         struct dcerpc_binding_handle *b = cli->binding_handle;
 
@@ -625 +625 @@
                                 user_pol;
         NTSTATUS status, result;
-        uint32                  user_rid;
-        uint32                  access_mask = MAXIMUM_ALLOWED_ACCESS;
+        uint32_t                user_rid;
+        uint32_t                access_mask = MAXIMUM_ALLOWED_ACCESS;
         int                     i;
         struct samr_RidWithAttributeArray *rid_array = NULL;
@@ -711 +711 @@
         NTSTATUS status, result;
         struct dom_sid                *sids;
-        uint32_t                     num_sids;
-        uint32                  access_mask = MAXIMUM_ALLOWED_ACCESS;
+        uint32_t                num_sids;
+        uint32_t                access_mask = MAXIMUM_ALLOWED_ACCESS;
         int                     i;
         struct lsa_SidArray sid_array;
@@ -739 +739 @@
 
         if (num_sids) {
-                sid_array.sids = TALLOC_ZERO_ARRAY(mem_ctx, struct lsa_SidPtr, num_sids);
+                sid_array.sids = talloc_zero_array(mem_ctx, struct lsa_SidPtr, num_sids);
                 if (sid_array.sids == NULL)
                         return NT_STATUS_NO_MEMORY;
@@ -802 +802 @@
         struct policy_handle connect_pol, domain_pol, group_pol;
         NTSTATUS status, result;
-        uint32 group_rid;
-        uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+        uint32_t group_rid;
+        uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
         int i;
         unsigned int old_timeout;
@@ -891 +891 @@
                                         int argc, const char **argv)
 {
-        struct policy_handle connect_pol, domain_pol;
+        struct policy_handle connect_pol;
+        struct policy_handle domain_pol = { 0, };
         NTSTATUS status, result;
-        uint32 start_idx, num_dom_users, i;
+        uint32_t start_idx, num_dom_users, i;
         struct samr_SamArray *dom_users = NULL;
-        uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
-        uint32 acb_mask = ACB_NORMAL;
+        uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
+        uint32_t acb_mask = ACB_NORMAL;
         uint32_t size = 0xffff;
         struct dcerpc_binding_handle *b = cli->binding_handle;
@@ -980 +981 @@
                                          int argc, const char **argv)
 {
-        struct policy_handle connect_pol, domain_pol;
+        struct policy_handle connect_pol;
+        struct policy_handle domain_pol = { 0, };
         NTSTATUS status, result;
-        uint32 start_idx, num_dom_groups, i;
-        uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+        uint32_t start_idx, num_dom_groups, i;
+        uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
         struct samr_SamArray *dom_groups = NULL;
         uint32_t size = 0xffff;
@@ -1063 +1065 @@
                                          int argc, const char **argv)
 {
-        struct policy_handle connect_pol, domain_pol;
+        struct policy_handle connect_pol;
+        struct policy_handle domain_pol = { 0, };
         NTSTATUS status, result;
-        uint32 start_idx, num_als_groups, i;
-        uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+        uint32_t start_idx, num_als_groups, i;
+        uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
         struct samr_SamArray *als_groups = NULL;
         uint32_t size = 0xffff;
@@ -1147 +1150 @@
         struct policy_handle connect_pol;
         NTSTATUS status, result;
-        uint32 start_idx, size, num_entries, i;
-        uint32 access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+        uint32_t start_idx, size, num_entries, i;
+        uint32_t access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
         struct samr_SamArray *sam = NULL;
         struct dcerpc_binding_handle *b = cli->binding_handle;
@@ -1213 +1216 @@
         struct policy_handle connect_pol, domain_pol, alias_pol;
         NTSTATUS status, result;
-        uint32 alias_rid, i;
-        uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+        uint32_t alias_rid, i;
+        uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
         struct lsa_SidArray sid_array;
         struct dcerpc_binding_handle *b = cli->binding_handle;
@@ -1401 +1404 @@
         struct policy_handle connect_pol, domain_pol, alias_pol;
         NTSTATUS status, result;
-        uint32 alias_rid;
-        uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+        uint32_t alias_rid;
+        uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
         struct dcerpc_binding_handle *b = cli->binding_handle;
 
@@ -1508 +1511 @@
         struct policy_handle connect_pol, domain_pol;
         NTSTATUS status, result;
-        uint32 start_idx=0, max_entries=250, max_size = 0xffff, num_entries = 0, i;
-        uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
-        uint32 info_level = 1;
+        uint32_t start_idx=0, max_entries=250, max_size = 0xffff, num_entries = 0, i;
+        uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
+        uint32_t info_level = 1;
         union samr_DispInfo info;
         int loop_count = 0;
@@ -1713 +1716 @@
         struct policy_handle connect_pol, domain_pol;
         NTSTATUS status, result;
-        uint32 switch_level = 2;
-        uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+        uint32_t switch_level = 2;
+        uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
         union samr_DomainInfo *info = NULL;
         struct dcerpc_binding_handle *b = cli->binding_handle;
@@ -1828 +1831 @@
         NTSTATUS status, result;
         struct lsa_String acct_name;
-        uint32 acb_info;
-        uint32 acct_flags, user_rid;
-        uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+        uint32_t acb_info;
+        uint32_t acct_flags, user_rid;
+        uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
         uint32_t access_granted = 0;
         struct dcerpc_binding_handle *b = cli->binding_handle;
@@ -1917 +1920 @@
         NTSTATUS status, result;
         struct lsa_String grp_name;
-        uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+        uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
         uint32_t rid = 0;
         struct dcerpc_binding_handle *b = cli->binding_handle;
@@ -1994 +1997 @@
         NTSTATUS status, result;
         struct lsa_String alias_name;
-        uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+        uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
         uint32_t rid = 0;
         struct dcerpc_binding_handle *b = cli->binding_handle;
@@ -2072 +2075 @@
         NTSTATUS status, result;
         struct policy_handle connect_pol, domain_pol;
-        uint32 num_names;
+        uint32_t num_names;
         struct samr_Ids rids, name_types;
         int i;
@@ -2107 +2110 @@
         num_names = argc - 2;
 
-        if ((names = TALLOC_ARRAY(mem_ctx, struct lsa_String, num_names)) == NULL) {
+        if ((names = talloc_array(mem_ctx, struct lsa_String, num_names)) == NULL) {
                 dcerpc_samr_Close(b, mem_ctx, &domain_pol, &result);
                 dcerpc_samr_Close(b, mem_ctx, &connect_pol, &result);
@@ -2195 +2198 @@
         num_rids = argc - 2;
 
-        if ((rids = TALLOC_ARRAY(mem_ctx, uint32, num_rids)) == NULL) {
+        if ((rids = talloc_array(mem_ctx, uint32_t, num_rids)) == NULL) {
                 dcerpc_samr_Close(b, mem_ctx, &domain_pol, &result);
                 dcerpc_samr_Close(b, mem_ctx, &connect_pol, &result);
@@ -2249 +2252 @@
         NTSTATUS status, result;
         struct policy_handle connect_pol, domain_pol, group_pol;
-        uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+        uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
         struct dcerpc_binding_handle *b = cli->binding_handle;
 
@@ -2360 +2363 @@
         NTSTATUS status, result;
         struct policy_handle connect_pol, domain_pol, user_pol;
-        uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+        uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
         struct dcerpc_binding_handle *b = cli->binding_handle;
 
@@ -2472 +2475 @@
         struct policy_handle connect_pol, domain_pol, user_pol, *pol;
         NTSTATUS status, result;
-        uint32 sec_info = SECINFO_DACL;
-        uint32 user_rid = 0;
+        uint32_t sec_info = SECINFO_DACL;
+        uint32_t user_rid = 0;
         TALLOC_CTX *ctx = NULL;
         struct sec_desc_buf *sec_desc_buf=NULL;
@@ -2687 +2690 @@
         struct policy_handle connect_pol, domain_pol;
         NTSTATUS status, result;
-        uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+        uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
         fstring sid_string;
         struct lsa_String domain_name;
@@ -2752 +2755 @@
                                    int argc, const char **argv)
 {
-        struct policy_handle connect_pol, domain_pol, user_pol;
+        struct policy_handle connect_pol;
+        struct policy_handle domain_pol = { 0, };
+        struct policy_handle user_pol = { 0, };
         NTSTATUS status, result;
         const char *user, *oldpass, *newpass;
-        uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+        uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
         struct samr_Ids rids, types;
         struct lsa_String lsa_acct_name;
@@ -2866 +2871 @@
         NTSTATUS status, result;
         const char *user, *oldpass, *newpass;
-        uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+        uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
         struct dcerpc_binding_handle *b = cli->binding_handle;
 
@@ -2930 +2935 @@
         NTSTATUS status, result;
         const char *user, *oldpass, *newpass;
-        uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+        uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
         struct samr_DomInfo1 *info = NULL;
         struct userPwdChangeFailureInformation *reject = NULL;
@@ -3295 +3300 @@
         NTSTATUS status, result;
         struct policy_handle connect_handle;
-        struct policy_handle domain_handle;
+        struct policy_handle domain_handle = { 0, };
         uint16_t level = 1;
         struct lsa_String name;
@@ -3367 +3372 @@
         { "SAMR" },
 
-        { "queryuser",  RPC_RTYPE_NTSTATUS, cmd_samr_query_user,                NULL, &ndr_table_samr.syntax_id, NULL,  "Query user info",         "" },
-        { "querygroup",         RPC_RTYPE_NTSTATUS, cmd_samr_query_group,               NULL, &ndr_table_samr.syntax_id, NULL,  "Query group info",        "" },
-        { "queryusergroups",    RPC_RTYPE_NTSTATUS, cmd_samr_query_usergroups,  NULL, &ndr_table_samr.syntax_id, NULL,  "Query user groups",       "" },
-        { "queryuseraliases",   RPC_RTYPE_NTSTATUS, cmd_samr_query_useraliases,         NULL, &ndr_table_samr.syntax_id, NULL,  "Query user aliases",      "" },
-        { "querygroupmem",      RPC_RTYPE_NTSTATUS, cmd_samr_query_groupmem,    NULL, &ndr_table_samr.syntax_id, NULL,  "Query group membership",  "" },
-        { "queryaliasmem",      RPC_RTYPE_NTSTATUS, cmd_samr_query_aliasmem,    NULL, &ndr_table_samr.syntax_id, NULL,  "Query alias membership",  "" },
-        { "queryaliasinfo",     RPC_RTYPE_NTSTATUS, cmd_samr_query_aliasinfo,   NULL, &ndr_table_samr.syntax_id, NULL,  "Query alias info",       "" },
-        { "deletealias",        RPC_RTYPE_NTSTATUS, cmd_samr_delete_alias,      NULL, &ndr_table_samr.syntax_id, NULL,  "Delete an alias",  "" },
-        { "querydispinfo",      RPC_RTYPE_NTSTATUS, cmd_samr_query_dispinfo,    NULL, &ndr_table_samr.syntax_id, NULL,  "Query display info",      "" },
-        { "querydispinfo2",     RPC_RTYPE_NTSTATUS, cmd_samr_query_dispinfo2,   NULL, &ndr_table_samr.syntax_id, NULL,  "Query display info",      "" },
-        { "querydispinfo3",     RPC_RTYPE_NTSTATUS, cmd_samr_query_dispinfo3,   NULL, &ndr_table_samr.syntax_id, NULL,  "Query display info",      "" },
-        { "querydominfo",       RPC_RTYPE_NTSTATUS, cmd_samr_query_dominfo,     NULL, &ndr_table_samr.syntax_id, NULL,  "Query domain info",       "" },
-        { "enumdomusers",       RPC_RTYPE_NTSTATUS, cmd_samr_enum_dom_users,       NULL, &ndr_table_samr.syntax_id, NULL,       "Enumerate domain users", "" },
-        { "enumdomgroups",      RPC_RTYPE_NTSTATUS, cmd_samr_enum_dom_groups,       NULL, &ndr_table_samr.syntax_id, NULL,      "Enumerate domain groups", "" },
-        { "enumalsgroups",      RPC_RTYPE_NTSTATUS, cmd_samr_enum_als_groups,       NULL, &ndr_table_samr.syntax_id, NULL,      "Enumerate alias groups",  "" },
-        { "enumdomains",        RPC_RTYPE_NTSTATUS, cmd_samr_enum_domains,          NULL, &ndr_table_samr.syntax_id, NULL,      "Enumerate domains",  "" },
-
-        { "createdomuser",      RPC_RTYPE_NTSTATUS, cmd_samr_create_dom_user,       NULL, &ndr_table_samr.syntax_id, NULL,      "Create domain user",      "" },
-        { "createdomgroup",     RPC_RTYPE_NTSTATUS, cmd_samr_create_dom_group,      NULL, &ndr_table_samr.syntax_id, NULL,      "Create domain group",     "" },
-        { "createdomalias",     RPC_RTYPE_NTSTATUS, cmd_samr_create_dom_alias,      NULL, &ndr_table_samr.syntax_id, NULL,      "Create domain alias",     "" },
-        { "samlookupnames",     RPC_RTYPE_NTSTATUS, cmd_samr_lookup_names,          NULL, &ndr_table_samr.syntax_id, NULL,      "Look up names",           "" },
-        { "samlookuprids",      RPC_RTYPE_NTSTATUS, cmd_samr_lookup_rids,           NULL, &ndr_table_samr.syntax_id, NULL,      "Look up names",           "" },
-        { "deletedomgroup",     RPC_RTYPE_NTSTATUS, cmd_samr_delete_dom_group,      NULL, &ndr_table_samr.syntax_id, NULL,      "Delete domain group",     "" },
-        { "deletedomuser",      RPC_RTYPE_NTSTATUS, cmd_samr_delete_dom_user,       NULL, &ndr_table_samr.syntax_id, NULL,      "Delete domain user",      "" },
-        { "samquerysecobj",     RPC_RTYPE_NTSTATUS, cmd_samr_query_sec_obj,         NULL, &ndr_table_samr.syntax_id, NULL, "Query SAMR security object",   "" },
-        { "getdompwinfo",       RPC_RTYPE_NTSTATUS, cmd_samr_get_dom_pwinfo,        NULL, &ndr_table_samr.syntax_id, NULL, "Retrieve domain password info", "" },
-        { "getusrdompwinfo",    RPC_RTYPE_NTSTATUS, cmd_samr_get_usrdom_pwinfo,     NULL, &ndr_table_samr.syntax_id, NULL, "Retrieve user domain password info", "" },
-
-        { "lookupdomain",       RPC_RTYPE_NTSTATUS, cmd_samr_lookup_domain,         NULL, &ndr_table_samr.syntax_id, NULL, "Lookup Domain Name", "" },
-        { "chgpasswd",          RPC_RTYPE_NTSTATUS, cmd_samr_chgpasswd,             NULL, &ndr_table_samr.syntax_id, NULL, "Change user password", "" },
-        { "chgpasswd2",         RPC_RTYPE_NTSTATUS, cmd_samr_chgpasswd2,            NULL, &ndr_table_samr.syntax_id, NULL, "Change user password", "" },
-        { "chgpasswd3",         RPC_RTYPE_NTSTATUS, cmd_samr_chgpasswd3,            NULL, &ndr_table_samr.syntax_id, NULL, "Change user password", "" },
-        { "getdispinfoidx",     RPC_RTYPE_NTSTATUS, cmd_samr_get_dispinfo_idx,      NULL, &ndr_table_samr.syntax_id, NULL, "Get Display Information Index", "" },
-        { "setuserinfo",        RPC_RTYPE_NTSTATUS, cmd_samr_setuserinfo,           NULL, &ndr_table_samr.syntax_id, NULL, "Set user info", "" },
-        { "setuserinfo2",       RPC_RTYPE_NTSTATUS, cmd_samr_setuserinfo2,          NULL, &ndr_table_samr.syntax_id, NULL, "Set user info2", "" },
+        { "queryuser",  RPC_RTYPE_NTSTATUS, cmd_samr_query_user,                NULL, &ndr_table_samr, NULL,    "Query user info",         "" },
+        { "querygroup",         RPC_RTYPE_NTSTATUS, cmd_samr_query_group,               NULL, &ndr_table_samr, NULL,    "Query group info",        "" },
+        { "queryusergroups",    RPC_RTYPE_NTSTATUS, cmd_samr_query_usergroups,  NULL, &ndr_table_samr, NULL,    "Query user groups",       "" },
+        { "queryuseraliases",   RPC_RTYPE_NTSTATUS, cmd_samr_query_useraliases,         NULL, &ndr_table_samr, NULL,    "Query user aliases",      "" },
+        { "querygroupmem",      RPC_RTYPE_NTSTATUS, cmd_samr_query_groupmem,    NULL, &ndr_table_samr, NULL,    "Query group membership",  "" },
+        { "queryaliasmem",      RPC_RTYPE_NTSTATUS, cmd_samr_query_aliasmem,    NULL, &ndr_table_samr, NULL,    "Query alias membership",  "" },
+        { "queryaliasinfo",     RPC_RTYPE_NTSTATUS, cmd_samr_query_aliasinfo,   NULL, &ndr_table_samr, NULL,    "Query alias info",       "" },
+        { "deletealias",        RPC_RTYPE_NTSTATUS, cmd_samr_delete_alias,      NULL, &ndr_table_samr, NULL,    "Delete an alias",  "" },
+        { "querydispinfo",      RPC_RTYPE_NTSTATUS, cmd_samr_query_dispinfo,    NULL, &ndr_table_samr, NULL,    "Query display info",      "" },
+        { "querydispinfo2",     RPC_RTYPE_NTSTATUS, cmd_samr_query_dispinfo2,   NULL, &ndr_table_samr, NULL,    "Query display info",      "" },
+        { "querydispinfo3",     RPC_RTYPE_NTSTATUS, cmd_samr_query_dispinfo3,   NULL, &ndr_table_samr, NULL,    "Query display info",      "" },
+        { "querydominfo",       RPC_RTYPE_NTSTATUS, cmd_samr_query_dominfo,     NULL, &ndr_table_samr, NULL,    "Query domain info",       "" },
+        { "enumdomusers",       RPC_RTYPE_NTSTATUS, cmd_samr_enum_dom_users,       NULL, &ndr_table_samr, NULL, "Enumerate domain users", "" },
+        { "enumdomgroups",      RPC_RTYPE_NTSTATUS, cmd_samr_enum_dom_groups,       NULL, &ndr_table_samr, NULL,        "Enumerate domain groups", "" },
+        { "enumalsgroups",      RPC_RTYPE_NTSTATUS, cmd_samr_enum_als_groups,       NULL, &ndr_table_samr, NULL,        "Enumerate alias groups",  "" },
+        { "enumdomains",        RPC_RTYPE_NTSTATUS, cmd_samr_enum_domains,          NULL, &ndr_table_samr, NULL,        "Enumerate domains",  "" },
+
+        { "createdomuser",      RPC_RTYPE_NTSTATUS, cmd_samr_create_dom_user,       NULL, &ndr_table_samr, NULL,        "Create domain user",      "" },
+        { "createdomgroup",     RPC_RTYPE_NTSTATUS, cmd_samr_create_dom_group,      NULL, &ndr_table_samr, NULL,        "Create domain group",     "" },
+        { "createdomalias",     RPC_RTYPE_NTSTATUS, cmd_samr_create_dom_alias,      NULL, &ndr_table_samr, NULL,        "Create domain alias",     "" },
+        { "samlookupnames",     RPC_RTYPE_NTSTATUS, cmd_samr_lookup_names,          NULL, &ndr_table_samr, NULL,        "Look up names",           "" },
+        { "samlookuprids",      RPC_RTYPE_NTSTATUS, cmd_samr_lookup_rids,           NULL, &ndr_table_samr, NULL,        "Look up names",           "" },
+        { "deletedomgroup",     RPC_RTYPE_NTSTATUS, cmd_samr_delete_dom_group,      NULL, &ndr_table_samr, NULL,        "Delete domain group",     "" },
+        { "deletedomuser",      RPC_RTYPE_NTSTATUS, cmd_samr_delete_dom_user,       NULL, &ndr_table_samr, NULL,        "Delete domain user",      "" },
+        { "samquerysecobj",     RPC_RTYPE_NTSTATUS, cmd_samr_query_sec_obj,         NULL, &ndr_table_samr, NULL, "Query SAMR security object",   "" },
+        { "getdompwinfo",       RPC_RTYPE_NTSTATUS, cmd_samr_get_dom_pwinfo,        NULL, &ndr_table_samr, NULL, "Retrieve domain password info", "" },
+        { "getusrdompwinfo",    RPC_RTYPE_NTSTATUS, cmd_samr_get_usrdom_pwinfo,     NULL, &ndr_table_samr, NULL, "Retrieve user domain password info", "" },
+
+        { "lookupdomain",       RPC_RTYPE_NTSTATUS, cmd_samr_lookup_domain,         NULL, &ndr_table_samr, NULL, "Lookup Domain Name", "" },
+        { "chgpasswd",          RPC_RTYPE_NTSTATUS, cmd_samr_chgpasswd,             NULL, &ndr_table_samr, NULL, "Change user password", "" },
+        { "chgpasswd2",         RPC_RTYPE_NTSTATUS, cmd_samr_chgpasswd2,            NULL, &ndr_table_samr, NULL, "Change user password", "" },
+        { "chgpasswd3",         RPC_RTYPE_NTSTATUS, cmd_samr_chgpasswd3,            NULL, &ndr_table_samr, NULL, "Change user password", "" },
+        { "getdispinfoidx",     RPC_RTYPE_NTSTATUS, cmd_samr_get_dispinfo_idx,      NULL, &ndr_table_samr, NULL, "Get Display Information Index", "" },
+        { "setuserinfo",        RPC_RTYPE_NTSTATUS, cmd_samr_setuserinfo,           NULL, &ndr_table_samr, NULL, "Set user info", "" },
+        { "setuserinfo2",       RPC_RTYPE_NTSTATUS, cmd_samr_setuserinfo2,          NULL, &ndr_table_samr, NULL, "Set user info2", "" },
         { NULL }
 };

vendor/current/source3/rpcclient/cmd_shutdown.c

@@ -35 +35 @@
         NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
         fstring msg;
-        uint32 timeout = 20;
+        uint32_t timeout = 20;
         bool force = False;
         bool reboot = False;

vendor/current/source3/rpcclient/cmd_spoolss.c

@@ -26 +26 @@
 #include "rpcclient.h"
 #include "../librpc/gen_ndr/ndr_spoolss_c.h"
+#include "../librpc/gen_ndr/ndr_spoolss.h"
 #include "rpc_client/cli_spoolss.h"
 #include "rpc_client/init_spoolss.h"
-#include "registry/reg_objects.h"
 #include "nt_printing.h"
 #include "../libcli/security/display_sec.h"
@@ -84 +84 @@
                 i++;
         } while ( (archi_table[i].long_archi!=NULL ) &&
-                  StrCaseCmp(long_archi, archi_table[i].long_archi) );
+                  strcasecmp_m(long_archi, archi_table[i].long_archi) );
 
         if (archi_table[i].long_archi==NULL) {
@@ -765 +765 @@
 ****************************************************************************/
 
-static void display_reg_value(struct regval_blob *value)
+static void display_reg_value(const char *name, enum winreg_Type type, DATA_BLOB blob)
 {
         const char *text = NULL;
-        DATA_BLOB blob;
-
-        switch(regval_type(value)) {
+
+        switch(type) {
         case REG_DWORD:
-                printf("%s: REG_DWORD: 0x%08x\n", regval_name(value),
-                       *((uint32_t *) regval_data_p(value)));
+                if (blob.length == sizeof(uint32_t)) {
+                        printf("%s: REG_DWORD: 0x%08x\n", name, IVAL(blob.data,0));
+                } else {
+                        printf("%s: REG_DWORD: <invalid>\n", name);
+                }
                 break;
         case REG_SZ:
-                blob = data_blob_const(regval_data_p(value), regval_size(value));
                 pull_reg_sz(talloc_tos(), &blob, &text);
-                printf("%s: REG_SZ: %s\n", regval_name(value), text ? text : "");
+                printf("%s: REG_SZ: %s\n", name, text ? text : "");
                 break;
         case REG_BINARY: {
-                char *hex = hex_encode_talloc(NULL, regval_data_p(value), regval_size(value));
+                char *hex = hex_encode_talloc(NULL, blob.data, blob.length);
                 size_t i, len;
-                printf("%s: REG_BINARY:", regval_name(value));
+                printf("%s: REG_BINARY:", name);
                 len = strlen(hex);
                 for (i=0; i<len; i++) {
@@ -801 +802 @@
                 uint32_t i;
                 const char **values;
-                blob = data_blob_const(regval_data_p(value), regval_size(value));
 
                 if (!pull_reg_multi_sz(NULL, &blob, &values)) {
@@ -808 +808 @@
                 }
 
-                printf("%s: REG_MULTI_SZ: \n", regval_name(value));
+                printf("%s: REG_MULTI_SZ: \n", name);
                 for (i=0; values[i] != NULL; i++) {
                         d_printf("%s\n", values[i]);
@@ -816 +816 @@
         }
         default:
-                printf("%s: unknown type %d\n", regval_name(value), regval_type(value));
+                printf("%s: unknown type %d\n", name, type);
         }
 
@@ -833 +833 @@
         DATA_BLOB blob = data_blob_const(data, length);
         WERROR result;
+        enum ndr_err_code ndr_err;
 
         result = pull_spoolss_PrinterData(talloc_tos(), &blob, &r, type);
@@ -863 +864 @@
                 TALLOC_FREE(hex);
                 putchar('\n');
+                putchar('\n');
+
+                if (strequal(v, "OsVersion")) {
+                        struct spoolss_OSVersion os;
+                        ndr_err = ndr_pull_struct_blob(&blob, talloc_tos(), &os,
+                                (ndr_pull_flags_fn_t)ndr_pull_spoolss_OSVersion);
+                        if (NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+                                // add output here;
+                                printf("OsMajor: %u\n", os.major);
+                                printf("OsMinor: %u\n", os.minor);
+                                printf("OsBuild: %u\n", os.build);
+                                NDR_PRINT_DEBUG(spoolss_OSVersion, &os);
+                        }
+                }
+                if (strequal(v, "OsVersionEx")) {
+                        struct spoolss_OSVersionEx os;
+                        ndr_err = ndr_pull_struct_blob(&blob, talloc_tos(), &os,
+                                (ndr_pull_flags_fn_t)ndr_pull_spoolss_OSVersionEx);
+                        if (NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+                                printf("OsMajor: %u\n", os.major);
+                                printf("OsMinor: %u\n", os.minor);
+                                printf("OsBuild: %u\n", os.build);
+                                printf("ServicePackMajor: %u\n", os.service_pack_major);
+                                printf("ServicePackMinor: %u\n", os.service_pack_minor);
+                                NDR_PRINT_DEBUG(spoolss_OSVersionEx, &os);
+                        }
+                }
                 break;
         }
@@ -1617 +1645 @@
            will not return an empty string.  See man strtok(3)
            for details */
-        if (ptr && (StrCaseCmp(ptr, "NULL") == 0)) {
+        if (ptr && (strcasecmp_m(ptr, "NULL") == 0)) {
                 ptr = NULL;
         }
@@ -1631 +1659 @@
  fill in the members of a spoolss_AddDriverInfo3 struct using a character
  string in the form of
-         <Long Printer Name>:<Driver File Name>:<Data File Name>:\
+         <Long Driver Name>:<Driver File Name>:<Data File Name>:\
              <Config File Name>:<Help File Name>:<Language Monitor Name>:\
              <Default Data Type>:<Comma Separated list of Files>
@@ -1640 +1668 @@
 {
         char    *str, *str2;
-        int count = 0;
+        size_t count = 0;
         char *saveptr = NULL;
         struct spoolss_StringArray *deps;
@@ -1674 +1702 @@
 
         while (str != NULL) {
-                add_string_to_array(deps, str, &file_array, &count);
+                bool ok;
+                ok = add_string_to_array(deps, str, &file_array, &count);
+                if (!ok) {
+                        return false;
+                }
                 str = strtok_r(NULL, ",", &saveptr);
         }
@@ -1712 +1744 @@
         {
                 printf ("Usage: %s <Environment> \\\n", argv[0]);
-                printf ("\t<Long Printer Name>:<Driver File Name>:<Data File Name>:\\\n");
+                printf ("\t<Long Driver Name>:<Driver File Name>:<Data File Name>:\\\n");
                 printf ("\t<Config File Name>:<Help File Name>:<Language Monitor Name>:\\\n");
                 printf ("\t<Default Data Type>:<Comma Separated list of Files> \\\n");
@@ -1794 +1826 @@
         info2.printprocessor    = "winprint";
         info2.datatype          = "RAW";
-        info2.devmode_ptr       = 0;
-        info2.secdesc_ptr       = 0;
+        info2.devmode_ptr       = NULL;
+        info2.secdesc_ptr       = NULL;
         info2.attributes        = PRINTER_ATTRIBUTE_SHARED;
         info2.priority          = 0;
@@ -1929 +1961 @@
 
         /* parse the command arguments */
-        if (argc < 2 || argc > 4) {
-                printf ("Usage: %s <driver> [arch] [version]\n", argv[0]);
+        if (argc < 2 || argc > 5) {
+                printf("Usage: %s <driver> [arch] [version] [flags]\n", argv[0]);
                 return WERR_OK;
         }
@@ -1936 +1968 @@
         if (argc >= 3)
                 arch = argv[2];
-        if (argc == 4)
-                vers = atoi (argv[3]);
-
-        if (vers >= 0) {
+        if (argc >= 4) {
+                vers = atoi(argv[3]);
                 delete_flags |= DPD_DELETE_SPECIFIC_VERSION;
         }
+        if (argc == 5)
+                delete_flags = atoi(argv[4]);
 
         /* delete the driver for all architectures */
         for (i=0; archi_table[i].long_archi; i++) {
 
-                if (arch &&  !strequal( archi_table[i].long_archi, arch))
+                if (arch && !strequal(archi_table[i].long_archi, arch))
                         continue;
 
@@ -2102 +2134 @@
         NTSTATUS status;
         const char *printername;
-        union spoolss_AddFormInfo info;
+        struct spoolss_AddFormInfoCtr info_ctr;
         struct spoolss_AddFormInfo1 info1;
         struct spoolss_AddFormInfo2 info2;
@@ -2143 +2175 @@
                 info1.area.bottom       = 30;
 
-                info.info1 = &info1;
+                info_ctr.level          = 1;
+                info_ctr.info.info1     = &info1;
 
                 break;
@@ -2162 +2195 @@
                 info2.lang_id           = 0;
 
-                info.info2 = &info2;
+                info_ctr.level          = 2;
+                info_ctr.info.info2     = &info2;
 
                 break;
@@ -2172 +2206 @@
         /* Add the form */
 
-
         status = dcerpc_spoolss_AddForm(b, mem_ctx,
                                         &handle,
-                                        level,
-                                        info,
+                                        &info_ctr,
                                         &werror);
         if (!NT_STATUS_IS_OK(status)) {
@@ -2201 +2233 @@
         NTSTATUS status;
         const char *printername;
-        union spoolss_AddFormInfo info;
+        struct spoolss_AddFormInfoCtr info_ctr;
         struct spoolss_AddFormInfo1 info1;
         struct dcerpc_binding_handle *b = cli->binding_handle;
@@ -2234 +2266 @@
         info1.form_name         = argv[2];
 
-        info.info1 = &info1;
+        info_ctr.info.info1 = &info1;
+        info_ctr.level = 1;
 
         /* Set the form */
@@ -2241 +2274 @@
                                         &handle,
                                         argv[2],
-                                        1,
-                                        info,
+                                        &info_ctr,
                                         &werror);
         if (!NT_STATUS_IS_OK(status)) {
@@ -2536 +2568 @@
         NTSTATUS status;
         const char *printername;
-        struct policy_handle pol;
+        struct policy_handle pol = { 0, };
         union spoolss_PrinterInfo info;
         enum winreg_Type type;
@@ -2613 +2645 @@
                 break;
         case REG_MULTI_SZ: {
-                int i, num_strings;
+                int i;
+                size_t num_strings;
                 const char **strings = NULL;
+
+                num_strings = 0;
 
                 for (i=4; i<argc; i++) {
@@ -3044 +3079 @@
                 r.in.enum_index++;
 
-                {
-                        struct regval_blob *v;
-
-                        v = regval_compose(talloc_tos(),
-                                           r.out.value_name,
-                                           *r.out.type,
-                                           r.out.data,
-                                           r.in.data_offered);
-                        if (v == NULL) {
-                                result = WERR_NOMEM;
-                                goto done;
-                        }
-
-                        display_reg_value(v);
-                        talloc_free(v);
-                }
+                display_reg_value(r.out.value_name, *r.out.type,
+                                  data_blob_const(r.out.data, r.in.data_offered));
 
         } while (W_ERROR_IS_OK(r.out.result));
@@ -3210 +3231 @@
         const char *printername;
         const char *clientname;
-        struct policy_handle hnd;
+        struct policy_handle hnd = { 0, };
         WERROR result;
         NTSTATUS status;
@@ -3264 +3285 @@
         option.types[1].fields[0].field = JOB_NOTIFY_FIELD_PRINTER_NAME;
 
-        clientname = talloc_asprintf(mem_ctx, "\\\\%s", global_myname());
+        clientname = talloc_asprintf(mem_ctx, "\\\\%s", lp_netbios_name());
         if (!clientname) {
                 result = WERR_NOMEM;
@@ -3430 +3451 @@
         /* first get the connection to the remote server */
 
-        nt_status = cli_full_connection(&cli_server2, global_myname(), argv[2],
+        nt_status = cli_full_connection(&cli_server2, lp_netbios_name(), argv[2],
                                         NULL, 0,
                                         "IPC$", "IPC",
@@ -3442 +3463 @@
                 return WERR_GENERAL_FAILURE;
 
-        nt_status = cli_rpc_pipe_open_noauth(cli_server2, &ndr_table_spoolss.syntax_id,
+        nt_status = cli_rpc_pipe_open_noauth(cli_server2, &ndr_table_spoolss,
                                              &cli2);
         if (!NT_STATUS_IS_OK(nt_status)) {
@@ -3722 +3743 @@
 }
 
+static WERROR cmd_spoolss_play_gdi_script_on_printer_ic(struct rpc_pipe_client *cli,
+                                                        TALLOC_CTX *mem_ctx, int argc,
+                                                        const char **argv)
+{
+        WERROR result;
+        NTSTATUS status;
+        struct policy_handle handle, gdi_handle;
+        const char *printername;
+        struct spoolss_DevmodeContainer devmode_ctr;
+        struct dcerpc_binding_handle *b = cli->binding_handle;
+        DATA_BLOB in,out;
+        uint32_t count = 0;
+
+        RPCCLIENT_PRINTERNAME(printername, cli, argv[1]);
+
+        result = rpccli_spoolss_openprinter_ex(cli, mem_ctx,
+                                               printername,
+                                               SEC_FLAG_MAXIMUM_ALLOWED,
+                                               &handle);
+        if (!W_ERROR_IS_OK(result)) {
+                return result;
+        }
+
+        ZERO_STRUCT(devmode_ctr);
+
+        status = dcerpc_spoolss_CreatePrinterIC(b, mem_ctx,
+                                                &handle,
+                                                &gdi_handle,
+                                                &devmode_ctr,
+                                                &result);
+        if (!NT_STATUS_IS_OK(status)) {
+                result = ntstatus_to_werror(status);
+                goto done;
+        }
+        if (!W_ERROR_IS_OK(result)) {
+                goto done;
+        }
+
+        in = data_blob_string_const("");
+        out = data_blob_talloc_zero(mem_ctx, 4);
+
+        status = dcerpc_spoolss_PlayGDIScriptOnPrinterIC(b, mem_ctx,
+                                                         &gdi_handle,
+                                                         in.data,
+                                                         in.length,
+                                                         out.data,
+                                                         out.length,
+                                                         0, /* ul */
+                                                         &result);
+        if (!NT_STATUS_IS_OK(status)) {
+                result = ntstatus_to_werror(status);
+                goto done;
+        }
+        if (!W_ERROR_IS_OK(result)) {
+                goto done;
+        }
+
+        count = IVAL(out.data, 0);
+
+        out = data_blob_talloc_zero(mem_ctx,
+                                    count * sizeof(struct UNIVERSAL_FONT_ID) + 4);
+
+        status = dcerpc_spoolss_PlayGDIScriptOnPrinterIC(b, mem_ctx,
+                                                         &gdi_handle,
+                                                         in.data,
+                                                         in.length,
+                                                         out.data,
+                                                         out.length,
+                                                         0, /* ul */
+                                                         &result);
+        if (!NT_STATUS_IS_OK(status)) {
+                result = ntstatus_to_werror(status);
+                goto done;
+        }
+        if (!W_ERROR_IS_OK(result)) {
+                goto done;
+        }
+
+        {
+                enum ndr_err_code ndr_err;
+                struct UNIVERSAL_FONT_ID_ctr r;
+
+                ndr_err = ndr_pull_struct_blob(&out, mem_ctx, &r,
+                        (ndr_pull_flags_fn_t)ndr_pull_UNIVERSAL_FONT_ID_ctr);
+                if (NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+                        NDR_PRINT_DEBUG(UNIVERSAL_FONT_ID_ctr, &r);
+                }
+        }
+
+ done:
+        if (is_valid_policy_hnd(&gdi_handle)) {
+                WERROR _result;
+                dcerpc_spoolss_DeletePrinterIC(b, mem_ctx, &gdi_handle, &_result);
+        }
+        if (is_valid_policy_hnd(&handle)) {
+                WERROR _result;
+                dcerpc_spoolss_ClosePrinter(b, mem_ctx, &handle, &_result);
+        }
+
+        return result;
+}
+
 /* List of commands exported by this module */
 struct cmd_set spoolss_commands[] = {
@@ -3727 +3850 @@
         { "SPOOLSS"  },
 
-        { "adddriver",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_addprinterdriver,   &ndr_table_spoolss.syntax_id, NULL, "Add a print driver",                  "" },
-        { "addprinter",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_addprinterex,       &ndr_table_spoolss.syntax_id, NULL, "Add a printer",                       "" },
-        { "deldriver",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_deletedriver,       &ndr_table_spoolss.syntax_id, NULL, "Delete a printer driver",             "" },
-        { "deldriverex",        RPC_RTYPE_WERROR, NULL, cmd_spoolss_deletedriverex,     &ndr_table_spoolss.syntax_id, NULL, "Delete a printer driver with files",  "" },
-        { "enumdata",           RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_data,          &ndr_table_spoolss.syntax_id, NULL, "Enumerate printer data",              "" },
-        { "enumdataex",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_data_ex,       &ndr_table_spoolss.syntax_id, NULL, "Enumerate printer data for a key",    "" },
-        { "enumkey",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_printerkey,    &ndr_table_spoolss.syntax_id, NULL, "Enumerate printer keys",              "" },
-        { "enumjobs",           RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_jobs,          &ndr_table_spoolss.syntax_id, NULL, "Enumerate print jobs",                "" },
-        { "getjob",             RPC_RTYPE_WERROR, NULL, cmd_spoolss_get_job,            &ndr_table_spoolss.syntax_id, NULL, "Get print job",                       "" },
-        { "setjob",             RPC_RTYPE_WERROR, NULL, cmd_spoolss_set_job,            &ndr_table_spoolss.syntax_id, NULL, "Set print job",                       "" },
-        { "enumports",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_ports,         &ndr_table_spoolss.syntax_id, NULL, "Enumerate printer ports",             "" },
-        { "enumdrivers",        RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_drivers,       &ndr_table_spoolss.syntax_id, NULL, "Enumerate installed printer drivers", "" },
-        { "enumprinters",       RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_printers,      &ndr_table_spoolss.syntax_id, NULL, "Enumerate printers",                  "" },
-        { "getdata",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprinterdata,     &ndr_table_spoolss.syntax_id, NULL, "Get print driver data",               "" },
-        { "getdataex",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprinterdataex,   &ndr_table_spoolss.syntax_id, NULL, "Get printer driver data with keyname", ""},
-        { "getdriver",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_getdriver,          &ndr_table_spoolss.syntax_id, NULL, "Get print driver information",        "" },
-        { "getdriverdir",       RPC_RTYPE_WERROR, NULL, cmd_spoolss_getdriverdir,       &ndr_table_spoolss.syntax_id, NULL, "Get print driver upload directory",   "" },
-        { "getprinter",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprinter,         &ndr_table_spoolss.syntax_id, NULL, "Get printer info",                    "" },
-        { "openprinter",        RPC_RTYPE_WERROR, NULL, cmd_spoolss_open_printer,       &ndr_table_spoolss.syntax_id, NULL, "Open printer handle",                 "" },
-        { "openprinter_ex",     RPC_RTYPE_WERROR, NULL, cmd_spoolss_open_printer_ex,    &ndr_table_spoolss.syntax_id, NULL, "Open printer handle",                 "" },
-        { "setdriver",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_setdriver,          &ndr_table_spoolss.syntax_id, NULL, "Set printer driver",                  "" },
-        { "getprintprocdir",    RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprintprocdir,    &ndr_table_spoolss.syntax_id, NULL, "Get print processor directory",       "" },
-        { "addform",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_addform,            &ndr_table_spoolss.syntax_id, NULL, "Add form",                            "" },
-        { "setform",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_setform,            &ndr_table_spoolss.syntax_id, NULL, "Set form",                            "" },
-        { "getform",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_getform,            &ndr_table_spoolss.syntax_id, NULL, "Get form",                            "" },
-        { "deleteform",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_deleteform,         &ndr_table_spoolss.syntax_id, NULL, "Delete form",                         "" },
-        { "enumforms",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_forms,         &ndr_table_spoolss.syntax_id, NULL, "Enumerate forms",                     "" },
-        { "setprinter",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_setprinter,         &ndr_table_spoolss.syntax_id, NULL, "Set printer comment",                 "" },
-        { "setprintername",     RPC_RTYPE_WERROR, NULL, cmd_spoolss_setprintername,     &ndr_table_spoolss.syntax_id, NULL, "Set printername",                 "" },
-        { "setprinterdata",     RPC_RTYPE_WERROR, NULL, cmd_spoolss_setprinterdata,     &ndr_table_spoolss.syntax_id, NULL, "Set REG_SZ printer data",             "" },
-        { "rffpcnex",           RPC_RTYPE_WERROR, NULL, cmd_spoolss_rffpcnex,           &ndr_table_spoolss.syntax_id, NULL, "Rffpcnex test", "" },
-        { "printercmp",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_printercmp,         &ndr_table_spoolss.syntax_id, NULL, "Printer comparison test", "" },
-        { "enumprocs",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_procs,         &ndr_table_spoolss.syntax_id, NULL, "Enumerate Print Processors",          "" },
-        { "enumprocdatatypes",  RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_proc_data_types, &ndr_table_spoolss.syntax_id, NULL, "Enumerate Print Processor Data Types", "" },
-        { "enummonitors",       RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_monitors,      &ndr_table_spoolss.syntax_id, NULL, "Enumerate Print Monitors", "" },
-        { "createprinteric",    RPC_RTYPE_WERROR, NULL, cmd_spoolss_create_printer_ic,  &ndr_table_spoolss.syntax_id, NULL, "Create Printer IC", "" },
+        { "adddriver",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_addprinterdriver,   &ndr_table_spoolss, NULL, "Add a print driver",                  "" },
+        { "addprinter",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_addprinterex,       &ndr_table_spoolss, NULL, "Add a printer",                       "" },
+        { "deldriver",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_deletedriver,       &ndr_table_spoolss, NULL, "Delete a printer driver",             "" },
+        { "deldriverex",        RPC_RTYPE_WERROR, NULL, cmd_spoolss_deletedriverex,     &ndr_table_spoolss, NULL, "Delete a printer driver with files",  "" },
+        { "enumdata",           RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_data,          &ndr_table_spoolss, NULL, "Enumerate printer data",              "" },
+        { "enumdataex",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_data_ex,       &ndr_table_spoolss, NULL, "Enumerate printer data for a key",    "" },
+        { "enumkey",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_printerkey,    &ndr_table_spoolss, NULL, "Enumerate printer keys",              "" },
+        { "enumjobs",           RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_jobs,          &ndr_table_spoolss, NULL, "Enumerate print jobs",                "" },
+        { "getjob",             RPC_RTYPE_WERROR, NULL, cmd_spoolss_get_job,            &ndr_table_spoolss, NULL, "Get print job",                       "" },
+        { "setjob",             RPC_RTYPE_WERROR, NULL, cmd_spoolss_set_job,            &ndr_table_spoolss, NULL, "Set print job",                       "" },
+        { "enumports",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_ports,         &ndr_table_spoolss, NULL, "Enumerate printer ports",             "" },
+        { "enumdrivers",        RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_drivers,       &ndr_table_spoolss, NULL, "Enumerate installed printer drivers", "" },
+        { "enumprinters",       RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_printers,      &ndr_table_spoolss, NULL, "Enumerate printers",                  "" },
+        { "getdata",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprinterdata,     &ndr_table_spoolss, NULL, "Get print driver data",               "" },
+        { "getdataex",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprinterdataex,   &ndr_table_spoolss, NULL, "Get printer driver data with keyname", ""},
+        { "getdriver",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_getdriver,          &ndr_table_spoolss, NULL, "Get print driver information",        "" },
+        { "getdriverdir",       RPC_RTYPE_WERROR, NULL, cmd_spoolss_getdriverdir,       &ndr_table_spoolss, NULL, "Get print driver upload directory",   "" },
+        { "getprinter",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprinter,         &ndr_table_spoolss, NULL, "Get printer info",                    "" },
+        { "openprinter",        RPC_RTYPE_WERROR, NULL, cmd_spoolss_open_printer,       &ndr_table_spoolss, NULL, "Open printer handle",                 "" },
+        { "openprinter_ex",     RPC_RTYPE_WERROR, NULL, cmd_spoolss_open_printer_ex,    &ndr_table_spoolss, NULL, "Open printer handle",                 "" },
+        { "setdriver",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_setdriver,          &ndr_table_spoolss, NULL, "Set printer driver",                  "" },
+        { "getprintprocdir",    RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprintprocdir,    &ndr_table_spoolss, NULL, "Get print processor directory",       "" },
+        { "addform",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_addform,            &ndr_table_spoolss, NULL, "Add form",                            "" },
+        { "setform",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_setform,            &ndr_table_spoolss, NULL, "Set form",                            "" },
+        { "getform",            RPC_RTYPE_WERROR, NULL, cmd_spoolss_getform,            &ndr_table_spoolss, NULL, "Get form",                            "" },
+        { "deleteform",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_deleteform,         &ndr_table_spoolss, NULL, "Delete form",                         "" },
+        { "enumforms",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_forms,         &ndr_table_spoolss, NULL, "Enumerate forms",                     "" },
+        { "setprinter",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_setprinter,         &ndr_table_spoolss, NULL, "Set printer comment",                 "" },
+        { "setprintername",     RPC_RTYPE_WERROR, NULL, cmd_spoolss_setprintername,     &ndr_table_spoolss, NULL, "Set printername",                 "" },
+        { "setprinterdata",     RPC_RTYPE_WERROR, NULL, cmd_spoolss_setprinterdata,     &ndr_table_spoolss, NULL, "Set REG_SZ printer data",             "" },
+        { "rffpcnex",           RPC_RTYPE_WERROR, NULL, cmd_spoolss_rffpcnex,           &ndr_table_spoolss, NULL, "Rffpcnex test", "" },
+        { "printercmp",         RPC_RTYPE_WERROR, NULL, cmd_spoolss_printercmp,         &ndr_table_spoolss, NULL, "Printer comparison test", "" },
+        { "enumprocs",          RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_procs,         &ndr_table_spoolss, NULL, "Enumerate Print Processors",          "" },
+        { "enumprocdatatypes",  RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_proc_data_types, &ndr_table_spoolss, NULL, "Enumerate Print Processor Data Types", "" },
+        { "enummonitors",       RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_monitors,      &ndr_table_spoolss, NULL, "Enumerate Print Monitors", "" },
+        { "createprinteric",    RPC_RTYPE_WERROR, NULL, cmd_spoolss_create_printer_ic,  &ndr_table_spoolss, NULL, "Create Printer IC", "" },
+        { "playgdiscriptonprinteric",   RPC_RTYPE_WERROR, NULL, cmd_spoolss_play_gdi_script_on_printer_ic,  &ndr_table_spoolss, NULL, "Create Printer IC", "" },
 
         { NULL }

vendor/current/source3/rpcclient/cmd_srvsvc.c

@@ -29 +29 @@
 /* Display server query info */
 
-static char *get_server_type_str(uint32 type)
+static char *get_server_type_str(uint32_t type)
 {
         static fstring typestr;
@@ -134 +134 @@
 }
 
-static void display_server(const char *sname, uint32 type, const char *comment)
+static void display_server(const char *sname, uint32_t type, const char *comment)
 {
         printf("\t%-15.15s%-20s %s\n", sname, get_server_type_str(type), 
@@ -172 +172 @@
                                           int argc, const char **argv)
 {
-        uint32 info_level = 101;
+        uint32_t info_level = 101;
         union srvsvc_NetSrvInfo info;
         WERROR result;
@@ -254 +254 @@
 }
 
+static void display_share_info_1005(struct srvsvc_NetShareInfo1005 *r)
+{
+        printf("flags: 0x%x\n", r->dfs_flags);
+        printf("csc caching: %u\n",
+               (r->dfs_flags & SHARE_1005_CSC_POLICY_MASK) >>
+               SHARE_1005_CSC_POLICY_SHIFT);
+}
+
 static WERROR cmd_srvsvc_net_share_enum_int(struct rpc_pipe_client *cli,
                                             TALLOC_CTX *mem_ctx,
@@ -259 +267 @@
                                             uint32_t opcode)
 {
-        uint32 info_level = 2;
+        uint32_t info_level = 2;
         struct srvsvc_NetShareInfoCtr info_ctr;
         struct srvsvc_NetShareCtr0 ctr0;
@@ -274 +282 @@
         NTSTATUS status;
         uint32_t totalentries = 0;
+        uint32_t count = 0;
         uint32_t resume_handle = 0;
         uint32_t *resume_handle_p = NULL;
-        uint32 preferred_len = 0xffffffff, i;
+        uint32_t preferred_len = 0xffffffff, i;
         struct dcerpc_binding_handle *b = cli->binding_handle;
 
@@ -375 +384 @@
         switch (info_level) {
         case 1:
-                for (i = 0; i < totalentries; i++)
+                count = info_ctr.ctr.ctr1->count;
+                for (i = 0; i < count; i++)
                         display_share_info_1(&info_ctr.ctr.ctr1->array[i]);
                 break;
         case 2:
-                for (i = 0; i < totalentries; i++)
+                count = info_ctr.ctr.ctr2->count;
+                for (i = 0; i < count; i++)
                         display_share_info_2(&info_ctr.ctr.ctr2->array[i]);
                 break;
         case 502:
-                for (i = 0; i < totalentries; i++)
+                count = info_ctr.ctr.ctr502->count;
+                for (i = 0; i < count; i++)
                         display_share_info_502(&info_ctr.ctr.ctr502->array[i]);
                 break;
@@ -417 +429 @@
                                             int argc, const char **argv)
 {
-        uint32 info_level = 502;
+        uint32_t info_level = 502;
         union srvsvc_NetShareInfo info;
         WERROR result;
@@ -424 +436 @@
 
         if (argc < 2 || argc > 3) {
-                printf("Usage: %s [sharename] [infolevel]\n", argv[0]);
+                printf("Usage: %s sharename [infolevel 1|2|502|1005]\n",
+                       argv[0]);
                 return WERR_OK;
         }
@@ -458 +471 @@
                 display_share_info_502(info.info502);
                 break;
+        case 1005:
+                display_share_info_1005(info.info1005);
+                break;
         default:
                 printf("unsupported info level %d\n", info_level);
@@ -471 +487 @@
                                             int argc, const char **argv)
 {
-        uint32 info_level = 502;
+        uint32_t info_level = 502;
         union srvsvc_NetShareInfo info_get;
         WERROR result;
@@ -539 +555 @@
 }
 
+static WERROR cmd_srvsvc_net_share_set_dfs_flags(struct rpc_pipe_client *cli,
+                                            TALLOC_CTX *mem_ctx,
+                                            int argc, const char **argv)
+{
+        struct srvsvc_NetShareInfo1005 info1005 = { 0 };
+        union srvsvc_NetShareInfo info = { .info1005 = &info1005 };
+        WERROR result;
+        NTSTATUS status;
+        uint32_t parm_err = 0;
+        struct dcerpc_binding_handle *b = cli->binding_handle;
+
+        if (argc > 3) {
+                printf("Usage: %s [sharename] [dfsflags]\n", argv[0]);
+                return WERR_OK;
+        }
+
+        if (argc > 2) {
+                info.info1005->dfs_flags = strtol(argv[2], NULL, 0);
+        }
+
+        /* set share info */
+        status = dcerpc_srvsvc_NetShareSetInfo(b, mem_ctx,
+                                               cli->desthost,
+                                               argv[1],
+                                               1005,
+                                               &info,
+                                               &parm_err,
+                                               &result);
+
+        if (!NT_STATUS_IS_OK(status)) {
+                return ntstatus_to_werror(status);
+        }
+        if (!W_ERROR_IS_OK(result)) {
+                return result;
+        }
+
+        /* re-retrieve share info and display */
+        status = dcerpc_srvsvc_NetShareGetInfo(b, mem_ctx,
+                                               cli->desthost,
+                                               argv[1],
+                                               1005,
+                                               &info,
+                                               &result);
+        if (!NT_STATUS_IS_OK(status)) {
+                return ntstatus_to_werror(status);
+        }
+        if (!W_ERROR_IS_OK(result)) {
+                return result;
+        }
+
+        display_share_info_1005(info.info1005);
+
+        return result;
+}
+
 static WERROR cmd_srvsvc_net_remote_tod(struct rpc_pipe_client *cli, 
                                           TALLOC_CTX *mem_ctx,
@@ -573 +644 @@
                                          int argc, const char **argv)
 {
-        uint32 info_level = 3;
+        uint32_t info_level = 3;
         struct srvsvc_NetFileInfoCtr info_ctr;
         struct srvsvc_NetFileCtr3 ctr3;
         WERROR result;
         NTSTATUS status;
-        uint32 preferred_len = 0xffff;
+        uint32_t preferred_len = 0xffff;
         uint32_t total_entries = 0;
         uint32_t resume_handle = 0;
@@ -938 +1009 @@
 }
 
+static WERROR cmd_srvsvc_net_share_add(struct rpc_pipe_client *cli,
+                                       TALLOC_CTX *mem_ctx,
+                                       int argc, const char **argv)
+{
+        struct srvsvc_NetShareInfo502 info502 = { 0 };
+        union srvsvc_NetShareInfo info = { .info502 = &info502 };
+        WERROR result;
+        NTSTATUS status;
+        uint32_t max_users = -1, parm_error;
+        struct sec_desc_buf sd_buf = { 0 };
+        const char *path, *share_name, *comment = NULL;
+        struct dcerpc_binding_handle *b = cli->binding_handle;
+
+        if (argc < 3 || argc > 5) {
+                printf("Usage: %s path share_name [max_users] [comment]\n",
+                       argv[0]);
+                return WERR_OK;
+        }
+
+        path = argv[1];
+        share_name = argv[2];
+
+        if (argc >= 4) {
+                max_users = atoi(argv[3]);
+        }
+
+        if (argc >= 5) {
+                comment = argv[4];
+        }
+
+        info.info502->name = share_name;
+        info.info502->type = STYPE_DISKTREE;
+        info.info502->comment = comment;
+        info.info502->max_users = max_users;
+        info.info502->path = path;
+        info.info502->sd_buf = sd_buf;
+
+        status = dcerpc_srvsvc_NetShareAdd(b, mem_ctx, cli->desthost,
+                                           502, &info, &parm_error, &result);
+        if (!NT_STATUS_IS_OK(status)) {
+                result = ntstatus_to_werror(status);
+        }
+
+        return result;
+}
+
+static WERROR cmd_srvsvc_net_share_del(struct rpc_pipe_client *cli,
+                                       TALLOC_CTX *mem_ctx,
+                                       int argc, const char **argv)
+{
+        const char *share_name;
+        WERROR result;
+        NTSTATUS status;
+        struct dcerpc_binding_handle *b = cli->binding_handle;
+
+        if (argc < 2) {
+                printf("Usage: %s share_name\n", argv[0]);
+                return WERR_OK;
+        }
+
+        share_name = argv[1];
+
+        status = dcerpc_srvsvc_NetShareDel(b, mem_ctx, cli->desthost,
+                                           share_name, 0, &result);
+
+        if (!NT_STATUS_IS_OK(status)) {
+                result = ntstatus_to_werror(status);
+        }
+
+        return result;
+}
+
 
 /* List of commands exported by this module */
@@ -945 +1088 @@
         { "SRVSVC" },
 
-        { "srvinfo",     RPC_RTYPE_WERROR, NULL, cmd_srvsvc_srv_query_info, &ndr_table_srvsvc.syntax_id, NULL, "Server query info", "" },
-        { "netshareenum",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_enum, &ndr_table_srvsvc.syntax_id, NULL, "Enumerate shares", "" },
-        { "netshareenumall",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_enum_all, &ndr_table_srvsvc.syntax_id, NULL, "Enumerate all shares", "" },
-        { "netsharegetinfo",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_get_info, &ndr_table_srvsvc.syntax_id, NULL, "Get Share Info", "" },
-        { "netsharesetinfo",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_set_info, &ndr_table_srvsvc.syntax_id, NULL, "Set Share Info", "" },
-        { "netfileenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_file_enum,  &ndr_table_srvsvc.syntax_id, NULL, "Enumerate open files", "" },
-        { "netremotetod",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_remote_tod, &ndr_table_srvsvc.syntax_id, NULL, "Fetch remote time of day", "" },
-        { "netnamevalidate", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_name_validate, &ndr_table_srvsvc.syntax_id, NULL, "Validate sharename", "" },
-        { "netfilegetsec", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_file_get_sec, &ndr_table_srvsvc.syntax_id, NULL, "Get File security", "" },
-        { "netsessdel", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_sess_del, &ndr_table_srvsvc.syntax_id, NULL, "Delete Session", "" },
-        { "netsessenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_sess_enum, &ndr_table_srvsvc.syntax_id, NULL, "Enumerate Sessions", "" },
-        { "netdiskenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_disk_enum, &ndr_table_srvsvc.syntax_id, NULL, "Enumerate Disks", "" },
-        { "netconnenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_conn_enum, &ndr_table_srvsvc.syntax_id, NULL, "Enumerate Connections", "" },
+        { "srvinfo",     RPC_RTYPE_WERROR, NULL, cmd_srvsvc_srv_query_info, &ndr_table_srvsvc, NULL, "Server query info", "" },
+        { "netshareenum",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_enum, &ndr_table_srvsvc, NULL, "Enumerate shares", "" },
+        { "netshareenumall",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_enum_all, &ndr_table_srvsvc, NULL, "Enumerate all shares", "" },
+        { "netsharegetinfo",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_get_info, &ndr_table_srvsvc, NULL, "Get Share Info", "" },
+        { "netsharesetinfo",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_set_info, &ndr_table_srvsvc, NULL, "Set Share Info", "" },
+        { "netsharesetdfsflags",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_set_dfs_flags, &ndr_table_srvsvc, NULL, "Set DFS flags", "" },
+        { "netfileenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_file_enum,  &ndr_table_srvsvc, NULL, "Enumerate open files", "" },
+        { "netremotetod",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_remote_tod, &ndr_table_srvsvc, NULL, "Fetch remote time of day", "" },
+        { "netnamevalidate", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_name_validate, &ndr_table_srvsvc, NULL, "Validate sharename", "" },
+        { "netfilegetsec", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_file_get_sec, &ndr_table_srvsvc, NULL, "Get File security", "" },
+        { "netsessdel", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_sess_del, &ndr_table_srvsvc, NULL, "Delete Session", "" },
+        { "netsessenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_sess_enum, &ndr_table_srvsvc, NULL, "Enumerate Sessions", "" },
+        { "netdiskenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_disk_enum, &ndr_table_srvsvc, NULL, "Enumerate Disks", "" },
+        { "netconnenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_conn_enum, &ndr_table_srvsvc, NULL, "Enumerate Connections", "" },
+        { "netshareadd", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_add, &ndr_table_srvsvc, NULL, "Add share", "" },
+        { "netsharedel", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_del, &ndr_table_srvsvc, NULL, "Delete share", "" },
 
         { NULL }

vendor/current/source3/rpcclient/cmd_test.c

@@ -36 +36 @@
         d_printf("testme\n");
 
-        status = cli_rpc_pipe_open_noauth(rpc_pipe_np_smb_conn(cli),
-                                          &ndr_table_lsarpc.syntax_id,
+        status = cli_rpc_pipe_open_noauth(rpcclient_cli_state,
+                                          &ndr_table_lsarpc,
                                           &lsa_pipe);
         if (!NT_STATUS_IS_OK(status)) {
@@ -43 +43 @@
         }
 
-        status = cli_rpc_pipe_open_noauth(rpc_pipe_np_smb_conn(cli),
-                                          &ndr_table_samr.syntax_id,
+        status = cli_rpc_pipe_open_noauth(rpcclient_cli_state,
+                                          &ndr_table_samr,
                                           &samr_pipe);
         if (!NT_STATUS_IS_OK(status)) {

vendor/current/source3/rpcclient/cmd_winreg.c

@@ -320 +320 @@
 
         { "WINREG" },
-        { "winreg_enumkey", RPC_RTYPE_WERROR, NULL, cmd_winreg_enumkeys, &ndr_table_winreg.syntax_id, NULL, "Enumerate Keys", "" },
-        { "querymultiplevalues", RPC_RTYPE_WERROR, NULL, cmd_winreg_querymultiplevalues, &ndr_table_winreg.syntax_id, NULL, "Query multiple values", "" },
-        { "querymultiplevalues2", RPC_RTYPE_WERROR, NULL, cmd_winreg_querymultiplevalues2, &ndr_table_winreg.syntax_id, NULL, "Query multiple values", "" },
+        { "winreg_enumkey", RPC_RTYPE_WERROR, NULL, cmd_winreg_enumkeys, &ndr_table_winreg, NULL, "Enumerate Keys", "" },
+        { "querymultiplevalues", RPC_RTYPE_WERROR, NULL, cmd_winreg_querymultiplevalues, &ndr_table_winreg, NULL, "Query multiple values", "" },
+        { "querymultiplevalues2", RPC_RTYPE_WERROR, NULL, cmd_winreg_querymultiplevalues2, &ndr_table_winreg, NULL, "Query multiple values", "" },
         { NULL }
 };

vendor/current/source3/rpcclient/cmd_wkssvc.c

@@ -217 +217 @@
 
         { "WKSSVC" },
-        { "wkssvc_wkstagetinfo", RPC_RTYPE_WERROR, NULL, cmd_wkssvc_wkstagetinfo, &ndr_table_wkssvc.syntax_id, NULL, "Query WKSSVC Workstation Information", "" },
-        { "wkssvc_getjoininformation", RPC_RTYPE_WERROR, NULL, cmd_wkssvc_getjoininformation, &ndr_table_wkssvc.syntax_id, NULL, "Query WKSSVC Join Information", "" },
-        { "wkssvc_messagebuffersend", RPC_RTYPE_WERROR, NULL, cmd_wkssvc_messagebuffersend, &ndr_table_wkssvc.syntax_id, NULL, "Send WKSSVC message", "" },
-        { "wkssvc_enumeratecomputernames", RPC_RTYPE_WERROR, NULL, cmd_wkssvc_enumeratecomputernames, &ndr_table_wkssvc.syntax_id, NULL, "Enumerate WKSSVC computer names", "" },
+        { "wkssvc_wkstagetinfo", RPC_RTYPE_WERROR, NULL, cmd_wkssvc_wkstagetinfo, &ndr_table_wkssvc, NULL, "Query WKSSVC Workstation Information", "" },
+        { "wkssvc_getjoininformation", RPC_RTYPE_WERROR, NULL, cmd_wkssvc_getjoininformation, &ndr_table_wkssvc, NULL, "Query WKSSVC Join Information", "" },
+        { "wkssvc_messagebuffersend", RPC_RTYPE_WERROR, NULL, cmd_wkssvc_messagebuffersend, &ndr_table_wkssvc, NULL, "Send WKSSVC message", "" },
+        { "wkssvc_enumeratecomputernames", RPC_RTYPE_WERROR, NULL, cmd_wkssvc_enumeratecomputernames, &ndr_table_wkssvc, NULL, "Enumerate WKSSVC computer names", "" },
         { "wkssvc_enumerateusers", RPC_RTYPE_WERROR, NULL,
-          cmd_wkssvc_enumerateusers, &ndr_table_wkssvc.syntax_id, NULL,
+          cmd_wkssvc_enumerateusers, &ndr_table_wkssvc, NULL,
           "Enumerate WKSSVC users", "" },
         { NULL }

vendor/current/source3/rpcclient/rpcclient.c

@@ -32 +32 @@
 #include "passdb.h"
 #include "libsmb/libsmb.h"
+#include "auth/gensec/gensec.h"
+#include "../libcli/smb/smbXcli_base.h"
+#include "messages.h"
 
 enum pipe_auth_type_spnego {
@@ -47 +50 @@
 static enum dcerpc_transport_t default_transport = NCACN_NP;
 
+struct messaging_context *rpcclient_msg_ctx;
 struct user_auth_info *rpcclient_auth_info;
+struct cli_state *rpcclient_cli_state;
+struct netlogon_creds_cli_context *rpcclient_netlogon_creds;
 
 /* List to hold groups of commands.
@@ -166 +172 @@
         }
 
-        result = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc.syntax_id,
+        result = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc,
                                           &lsapipe);
         if (!NT_STATUS_IS_OK(result)) {
@@ -210 +216 @@
         }
 
-        fprintf(stderr, "could not obtain sid for domain %s\n", cli->domain);
+        fprintf(stderr, "could not obtain sid from server\n");
 
         if (!NT_STATUS_IS_OK(result)) {
@@ -241 +247 @@
                 tmp_set = tmp->cmd_set;
 
-                if (!StrCaseCmp(argv[1], tmp_set->name))
+                if (!strcasecmp_m(argv[1], tmp_set->name))
                 {
                         printf("Available commands on the %s pipe:\n\n", tmp_set->name);
@@ -482 +488 @@
                             int argc, const char **argv)
 {
-        struct cmd_list *tmp;
-
         if (argc > 2) {
                 printf("Usage: %s timeout\n", argv[0]);
@@ -491 +495 @@
         if (argc == 2) {
                 timeout = atoi(argv[1]);
-
-                for (tmp = cmd_list; tmp; tmp = tmp->next) {
-
-                        struct cmd_set *tmp_set;
-
-                        for (tmp_set = tmp->cmd_set; tmp_set->name; tmp_set++) {
-                                if (tmp_set->rpc_pipe == NULL) {
-                                        continue;
-                                }
-
-                                rpccli_set_timeout(tmp_set->rpc_pipe, timeout);
-                        }
-                }
         }
 
@@ -619 +610 @@
 extern struct cmd_set eventlog_commands[];
 extern struct cmd_set winreg_commands[];
+extern struct cmd_set fss_commands[];
+extern struct cmd_set witness_commands[];
+extern struct cmd_set clusapi_commands[];
 
 static struct cmd_set *rpcclient_command_list[] = {
@@ -638 +632 @@
         eventlog_commands,
         winreg_commands,
+        fss_commands,
+        witness_commands,
+        clusapi_commands,
         NULL
 };
@@ -666 +663 @@
                        struct cmd_set *cmd_entry,
                        struct dcerpc_binding *binding,
-                       int argc, char **argv)
+                       int argc, const char **argv)
 {
         NTSTATUS ntresult;
@@ -675 +672 @@
         /* Create mem_ctx */
 
-        if (!(mem_ctx = talloc_init("do_cmd"))) {
+        if (!(mem_ctx = talloc_stackframe())) {
                 DEBUG(0, ("talloc_init() failed\n"));
                 return NT_STATUS_NO_MEMORY;
@@ -682 +679 @@
         /* Open pipe */
 
-        if ((cmd_entry->interface != NULL) && (cmd_entry->rpc_pipe == NULL)) {
+        if ((cmd_entry->table != NULL) && (cmd_entry->rpc_pipe == NULL)) {
+                enum credentials_use_kerberos use_kerberos = CRED_AUTO_USE_KERBEROS;
                 switch (pipe_default_auth_type) {
                 case DCERPC_AUTH_TYPE_NONE:
                         ntresult = cli_rpc_pipe_open_noauth_transport(
                                 cli, default_transport,
-                                cmd_entry->interface,
+                                cmd_entry->table,
                                 &cmd_entry->rpc_pipe);
                         break;
@@ -693 +691 @@
                         switch (pipe_default_auth_spnego_type) {
                         case PIPE_AUTH_TYPE_SPNEGO_NTLMSSP:
-                                ntresult = cli_rpc_pipe_open_spnego_ntlmssp(
-                                                cli, cmd_entry->interface,
-                                                default_transport,
-                                                pipe_default_auth_level,
-                                                get_cmdline_auth_info_domain(auth_info),
-                                                get_cmdline_auth_info_username(auth_info),
-                                                get_cmdline_auth_info_password(auth_info),
-                                                &cmd_entry->rpc_pipe);
+                                use_kerberos = CRED_DONT_USE_KERBEROS;
                                 break;
                         case PIPE_AUTH_TYPE_SPNEGO_KRB5:
-                                ntresult = cli_rpc_pipe_open_spnego_krb5(
-                                                cli, cmd_entry->interface,
-                                                default_transport,
-                                                pipe_default_auth_level,
-                                                cli->desthost,
-                                                NULL, NULL,
-                                                &cmd_entry->rpc_pipe);
+                                use_kerberos = CRED_MUST_USE_KERBEROS;
                                 break;
-                        default:
-                                ntresult = NT_STATUS_INTERNAL_ERROR;
+                        case PIPE_AUTH_TYPE_SPNEGO_NONE:
+                                use_kerberos = CRED_AUTO_USE_KERBEROS;
+                                break;
                         }
-                        break;
+                        /* Fall through */
                 case DCERPC_AUTH_TYPE_NTLMSSP:
-                        ntresult = cli_rpc_pipe_open_ntlmssp(
-                                cli, cmd_entry->interface,
+                case DCERPC_AUTH_TYPE_KRB5:
+                        ntresult = cli_rpc_pipe_open_generic_auth(
+                                cli, cmd_entry->table,
                                 default_transport,
+                                use_kerberos,
+                                pipe_default_auth_type,
                                 pipe_default_auth_level,
+                                smbXcli_conn_remote_name(cli->conn),
                                 get_cmdline_auth_info_domain(auth_info),
                                 get_cmdline_auth_info_username(auth_info),
@@ -726 +716 @@
                         break;
                 case DCERPC_AUTH_TYPE_SCHANNEL:
+                        TALLOC_FREE(rpcclient_netlogon_creds);
                         ntresult = cli_rpc_pipe_open_schannel(
-                                cli, cmd_entry->interface,
+                                cli, rpcclient_msg_ctx,
+                                cmd_entry->table,
                                 default_transport,
-                                pipe_default_auth_level,
                                 get_cmdline_auth_info_domain(auth_info),
-                                &cmd_entry->rpc_pipe);
-                        break;
-                case DCERPC_AUTH_TYPE_KRB5:
-                        ntresult = cli_rpc_pipe_open_krb5(
-                                cli, cmd_entry->interface,
-                                default_transport,
-                                pipe_default_auth_level,
-                                cli->desthost,
-                                NULL, NULL,
-                                &cmd_entry->rpc_pipe);
+                                &cmd_entry->rpc_pipe,
+                                talloc_autofree_context(),
+                                &rpcclient_netlogon_creds);
                         break;
                 default:
                         DEBUG(0, ("Could not initialise %s. Invalid "
                                   "auth type %u\n",
-                                  get_pipe_name_from_syntax(
-                                          talloc_tos(),
-                                          cmd_entry->interface),
+                                  cmd_entry->table->name,
                                   pipe_default_auth_type ));
+                        talloc_free(mem_ctx);
                         return NT_STATUS_UNSUCCESSFUL;
                 }
                 if (!NT_STATUS_IS_OK(ntresult)) {
                         DEBUG(0, ("Could not initialise %s. Error was %s\n",
-                                  get_pipe_name_from_syntax(
-                                          talloc_tos(), cmd_entry->interface),
+                                  cmd_entry->table->name,
                                   nt_errstr(ntresult) ));
+                        talloc_free(mem_ctx);
                         return ntresult;
                 }
 
-                if (ndr_syntax_id_equal(cmd_entry->interface,
-                                        &ndr_table_netlogon.syntax_id)) {
-                        uint32_t neg_flags = NETLOGON_NEG_AUTH2_ADS_FLAGS;
-                        enum netr_SchannelType sec_channel_type;
-                        uchar trust_password[16];
-                        const char *machine_account;
-
-                        if (!get_trust_pw_hash(get_cmdline_auth_info_domain(auth_info),
-                                               trust_password, &machine_account,
-                                               &sec_channel_type))
-                        {
-                                return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
+                if (rpcclient_netlogon_creds == NULL && cmd_entry->use_netlogon_creds) {
+                        const char *dc_name = cmd_entry->rpc_pipe->desthost;
+                        const char *domain = get_cmdline_auth_info_domain(auth_info);
+                        struct cli_credentials *creds = NULL;
+
+                        ntresult = pdb_get_trust_credentials(domain, NULL,
+                                                             mem_ctx, &creds);
+                        if (!NT_STATUS_IS_OK(ntresult)) {
+                                DEBUG(0, ("Failed to fetch trust credentials for "
+                                          "%s to connect to %s: %s\n",
+                                          domain, cmd_entry->table->name,
+                                          nt_errstr(ntresult)));
+                                TALLOC_FREE(cmd_entry->rpc_pipe);
+                                talloc_free(mem_ctx);
+                                return ntresult;
                         }
 
-                        ntresult = rpccli_netlogon_setup_creds(cmd_entry->rpc_pipe,
-                                                cli->desthost,   /* server name */
-                                                get_cmdline_auth_info_domain(auth_info),  /* domain */
-                                                global_myname(), /* client name */
-                                                machine_account, /* machine account name */
-                                                trust_password,
-                                                sec_channel_type,
-                                                &neg_flags);
-
+                        ntresult = rpccli_create_netlogon_creds_with_creds(creds,
+                                                        dc_name,
+                                                        rpcclient_msg_ctx,
+                                                        talloc_autofree_context(),
+                                                        &rpcclient_netlogon_creds);
                         if (!NT_STATUS_IS_OK(ntresult)) {
                                 DEBUG(0, ("Could not initialise credentials for %s.\n",
-                                          get_pipe_name_from_syntax(
-                                                  talloc_tos(),
-                                                  cmd_entry->interface)));
+                                          cmd_entry->table->name));
+                                TALLOC_FREE(cmd_entry->rpc_pipe);
+                                TALLOC_FREE(mem_ctx);
                                 return ntresult;
                         }
-                }
+
+                        ntresult = rpccli_setup_netlogon_creds_with_creds(cli,
+                                                        NCACN_NP,
+                                                        rpcclient_netlogon_creds,
+                                                        false, /* force_reauth */
+                                                        creds);
+                        TALLOC_FREE(creds);
+                        if (!NT_STATUS_IS_OK(ntresult)) {
+                                DEBUG(0, ("Could not initialise credentials for %s.\n",
+                                          cmd_entry->table->name));
+                                TALLOC_FREE(cmd_entry->rpc_pipe);
+                                TALLOC_FREE(rpcclient_netlogon_creds);
+                                TALLOC_FREE(mem_ctx);
+                                return ntresult;
+                        }
+                }
+        }
+
+        /* Set timeout for new connections */
+        if (cmd_entry->rpc_pipe) {
+                rpccli_set_timeout(cmd_entry->rpc_pipe, timeout);
         }
 
@@ -795 +797 @@
 
         if ( cmd_entry->returntype == RPC_RTYPE_NTSTATUS ) {
-                ntresult = cmd_entry->ntfn(cmd_entry->rpc_pipe, mem_ctx, argc, (const char **) argv);
+                ntresult = cmd_entry->ntfn(cmd_entry->rpc_pipe, mem_ctx, argc, argv);
                 if (!NT_STATUS_IS_OK(ntresult)) {
                         printf("result was %s\n", nt_errstr(ntresult));
                 }
         } else {
-                wresult = cmd_entry->wfn(cmd_entry->rpc_pipe, mem_ctx, argc, (const char **) argv);
+                wresult = cmd_entry->wfn(cmd_entry->rpc_pipe, mem_ctx, argc, argv);
                 /* print out the DOS error */
                 if (!W_ERROR_IS_OK(wresult)) {
@@ -810 +812 @@
         /* Cleanup */
 
-        talloc_destroy(mem_ctx);
+        talloc_free(mem_ctx);
 
         return ntresult;
@@ -830 +832 @@
         int ret;
         int argc;
-        char **argv = NULL;
-
-        if ((ret = poptParseArgvString(cmd, &argc, (const char ***) &argv)) != 0) {
+        const char **argv = NULL;
+
+        if ((ret = poptParseArgvString(cmd, &argc, &argv)) != 0) {
                 fprintf(stderr, "rpcclient: %s\n", poptStrerror(ret));
                 return NT_STATUS_UNSUCCESSFUL;
@@ -884 +886 @@
  int main(int argc, char *argv[])
 {
+        const char **const_argv = discard_const_p(const char *, argv);
         int                     opt;
         static char             *cmdstr = NULL;
@@ -893 +896 @@
         NTSTATUS                nt_status;
         static int              opt_port = 0;
-        fstring new_workgroup;
         int result = 0;
         TALLOC_CTX *frame = talloc_stackframe();
         uint32_t flags = 0;
         struct dcerpc_binding *binding = NULL;
+        enum dcerpc_transport_t transport;
+        uint32_t bflags = 0;
         const char *binding_string = NULL;
         char *user, *domain, *q;
+        const char *host;
 
         /* make sure the vars that get altered (4th field) are in
@@ -915 +920 @@
         };
 
-        load_case_tables();
+        smb_init_locale();
 
         zero_sockaddr(&server_ss);
@@ -924 +929 @@
            facilities.  See lib/debug.c */
         setup_logging("rpcclient", DEBUG_STDOUT);
+        lp_set_cmdline("log level", "0");
 
         rpcclient_auth_info = user_auth_info_init(frame);
@@ -933 +939 @@
         /* Parse options */
 
-        pc = poptGetContext("rpcclient", argc, (const char **) argv,
+        pc = poptGetContext("rpcclient", argc, const_argv,
                             long_options, 0);
 
@@ -968 +974 @@
 
         poptFreeContext(pc);
-
-        load_interfaces();
+        popt_burn_cmdline_password(argc, argv);
 
         if (!init_names()) {
@@ -976 +981 @@
         }
 
-        /* save the workgroup...
-
-           FIXME!! do we need to do this for other options as well
-           (or maybe a generic way to keep lp_load() from overwriting
-           everything)?  */
-
-        fstrcpy( new_workgroup, lp_workgroup() );
-
         /* Load smb.conf file */
 
-        if (!lp_load(get_dyn_CONFIGFILE(),True,False,False,True))
+        if (!lp_load_global(get_dyn_CONFIGFILE()))
                 fprintf(stderr, "Can't load %s\n", get_dyn_CONFIGFILE());
 
-        if ( strlen(new_workgroup) != 0 )
-                set_global_myworkgroup( new_workgroup );
+        /* We must load interfaces after we load the smb.conf */
+        load_interfaces();
+
+        rpcclient_msg_ctx = messaging_init(talloc_autofree_context(),
+                        samba_tevent_context_init(talloc_autofree_context()));
 
         /*
@@ -1028 +1028 @@
         }
 
-        if (binding->transport == NCA_UNKNOWN) {
-                binding->transport = NCACN_NP;
-        }
-
-        if (binding->flags & DCERPC_CONNECT) {
+        transport = dcerpc_binding_get_transport(binding);
+
+        if (transport == NCA_UNKNOWN) {
+                nt_status = dcerpc_binding_set_transport(binding, NCACN_NP);
+                if (!NT_STATUS_IS_OK(nt_status)) {
+                        result = -1;
+                        goto done;
+                }
+        }
+
+        host = dcerpc_binding_get_string_option(binding, "host");
+
+        bflags = dcerpc_binding_get_flags(binding);
+        if (bflags & DCERPC_CONNECT) {
                 pipe_default_auth_level = DCERPC_AUTH_LEVEL_CONNECT;
                 pipe_default_auth_type = DCERPC_AUTH_TYPE_NTLMSSP;
         }
-        if (binding->flags & DCERPC_SIGN) {
+        if (bflags & DCERPC_SIGN) {
                 pipe_default_auth_level = DCERPC_AUTH_LEVEL_INTEGRITY;
                 pipe_default_auth_type = DCERPC_AUTH_TYPE_NTLMSSP;
         }
-        if (binding->flags & DCERPC_SEAL) {
+        if (bflags & DCERPC_SEAL) {
                 pipe_default_auth_level = DCERPC_AUTH_LEVEL_PRIVACY;
                 pipe_default_auth_type = DCERPC_AUTH_TYPE_NTLMSSP;
         }
-        if (binding->flags & DCERPC_AUTH_SPNEGO) {
+        if (bflags & DCERPC_AUTH_SPNEGO) {
                 pipe_default_auth_type = DCERPC_AUTH_TYPE_SPNEGO;
                 pipe_default_auth_spnego_type = PIPE_AUTH_TYPE_SPNEGO_NTLMSSP;
         }
-        if (binding->flags & DCERPC_AUTH_NTLM) {
+        if (bflags & DCERPC_AUTH_NTLM) {
                 if (pipe_default_auth_type == DCERPC_AUTH_TYPE_SPNEGO) {
                         pipe_default_auth_spnego_type = PIPE_AUTH_TYPE_SPNEGO_NTLMSSP;
@@ -1055 +1064 @@
                 }
         }
-        if (binding->flags & DCERPC_AUTH_KRB5) {
+        if (bflags & DCERPC_AUTH_KRB5) {
                 if (pipe_default_auth_type == DCERPC_AUTH_TYPE_SPNEGO) {
                         pipe_default_auth_spnego_type = PIPE_AUTH_TYPE_SPNEGO_KRB5;
@@ -1089 +1098 @@
         }
 
-
-        nt_status = cli_full_connection(&cli, global_myname(), binding->host,
+        nt_status = cli_full_connection(&cli, lp_netbios_name(), host,
                                         opt_ipaddr ? &server_ss : NULL, opt_port,
                                         "IPC$", "IPC",
@@ -1122 +1130 @@
 
         /* Load command lists */
-
-        timeout = cli_set_timeout(cli, 10000);
+        rpcclient_cli_state = cli;
+
+        timeout = 10000;
+        cli_set_timeout(cli, timeout);
 
         cmd_set = rpcclient_command_list;
@@ -1133 +1143 @@
         }
 
-        default_transport = binding->transport;
+        default_transport = dcerpc_binding_get_transport(binding);
 
         fetch_machine_sid(cli);
@@ -1170 +1180 @@
 
 done:
+        rpcclient_cli_state = NULL;
         if (cli != NULL) {
                 cli_shutdown(cli);

vendor/current/source3/rpcclient/rpcclient.h

@@ -36 +36 @@
                         const char **argv);
         WERROR (*wfn)(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv);
-        const struct ndr_syntax_id *interface;
+        const struct ndr_interface_table *table;
         struct rpc_pipe_client *rpc_pipe;
         const char *description;
         const char *usage;
+        bool use_netlogon_creds;
 };
 
+extern struct messaging_context *rpcclient_msg_ctx;
+extern struct cli_state *rpcclient_cli_state;
+extern struct netlogon_creds_cli_context *rpcclient_netlogon_creds;
+
 #endif /* RPCCLIENT_H */