Changeset 920 for trunk/server/source3/rpcclient

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)
• source3/rpcclient/rpcclient.c (modified) (3 diffs)

trunk/server/source3/rpcclient/rpcclient.c

@@ -1032 +1032 @@
         }
 
+        if (binding->flags & DCERPC_CONNECT) {
+                pipe_default_auth_level = DCERPC_AUTH_LEVEL_CONNECT;
+                pipe_default_auth_type = DCERPC_AUTH_TYPE_NTLMSSP;
+        }
         if (binding->flags & DCERPC_SIGN) {
                 pipe_default_auth_level = DCERPC_AUTH_LEVEL_INTEGRITY;
@@ -1045 +1049 @@
         }
         if (binding->flags & DCERPC_AUTH_NTLM) {
-                /* If neither Integrity or Privacy are requested then
-                 * Use just Connect level */
-                if (pipe_default_auth_level == DCERPC_AUTH_LEVEL_NONE) {
-                        pipe_default_auth_level = DCERPC_AUTH_LEVEL_CONNECT;
-                }
-
                 if (pipe_default_auth_type == DCERPC_AUTH_TYPE_SPNEGO) {
                         pipe_default_auth_spnego_type = PIPE_AUTH_TYPE_SPNEGO_NTLMSSP;
@@ -1058 +1056 @@
         }
         if (binding->flags & DCERPC_AUTH_KRB5) {
-                /* If neither Integrity or Privacy are requested then
-                 * Use just Connect level */
-                if (pipe_default_auth_level == DCERPC_AUTH_LEVEL_NONE) {
-                        pipe_default_auth_level = DCERPC_AUTH_LEVEL_CONNECT;
-                }
-
                 if (pipe_default_auth_type == DCERPC_AUTH_TYPE_SPNEGO) {
                         pipe_default_auth_spnego_type = PIPE_AUTH_TYPE_SPNEGO_KRB5;
                 } else {
                         pipe_default_auth_type = DCERPC_AUTH_TYPE_KRB5;
+                }
+        }
+        if (pipe_default_auth_type != DCERPC_AUTH_TYPE_NONE) {
+                /* If nothing is requested then default to integrity */
+                if (pipe_default_auth_level == DCERPC_AUTH_LEVEL_NONE) {
+                        pipe_default_auth_level = DCERPC_AUTH_LEVEL_INTEGRITY;
                 }
         }