Changeset 920 for trunk/server/source4/rpc_server

Timestamp:

Jun 9, 2016, 2:23:12 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: apply latest security patches to trunk

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/rpc_server/dcesrv_auth.c (modified) (6 diffs)

trunk/server/source4/rpc_server/dcesrv_auth.c

@@ -47 +47 @@
         uint32_t auth_length;
 
-        if (pkt->u.bind.auth_info.length == 0) {
+        if (pkt->auth_length == 0) {
                 dce_conn->auth_state.auth_info = NULL;
                 return true;
@@ -109 +109 @@
         NTSTATUS status;
 
-        if (!call->conn->auth_state.gensec_security) {
+        if (call->pkt.auth_length == 0) {
                 return NT_STATUS_OK;
         }
@@ -156 +156 @@
         uint32_t auth_length;
 
-        /* We can't work without an existing gensec state, and an new blob to feed it */
-        if (!dce_conn->auth_state.auth_info ||
-            !dce_conn->auth_state.gensec_security ||
-            pkt->u.auth3.auth_info.length == 0) {
+        if (pkt->auth_length == 0) {
+                return false;
+        }
+
+        if (!dce_conn->auth_state.auth_info) {
+                return false;
+        }
+
+        /* We can't work without an existing gensec state */
+        if (!dce_conn->auth_state.gensec_security) {
                 return false;
         }
@@ -204 +210 @@
 
         /* on a pure interface change there is no auth blob */
-        if (pkt->u.alter.auth_info.length == 0) {
+        if (pkt->auth_length == 0) {
                 return true;
         }
@@ -239 +245 @@
         /* on a pure interface change there is no auth_info structure
            setup */
-        if (!call->conn->auth_state.auth_info ||
-            dce_conn->auth_state.auth_info->credentials.length == 0) {
+        if (call->pkt.auth_length == 0) {
                 return NT_STATUS_OK;
         }
@@ -313 +318 @@
 
         default:
+                return false;
+        }
+
+        if (pkt->auth_length == 0) {
+                DEBUG(1,("dcesrv_auth_request: unexpected auth_length of 0\n"));
                 return false;
         }