Changeset 988 for vendor/current/libcli/netlogon

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

Location:

vendor/current/libcli/netlogon

Files:

• ndr_netlogon.c (deleted)
• ndr_netlogon_proto.h (deleted)
• netlogon.c (modified) (1 diff)
• netlogon.h (modified) (2 diffs)
• wscript_build (modified) (1 diff)

vendor/current/libcli/netlogon/netlogon.c

@@ -92 +92 @@
                         ntver);
                 if (ndr->offset < ndr->data_size) {
-                        ndr_err = ndr_pull_error(ndr, NDR_ERR_UNREAD_BYTES,
-                                                 "not all bytes consumed ofs[%u] size[%u]",
-                                                 ndr->offset, ndr->data_size);
+                        TALLOC_FREE(ndr);
+                        /*
+                         * We need to handle a bug in FreeIPA (at least <= 4.1.2).
+                         *
+                         * They include the ip address information without setting
+                         * NETLOGON_NT_VERSION_5EX_WITH_IP, while using
+                         * ndr_push_NETLOGON_SAM_LOGON_RESPONSE_EX instead of
+                         * ndr_push_NETLOGON_SAM_LOGON_RESPONSE_EX_with_flags.
+                         */
+                        ndr_err = ndr_pull_struct_blob_all(data, mem_ctx,
+                                                   &response->data.nt5,
+                                                   (ndr_pull_flags_fn_t)ndr_pull_NETLOGON_SAM_LOGON_RESPONSE_EX);
                 }
                 response->ntver = NETLOGON_NT_VERSION_5EX;

vendor/current/libcli/netlogon/netlogon.h

@@ -27 +27 @@
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_security.h"
-#include "librpc/gen_ndr/ndr_svcctl.h"
-#include "librpc/gen_ndr/ndr_samr.h"
-
-struct netlogon_samlogon_response
-{
-        uint32_t ntver;
-        union {
-                struct NETLOGON_SAM_LOGON_RESPONSE_NT40 nt4;
-                struct NETLOGON_SAM_LOGON_RESPONSE nt5;
-                struct NETLOGON_SAM_LOGON_RESPONSE_EX nt5_ex;
-        } data;
-
-};
 
 struct nbt_netlogon_response
@@ -52 +39 @@
 
 #include "../libcli/netlogon/netlogon_proto.h"
-#include "../libcli/netlogon/ndr_netlogon_proto.h"
 #endif /* __CLDAP_SERVER_PROTO_H__ */

vendor/current/libcli/netlogon/wscript_build

@@ -1 +1 @@
 #!/usr/bin/env python
-
-bld.SAMBA_SUBSYSTEM('LIBCLI_NDR_NETLOGON',
-        source='ndr_netlogon.c',
-        public_deps='ndr NDR_SECURITY'
-        )
 
 bld.SAMBA_SUBSYSTEM('LIBCLI_NETLOGON',
         source='netlogon.c',
-        public_deps='samba-util LIBCLI_NDR_NETLOGON'
+        public_deps='samba-util ndr_nbt'
         )