Changeset 920 for trunk/server/source3/libsmb/libsmb_server.c

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/libsmb/libsmb_server.c (modified) (5 diffs)

trunk/server/source3/libsmb/libsmb_server.c

@@ -259 +259 @@
         NTSTATUS status;
         char *newserver, *newshare;
+        int signing_state = Undefined;
 
         zero_sockaddr(&ss);
@@ -405 +406 @@
         zero_sockaddr(&ss);
 
+        if (context->internal->smb_encryption_level != SMBC_ENCRYPTLEVEL_NONE) {
+                signing_state = Required;
+        }
+
         /* have to open a new connection */
-        if ((c = cli_initialise()) == NULL) {
+        if ((c = cli_initialise_ex(signing_state)) == NULL) {
                 errno = ENOMEM;
                 return NULL;
@@ -751 +756 @@
                                    pp_workgroup, pp_username, pp_password);
         if (!ipc_srv) {
+                int signing_state = Undefined;
 
                 /* We didn't find a cached connection.  Get the password */
@@ -772 +778 @@
                         flags |= CLI_FULL_CONNECTION_USE_CCACHE;
                 }
+                if (context->internal->smb_encryption_level != SMBC_ENCRYPTLEVEL_NONE) {
+                        signing_state = Required;
+                }
 
                 zero_sockaddr(&ss);
@@ -781 +790 @@
                                                 *pp_password,
                                                 flags,
-                                                Undefined);
+                                                signing_state);
                 if (! NT_STATUS_IS_OK(nt_status)) {
                         DEBUG(1,("cli_full_connection failed! (%s)\n",