Changeset 920 for trunk/server/libcli

Timestamp:

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

Author:

Silvan Scherrer

Message:

Samba Server: apply latest security patches to trunk

Location:

trunk/server

Files:

• . (modified) (1 prop)
• libcli/auth/ntlmssp.h (modified) (1 diff)
• libcli/auth/proto.h (modified) (1 diff)
• libcli/auth/smbencrypt.c (modified) (3 diffs)
• libcli/auth/wscript_build (modified) (1 diff)

trunk/server/libcli/auth/ntlmssp.h

@@ -84 +84 @@
         DATA_BLOB session_key;
 
+
         uint32_t neg_flags; /* the current state of negotiation with the NTLMSSP partner */
 

trunk/server/libcli/auth/proto.h

@@ -140 +140 @@
                       DATA_BLOB *lm_response, DATA_BLOB *nt_response, 
                       DATA_BLOB *lm_session_key, DATA_BLOB *user_session_key) ;
+
+
+
+
+
 
 /***********************************************************

trunk/server/libcli/auth/smbencrypt.c

@@ -27 +27 @@
 #include "../lib/crypto/crypto.h"
 #include "../libcli/auth/libcli_auth.h"
-#include "../librpc/gen_ndr/ntlmssp.h"
+#include "../librpc/gen_ndr/ntlmssp.h"
 
 void SMBencrypt_hash(const uint8_t lm_hash[16], const uint8_t *c8, uint8_t p24[24])
@@ -356 +356 @@
 
         /* Deliberately ignore return here.. */
-        (void)msrpc_gen(mem_ctx, &names_blob,
-                  "aaa",
-                  MsvAvNbDomainName, domain,
-                  MsvAvNbComputerName, hostname,
-                  MsvAvEOL, "");
+        if (hostname != NULL) {
+                (void)msrpc_gen(mem_ctx, &names_blob,
+                          "aaa",
+                          MsvAvNbDomainName, domain,
+                          MsvAvNbComputerName, hostname,
+                          MsvAvEOL, "");
+        } else {
+                (void)msrpc_gen(mem_ctx, &names_blob,
+                          "aa",
+                          MsvAvNbDomainName, domain,
+                          MsvAvEOL, "");
+        }
         return names_blob;
 }
@@ -516 +523 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /***********************************************************
  encode a password buffer with a unicode password.  The buffer

trunk/server/libcli/auth/wscript_build

@@ -20 +20 @@
 bld.SAMBA_SUBSYSTEM('LIBCLI_AUTH',
         source='credentials.c session.c smbencrypt.c smbdes.c',
-        public_deps='MSRPC_PARSE',
+        public_deps='MSRPC_PARSE',
         public_headers='credentials.h:domain_credentials.h'
         )