Changeset 989 for vendor/current/libcli

Timestamp:

Nov 25, 2016, 8:04:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

Location:

vendor/current/libcli

Files:

• auth/msrpc_parse.c (modified) (4 diffs)
• cldap/cldap.c (modified) (1 diff)
• smb/smbXcli_base.c (modified) (4 diffs)
• smb/smbXcli_base.h (modified) (1 diff)

vendor/current/libcli/auth/msrpc_parse.c

@@ -263 +263 @@
                         ps = va_arg(ap, char **);
                         if (len1 == 0 && len2 == 0) {
-                                *ps = (char *)discard_const("");
+                                *ps = talloc_strdup(mem_ctx, "");
+                                if (*ps == NULL) {
+                                        ret = false;
+                                        goto cleanup;
+                                }
                         } else {
                                 /* make sure its in the right format - be strict */
@@ -290 +294 @@
                                         }
                                 } else {
-                                        (*ps) = (char *)discard_const("");
+                                        *ps = talloc_strdup(mem_ctx, "");
+                                        if (*ps == NULL) {
+                                                ret = false;
+                                                goto cleanup;
+                                        }
                                 }
                         }
@@ -303 +311 @@
                         /* make sure its in the right format - be strict */
                         if (len1 == 0 && len2 == 0) {
-                                *ps = (char *)discard_const("");
+                                *ps = talloc_strdup(mem_ctx, "");
+                                if (*ps == NULL) {
+                                        ret = false;
+                                        goto cleanup;
+                                }
                         } else {
                                 if ((len1 != len2) || (ptr + len1 < ptr) || (ptr + len1 < len1) || (ptr + len1 > blob->length)) {
@@ -326 +338 @@
                                         }
                                 } else {
-                                        (*ps) = (char *)discard_const("");
+                                        *ps = talloc_strdup(mem_ctx, "");
+                                        if (*ps == NULL) {
+                                                ret = false;
+                                                goto cleanup;
+                                        }
                                 }
                         }

vendor/current/libcli/cldap/cldap.c

@@ -586 +586 @@
         talloc_set_destructor(state, cldap_search_state_destructor);
 
+        if (state->caller.cldap == NULL) {
+                tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                goto post;
+        }
+
         if (io->in.dest_address) {
                 if (cldap->connected) {

vendor/current/libcli/smb/smbXcli_base.c

@@ -5313 +5313 @@
         }
 
+        if (session->conn->mandatory_signing) {
+                return false;
+        }
+
         if (session->conn->protocol >= PROTOCOL_SMB2_02) {
                 if (session->smb2->session_flags & SMB2_SESSION_FLAG_IS_GUEST) {
@@ -5523 +5527 @@
 }
 
+uint16_t smb2cli_session_current_channel_sequence(struct smbXcli_session *session)
+{
+        return session->smb2->channel_sequence;
+}
+
 void smb2cli_session_start_replay(struct smbXcli_session *session)
 {
@@ -5567 +5576 @@
 {
         struct smbXcli_conn *conn = session->conn;
-        uint16_t no_sign_flags;
+        uint16_t no_sign_flags = 0;
         uint8_t session_key[16];
         bool check_signature = true;
@@ -5592 +5601 @@
         }
 
-        no_sign_flags = SMB2_SESSION_FLAG_IS_GUEST | SMB2_SESSION_FLAG_IS_NULL;
+        if (!conn->mandatory_signing) {
+                /*
+                 * only allow guest sessions without
+                 * mandatory signing.
+                 *
+                 * If we try an authentication with username != ""
+                 * and the server let us in without verifying the
+                 * password we don't have a negotiated session key
+                 * for signing.
+                 */
+                no_sign_flags = SMB2_SESSION_FLAG_IS_GUEST;
+        }
 
         if (session->smb2->session_flags & no_sign_flags) {

vendor/current/libcli/smb/smbXcli_base.h

@@ -414 +414 @@
 uint16_t smb2cli_session_reset_channel_sequence(struct smbXcli_session *session,
                                                 uint16_t channel_sequence);
+uint16_t smb2cli_session_current_channel_sequence(struct smbXcli_session *session);
 void smb2cli_session_start_replay(struct smbXcli_session *session);
 void smb2cli_session_stop_replay(struct smbXcli_session *session);