s4-loadparm: 2nd half of lp_ to lpcfg_ conversion

[kai/samba-autobuild/.git] / source4 / torture / nbt / dgram.c

diff --git a/source4/torture/nbt/dgram.c b/source4/torture/nbt/dgram.c
index 7d1199ec2ac4f2c2153e5818234e516f9d1190e0..4c0fe4bd776e223577d6e0345d4b782ff5bc23e3 100644 (file)
--- a/source4/torture/nbt/dgram.c
+++ b/source4/torture/nbt/dgram.c
@@ -80,21 +80,21 @@ static bool nbt_test_netlogon(struct torture_context *tctx)
 
        struct interface *ifaces;
 
-       name.name = lp_workgroup(tctx->lp_ctx);
+       name.name = lpcfg_workgroup(tctx->lp_ctx);
        name.type = NBT_NAME_LOGON;
        name.scope = NULL;
 
        /* do an initial name resolution to find its IP */
        torture_assert_ntstatus_ok(tctx, 
-                                  resolve_name(lp_resolve_context(tctx->lp_ctx), &name, tctx, &address, tctx->ev),
+                                  resolve_name(lpcfg_resolve_context(tctx->lp_ctx), &name, tctx, &address, tctx->ev),
                                   talloc_asprintf(tctx, "Failed to resolve %s", name.name));
 
-       load_interfaces(tctx, lp_interfaces(tctx->lp_ctx), &ifaces);
+       load_interfaces(tctx, lpcfg_interfaces(tctx->lp_ctx), &ifaces);
        myaddress = talloc_strdup(dgmsock, iface_best_ip(ifaces, address));
 
 
        socket_address = socket_address_from_strings(dgmsock, dgmsock->sock->backend_name,
-                                                    myaddress, lp_dgram_port(tctx->lp_ctx));
+                                                    myaddress, lpcfg_dgram_port(tctx->lp_ctx));
        torture_assert(tctx, socket_address != NULL, "Error getting address");
 
        /* try receiving replies on port 138 first, which will only
@@ -127,7 +127,7 @@ static bool nbt_test_netlogon(struct torture_context *tctx)
        make_nbt_name_client(&myname, TEST_NAME);
 
        dest = socket_address_from_strings(dgmsock, dgmsock->sock->backend_name, 
-                                          address, lp_dgram_port(tctx->lp_ctx));
+                                          address, lpcfg_dgram_port(tctx->lp_ctx));
        torture_assert(tctx, dest != NULL, "Error getting address");
 
        status = dgram_mailslot_netlogon_send(dgmsock, &name, dest,
@@ -173,20 +173,20 @@ static bool nbt_test_netlogon2(struct torture_context *tctx)
        struct cli_credentials *machine_credentials;
        const struct dom_sid *dom_sid;
        
-       name.name = lp_workgroup(tctx->lp_ctx);
+       name.name = lpcfg_workgroup(tctx->lp_ctx);
        name.type = NBT_NAME_LOGON;
        name.scope = NULL;
 
        /* do an initial name resolution to find its IP */
        torture_assert_ntstatus_ok(tctx, 
-                                  resolve_name(lp_resolve_context(tctx->lp_ctx), &name, tctx, &address, tctx->ev),
+                                  resolve_name(lpcfg_resolve_context(tctx->lp_ctx), &name, tctx, &address, tctx->ev),
                                   talloc_asprintf(tctx, "Failed to resolve %s", name.name));
 
-       load_interfaces(tctx, lp_interfaces(tctx->lp_ctx), &ifaces);
+       load_interfaces(tctx, lpcfg_interfaces(tctx->lp_ctx), &ifaces);
        myaddress = talloc_strdup(dgmsock, iface_best_ip(ifaces, address));
 
        socket_address = socket_address_from_strings(dgmsock, dgmsock->sock->backend_name,
-                                                    myaddress, lp_dgram_port(tctx->lp_ctx));
+                                                    myaddress, lpcfg_dgram_port(tctx->lp_ctx));
        torture_assert(tctx, socket_address != NULL, "Error getting address");
 
        /* try receiving replies on port 138 first, which will only
@@ -221,7 +221,7 @@ static bool nbt_test_netlogon2(struct torture_context *tctx)
        make_nbt_name_client(&myname, TEST_NAME);
 
        dest = socket_address_from_strings(dgmsock, dgmsock->sock->backend_name, 
-                                          address, lp_dgram_port(tctx->lp_ctx));
+                                          address, lpcfg_dgram_port(tctx->lp_ctx));
 
        torture_assert(tctx, dest != NULL, "Error getting address");
        status = dgram_mailslot_netlogon_send(dgmsock, &name, dest,
@@ -260,7 +260,7 @@ static bool nbt_test_netlogon2(struct torture_context *tctx)
        make_nbt_name_client(&myname, TEST_NAME);
 
        dest = socket_address_from_strings(dgmsock, dgmsock->sock->backend_name, 
-                                          address, lp_dgram_port(tctx->lp_ctx));
+                                          address, lpcfg_dgram_port(tctx->lp_ctx));
 
        torture_assert(tctx, dest != NULL, "Error getting address");
        status = dgram_mailslot_netlogon_send(dgmsock, &name, dest,
@@ -288,7 +288,7 @@ static bool nbt_test_netlogon2(struct torture_context *tctx)
 
        torture_assert(tctx, join_ctx != NULL,
                       talloc_asprintf(tctx, "Failed to join domain %s as %s\n",
-                                      lp_workgroup(tctx->lp_ctx), TEST_NAME));
+                                      lpcfg_workgroup(tctx->lp_ctx), TEST_NAME));
 
        dom_sid = torture_join_sid(join_ctx);
 
@@ -310,7 +310,7 @@ static bool nbt_test_netlogon2(struct torture_context *tctx)
        make_nbt_name_client(&myname, TEST_NAME);
 
        dest = socket_address_from_strings(dgmsock, dgmsock->sock->backend_name, 
-                                          address, lp_dgram_port(tctx->lp_ctx));
+                                          address, lpcfg_dgram_port(tctx->lp_ctx));
 
        torture_assert(tctx, dest != NULL, "Error getting address");
        status = dgram_mailslot_netlogon_send(dgmsock, &name, dest,
@@ -353,7 +353,7 @@ static bool nbt_test_netlogon2(struct torture_context *tctx)
        make_nbt_name_client(&myname, TEST_NAME);
 
        dest = socket_address_from_strings(dgmsock, dgmsock->sock->backend_name, 
-                                          address, lp_dgram_port(tctx->lp_ctx));
+                                          address, lpcfg_dgram_port(tctx->lp_ctx));
 
        torture_assert(tctx, dest != NULL, "Error getting address");
        status = dgram_mailslot_netlogon_send(dgmsock, &name, dest,
@@ -392,7 +392,7 @@ static bool nbt_test_netlogon2(struct torture_context *tctx)
        make_nbt_name_client(&myname, TEST_NAME);
 
        dest = socket_address_from_strings(dgmsock, dgmsock->sock->backend_name, 
-                                          address, lp_dgram_port(tctx->lp_ctx));
+                                          address, lpcfg_dgram_port(tctx->lp_ctx));
 
        torture_assert(tctx, dest != NULL, "Error getting address");
        status = dgram_mailslot_netlogon_send(dgmsock, &name, dest,
@@ -442,20 +442,20 @@ static bool nbt_test_ntlogon(struct torture_context *tctx)
 
        struct interface *ifaces;
        
-       name.name = lp_workgroup(tctx->lp_ctx);
+       name.name = lpcfg_workgroup(tctx->lp_ctx);
        name.type = NBT_NAME_LOGON;
        name.scope = NULL;
 
        /* do an initial name resolution to find its IP */
        torture_assert_ntstatus_ok(tctx, 
-                                  resolve_name(lp_resolve_context(tctx->lp_ctx), &name, tctx, &address, tctx->ev),
+                                  resolve_name(lpcfg_resolve_context(tctx->lp_ctx), &name, tctx, &address, tctx->ev),
                                   talloc_asprintf(tctx, "Failed to resolve %s", name.name));
 
-       load_interfaces(tctx, lp_interfaces(tctx->lp_ctx), &ifaces);
+       load_interfaces(tctx, lpcfg_interfaces(tctx->lp_ctx), &ifaces);
        myaddress = talloc_strdup(dgmsock, iface_best_ip(ifaces, address));
 
        socket_address = socket_address_from_strings(dgmsock, dgmsock->sock->backend_name,
-                                                    myaddress, lp_dgram_port(tctx->lp_ctx));
+                                                    myaddress, lpcfg_dgram_port(tctx->lp_ctx));
        torture_assert(tctx, socket_address != NULL, "Error getting address");
 
        /* try receiving replies on port 138 first, which will only
@@ -478,7 +478,7 @@ static bool nbt_test_ntlogon(struct torture_context *tctx)
 
        torture_assert(tctx, join_ctx != NULL,
                       talloc_asprintf(tctx, "Failed to join domain %s as %s\n",
-                                      lp_workgroup(tctx->lp_ctx), TEST_NAME));
+                                      lpcfg_workgroup(tctx->lp_ctx), TEST_NAME));
 
        /* setup a temporary mailslot listener for replies */
        dgmslot = dgram_mailslot_temp(dgmsock, NBT_MAILSLOT_GETDC,
@@ -501,7 +501,7 @@ static bool nbt_test_ntlogon(struct torture_context *tctx)
        make_nbt_name_client(&myname, TEST_NAME);
 
        dest = socket_address_from_strings(dgmsock, dgmsock->sock->backend_name, 
-                                          address, lp_dgram_port(tctx->lp_ctx));
+                                          address, lpcfg_dgram_port(tctx->lp_ctx));
        torture_assert(tctx, dest != NULL, "Error getting address");
        status = dgram_mailslot_netlogon_send(dgmsock, 
                                              &name, dest, 
@@ -545,7 +545,7 @@ static bool nbt_test_ntlogon(struct torture_context *tctx)
        make_nbt_name_client(&myname, TEST_NAME);
 
        dest = socket_address_from_strings(dgmsock, dgmsock->sock->backend_name, 
-                                          address, lp_dgram_port(tctx->lp_ctx));
+                                          address, lpcfg_dgram_port(tctx->lp_ctx));
        torture_assert(tctx, dest != NULL, "Error getting address");
        status = dgram_mailslot_netlogon_send(dgmsock, 
                                              &name, dest, 
@@ -585,7 +585,7 @@ static bool nbt_test_ntlogon(struct torture_context *tctx)
        make_nbt_name_client(&myname, TEST_NAME);
 
        dest = socket_address_from_strings(dgmsock, dgmsock->sock->backend_name, 
-                                          address, lp_dgram_port(tctx->lp_ctx));
+                                          address, lpcfg_dgram_port(tctx->lp_ctx));
        torture_assert(tctx, dest != NULL, "Error getting address");
        status = dgram_mailslot_netlogon_send(dgmsock, 
                                              &name, dest, 
@@ -622,7 +622,7 @@ static bool nbt_test_ntlogon(struct torture_context *tctx)
        make_nbt_name_client(&myname, TEST_NAME);
 
        dest = socket_address_from_strings(dgmsock, dgmsock->sock->backend_name, 
-                                          address, lp_dgram_port(tctx->lp_ctx));
+                                          address, lpcfg_dgram_port(tctx->lp_ctx));
        torture_assert(tctx, dest != NULL, "Error getting address");
        status = dgram_mailslot_netlogon_send(dgmsock, 
                                              &name, dest,