Changeset 988 for vendor/current/source4/cldap_server

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/source4/cldap_server

Files:

• cldap_server.c (modified) (10 diffs)
• cldap_server.h (modified) (1 diff)
• netlogon.c (deleted)
• rootdse.c (modified) (1 diff)
• wscript_build (modified) (1 diff)

vendor/current/source4/cldap_server/cldap_server.c

@@ -35 +35 @@
 #include "param/param.h"
 #include "../lib/tsocket/tsocket.h"
+#include "libds/common/roles.h"
+
+NTSTATUS server_service_cldapd_init(void);
 
 /*
@@ -46 +49 @@
                                        struct cldapd_server);
         struct ldap_SearchRequest *search;
+
+        if (in->ldap_msg->type == LDAP_TAG_AbandonRequest) {
+                DEBUG(10,("Got (and ignoring) CLDAP AbandonRequest from %s.",
+                          tsocket_address_string(in->src, in)));
+                talloc_free(in);
+                return;
+        }
 
         if (in->ldap_msg->type != LDAP_TAG_SearchRequest) {
@@ -79 +89 @@
         }
 
-        if (search->num_attributes == 1 &&
-            strcasecmp(search->attributes[0], "netlogon") == 0) {
-                cldapd_netlogon_request(cldap,
-                                        cldapd,
-                                        in,
-                                        in->ldap_msg->messageid,
-                                        search->tree,
-                                        in->src);
-                talloc_free(in);
-                return;
-        }
-
         cldapd_rootdse_request(cldap, cldapd, in,
                                in->ldap_msg->messageid,
@@ -115 +113 @@
                                                 &socket_address);
         if (ret != 0) {
-                status = map_nt_error_from_unix(errno);
+                status = map_nt_error_from_unix_common(errno);
                 DEBUG(0,("invalid address %s:%d - %s:%s\n",
                          address, lpcfg_cldap_port(lp_ctx),
@@ -124 +122 @@
         /* listen for unicasts on the CLDAP port (389) */
         status = cldap_socket_init(cldapd,
-                                   cldapd->task->event_ctx,
                                    socket_address,
                                    NULL,
@@ -137 +134 @@
         talloc_free(socket_address);
 
-        cldap_set_incoming_handler(cldapsock, cldapd_request_handler, cldapd);
+        cldap_set_incoming_handler(cldapsock, cldapd->task->event_ctx,
+                                   cldapd_request_handler, cldapd);
 
         return NT_STATUS_OK;
@@ -152 +150 @@
         NTSTATUS status;
 
-        num_interfaces = iface_count(ifaces);
+        num_interfaces = iface_list_count(ifaces);
 
         /* if we are allowing incoming packets from any address, then
            we need to bind to the wildcard address */
         if (!lpcfg_bind_interfaces_only(lp_ctx)) {
-                status = cldapd_add_socket(cldapd, lp_ctx, "0.0.0.0");
-                NT_STATUS_NOT_OK_RETURN(status);
+                int num_binds = 0;
+                char **wcard = iface_list_wildcard(cldapd);
+                NT_STATUS_HAVE_NO_MEMORY(wcard);
+                for (i=0; wcard[i]; i++) {
+                        status = cldapd_add_socket(cldapd, lp_ctx, wcard[i]);
+                        if (NT_STATUS_IS_OK(status)) {
+                                num_binds++;
+                        }
+                }
+                talloc_free(wcard);
+                if (num_binds == 0) {
+                        return NT_STATUS_INVALID_PARAMETER_MIX;
+                }
         }
 
@@ -164 +173 @@
            so that replies always come from the right IP */
         for (i=0; i<num_interfaces; i++) {
-                const char *address = talloc_strdup(tmp_ctx, iface_n_ip(ifaces, i));
+                const char *address = talloc_strdup(tmp_ctx, iface_list_n_ip(ifaces, i));
                 status = cldapd_add_socket(cldapd, lp_ctx, address);
                 NT_STATUS_NOT_OK_RETURN(status);
@@ -183 +192 @@
         struct interface *ifaces;
         
-        load_interfaces(task, lpcfg_interfaces(task->lp_ctx), &ifaces);
-
-        if (iface_count(ifaces) == 0) {
+        load_interface_list(task, task->lp_ctx, &ifaces);
+
+        if (iface_list_count(ifaces) == 0) {
                 task_server_terminate(task, "cldapd: no network interfaces configured", false);
                 return;
@@ -199 +208 @@
                                       false);
                 return;
-        case ROLE_DOMAIN_CONTROLLER:
+        case ROLE_ACTIVE_DIRECTORY_DC:
                 /* Yes, we want an CLDAP server */
                 break;

vendor/current/source4/cldap_server/cldap_server.h

@@ -33 +33 @@
 struct ldap_SearchRequest;
 
-/* used by netlogon DCE/RPC server */
-NTSTATUS fill_netlogon_samlogon_response(struct ldb_context *sam_ctx,
-                                         TALLOC_CTX *mem_ctx,
-                                         const char *domain,
-                                         const char *netbios_domain,
-                                         struct dom_sid *domain_sid,
-                                         const char *domain_guid,
-                                         const char *user,
-                                         uint32_t acct_control,
-                                         const char *src_address,
-                                         uint32_t version,
-                                         struct loadparm_context *lp_ctx,
-                                         struct netlogon_samlogon_response *netlogon,
-                                         bool fill_on_blank_request);
-
 #include "cldap_server/proto.h"

vendor/current/source4/cldap_server/rootdse.c

@@ -159 +159 @@
         reply.result            = &result;
 
+        /* Note: The remoteAddress should rather be set on a ldb request.
+         * We can set this savely on the context here,
+         * since cldapd_rootdse_fill operates synchronously. */
+        ldb_set_opaque(cldapd->samctx, "remoteAddress", src);
+
         cldapd_rootdse_fill(cldapd, tmp_ctx, search, &reply.response,
                             reply.result);

vendor/current/source4/cldap_server/wscript_build

@@ -11 +11 @@
 
 bld.SAMBA_SUBSYSTEM('CLDAPD',
-        source='netlogon.c rootdse.c',
+        source='rootdse.c',
         autoproto='proto.h',
-        deps='LIBCLI_CLDAP ldbsamba'
+        deps='cli_cldap ldbsamba'
         )