Changeset 988 for vendor/current/source4/libcli/util

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/source4/libcli/util

Files:

• clilsa.c (modified) (12 diffs)
• errormap.c (deleted)
• nterr.c (deleted)
• pyerrors.h (modified) (2 diffs)

vendor/current/source4/libcli/util/clilsa.c

@@ -33 +33 @@
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 #include "libcli/util/clilsa.h"
+#include "libcli/smb/smbXcli_base.h"
 
 struct smblsa_state {
-        struct dcerpc_pipe *pipe;
+        struct dcerpc_binding_handle *binding_handle;
         struct smbcli_tree *ipc_tree;
         struct policy_handle handle;
@@ -46 +47 @@
 {
         struct smblsa_state *lsa;
+        struct dcerpc_pipe *lsa_pipe;
         NTSTATUS status;
         struct lsa_OpenPolicy r;
@@ -69 +71 @@
         /* connect to IPC$ */
         tcon.generic.level = RAW_TCON_TCONX;
-        tcon.tconx.in.flags = 0;
+        tcon.tconx.in.flags = TCONX_FLAG_EXTENDED_RESPONSE;
+        tcon.tconx.in.flags |= TCONX_FLAG_EXTENDED_SIGNATURES;
         tcon.tconx.in.password = data_blob(NULL, 0);
         tcon.tconx.in.path = "ipc$";
@@ -80 +83 @@
         lsa->ipc_tree->tid = tcon.tconx.out.tid;
 
-        lsa->pipe = dcerpc_pipe_init(lsa, cli->transport->socket->event.ctx);
-        if (lsa->pipe == NULL) {
+        if (tcon.tconx.out.options & SMB_EXTENDED_SIGNATURES) {
+                smb1cli_session_protect_session_key(cli->session->smbXcli);
+        }
+
+        lsa_pipe = dcerpc_pipe_init(lsa, cli->transport->ev);
+        if (lsa_pipe == NULL) {
                 talloc_free(lsa);
                 return NT_STATUS_NO_MEMORY;
@@ -87 +94 @@
 
         /* open the LSA pipe */
-        status = dcerpc_pipe_open_smb(lsa->pipe, lsa->ipc_tree, NDR_LSARPC_NAME);
+        status = dcerpc_pipe_open_smb(lsa_pipe, lsa->ipc_tree, NDR_LSARPC_NAME);
         if (!NT_STATUS_IS_OK(status)) {
                 talloc_free(lsa);
@@ -94 +101 @@
 
         /* bind to the LSA pipe */
-        status = dcerpc_bind_auth_none(lsa->pipe, &ndr_table_lsarpc);
+        status = dcerpc_bind_auth_none(lsa_pipe, &ndr_table_lsarpc);
         if (!NT_STATUS_IS_OK(status)) {
                 talloc_free(lsa);
                 return status;
         }
-
+        lsa->binding_handle = lsa_pipe->binding_handle;
 
         /* open a lsa policy handle */
@@ -119 +126 @@
         r.out.handle = &lsa->handle;
 
-        status = dcerpc_lsa_OpenPolicy_r(lsa->pipe->binding_handle, lsa, &r);
+        status = dcerpc_lsa_OpenPolicy_r(lsa->binding_handle, lsa, &r);
         if (!NT_STATUS_IS_OK(status)) {
                 talloc_free(lsa);
@@ -155 +162 @@
         r.out.rights = rights;
 
-        status = dcerpc_lsa_EnumAccountRights_r(cli->lsa->pipe->binding_handle, mem_ctx, &r);
+        status = dcerpc_lsa_EnumAccountRights_r(cli->lsa->binding_handle, mem_ctx, &r);
         if (!NT_STATUS_IS_OK(status)) {
                 return status;
@@ -244 +251 @@
         r.out.domains = &domains;
 
-        status = dcerpc_lsa_LookupSids_r(cli->lsa->pipe->binding_handle, mem_ctx2, &r);
+        status = dcerpc_lsa_LookupSids_r(cli->lsa->binding_handle, mem_ctx2, &r);
         if (!NT_STATUS_IS_OK(status)) {
                 talloc_free(mem_ctx2);
@@ -319 +326 @@
         r.out.domains = &domains;
 
-        status = dcerpc_lsa_LookupNames_r(cli->lsa->pipe->binding_handle, mem_ctx2, &r);
+        status = dcerpc_lsa_LookupNames_r(cli->lsa->binding_handle, mem_ctx2, &r);
         if (!NT_STATUS_IS_OK(status)) {
                 talloc_free(mem_ctx2);
@@ -368 +375 @@
         r.in.rights = rights;
 
-        status = dcerpc_lsa_AddAccountRights_r(cli->lsa->pipe->binding_handle, mem_ctx, &r);
+        status = dcerpc_lsa_AddAccountRights_r(cli->lsa->binding_handle, mem_ctx, &r);
         if (!NT_STATUS_IS_OK(status)) {
                 return status;
@@ -396 +403 @@
         r.in.rights = rights;
 
-        status = dcerpc_lsa_RemoveAccountRights_r(cli->lsa->pipe->binding_handle, mem_ctx, &r);
+        status = dcerpc_lsa_RemoveAccountRights_r(cli->lsa->binding_handle, mem_ctx, &r);
         if (!NT_STATUS_IS_OK(status)) {
                 return status;

vendor/current/source4/libcli/util/pyerrors.h

@@ -23 +23 @@
 #define PyErr_FromWERROR(err) Py_BuildValue("(i,s)", W_ERROR_V(err), discard_const_p(char, win_errstr(err)))
 
+#define PyErr_FromHRESULT(err) Py_BuildValue("(i,s)", HRES_ERROR_V(err), discard_const_p(char, hresult_errstr_const(err)))
+
 #define PyErr_FromNTSTATUS(status) Py_BuildValue("(i,s)", NT_STATUS_V(status), discard_const_p(char, get_friendly_nt_error_msg(status)))
 
@@ -39 +41 @@
         }
 
-#define PyErr_WERROR_IS_ERR_RAISE(status) \
+#define PyErr_NTSTATUS_NOT_OK_RAISE(status) \
+        if (!NT_STATUS_IS_OK(status)) { \
+                PyErr_SetNTSTATUS(status); \
+                return NULL; \
+        }
+
+#define PyErr_WERROR_NOT_OK_RAISE(status) \
         if (!W_ERROR_IS_OK(status)) { \
                 PyErr_SetWERROR(status); \