Changeset 745 for trunk/server/source4/libnet/libnet_site.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/libnet/libnet_site.c (modified) (13 diffs)

trunk/server/source4/libnet/libnet_site.c

@@ -21 +21 @@
 #include "libnet/libnet.h"
 #include "libcli/cldap/cldap.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
-#include "librpc/rpc/dcerpc.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "libcli/resolve/resolve.h"
 #include "param/param.h"
+#include "lib/tsocket/tsocket.h"
 
 /**
@@ -42 +42 @@
         struct cldap_socket *cldap = NULL;
         struct cldap_netlogon search;
+        int ret;
+        struct tsocket_address *dest_address;
 
         tmp_ctx = talloc_named(ctx, 0, "libnet_FindSite temp context");
@@ -51 +53 @@
         /* Resolve the site name. */
         ZERO_STRUCT(search);
-        search.in.dest_address = r->in.dest_address;
-        search.in.dest_port = r->in.cldap_port;
+        search.in.dest_address = NULL;
+        search.in.dest_port = 0;
         search.in.acct_control = -1;
         search.in.version = NETLOGON_NT_VERSION_5 | NETLOGON_NT_VERSION_5EX;
         search.in.map_response = true;
 
+        ret = tsocket_address_inet_from_strings(tmp_ctx, "ip",
+                                                r->in.dest_address,
+                                                r->in.cldap_port,
+                                                &dest_address);
+        if (ret != 0) {
+                r->out.error_string = NULL;
+                status = map_nt_error_from_unix(errno);
+                return status;
+        }
+
         /* we want to use non async calls, so we're not passing an event context */
-        status = cldap_socket_init(tmp_ctx, NULL, NULL, NULL, &cldap);//TODO
+        status = cldap_socket_init(tmp_ctx, NULL, NULL, dest_address, &cldap);
         if (!NT_STATUS_IS_OK(status)) {
                 talloc_free(tmp_ctx);
@@ -64 +76 @@
                 return status;
         }
-        status = cldap_netlogon(cldap, lp_iconv_convenience(lctx->lp_ctx), tmp_ctx, &search);
+        status = cldap_netlogon(cldap, tmp_ctx, &search);
         if (!NT_STATUS_IS_OK(status)
             || !search.out.netlogon.data.nt5_ex.client_site) {
@@ -157 +169 @@
 
         make_nbt_name_client(&name, libnet_r->out.samr_binding->host);
-        status = resolve_name(lp_resolve_context(ctx->lp_ctx), &name, r, &dest_addr, ctx->event_ctx);
+        status = resolve_name(lpcfg_resolve_context(ctx->lp_ctx), &name, r, &dest_addr, ctx->event_ctx);
         if (!NT_STATUS_IS_OK(status)) {
                 libnet_r->out.error_string = NULL;
@@ -168 +180 @@
         r->in.netbios_name = libnet_r->in.netbios_name;
         r->in.domain_dn_str = libnet_r->out.domain_dn_str;
-        r->in.cldap_port = lp_cldap_port(ctx->lp_ctx);
+        r->in.cldap_port = lpcfg_cldap_port(ctx->lp_ctx);
 
         status = libnet_FindSite(tmp_ctx, ctx, r);
@@ -192 +204 @@
 
         rtn = ldb_msg_add_string(msg, "objectClass", "server");
-        if (rtn != 0) {
+        if (rtn != LDB_SUCCESS) {
                 libnet_r->out.error_string = NULL;
                 talloc_free(tmp_ctx);
@@ -198 +210 @@
         }
         rtn = ldb_msg_add_string(msg, "systemFlags", "50000000");
-        if (rtn != 0) {
+        if (rtn != LDB_SUCCESS) {
                 libnet_r->out.error_string = NULL;
                 talloc_free(tmp_ctx);
@@ -204 +216 @@
         }
         rtn = ldb_msg_add_string(msg, "serverReference", libnet_r->out.account_dn_str);
-        if (rtn != 0) {
+        if (rtn != LDB_SUCCESS) {
                 libnet_r->out.error_string = NULL;
                 talloc_free(tmp_ctx);
@@ -223 +235 @@
         rtn = ldb_add(remote_ldb, msg);
         if (rtn == LDB_ERR_ENTRY_ALREADY_EXISTS) {
-                int i;
+                unsigned int i;
 
                 /* make a 'modify' msg, and only for serverReference */
@@ -235 +247 @@
 
                 rtn = ldb_msg_add_string(msg, "serverReference",libnet_r->out.account_dn_str);
-                if (rtn != 0) {
+                if (rtn != LDB_SUCCESS) {
                         libnet_r->out.error_string = NULL;
                         talloc_free(tmp_ctx);
@@ -248 +260 @@
 
                 rtn = ldb_modify(remote_ldb, msg);
-                if (rtn != 0) {
+                if (rtn != LDB_SUCCESS) {
                         libnet_r->out.error_string
                                 = talloc_asprintf(libnet_r,
@@ -257 +269 @@
                         return NT_STATUS_INTERNAL_DB_CORRUPTION;
                 }
-        } else if (rtn != 0) {
+        } else if (rtn != LDB_SUCCESS) {
                 libnet_r->out.error_string
                         = talloc_asprintf(libnet_r,