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

[bbaumbach/samba-autobuild/.git] / source4 / torture / rpc / wkssvc.c

diff --git a/source4/torture/rpc/wkssvc.c b/source4/torture/rpc/wkssvc.c
index a8556c58cf721c11aa44a741c56839d13cd55381..3121213fca500cdc83a62240f253564cd7ad2dfa 100644 (file)
--- a/source4/torture/rpc/wkssvc.c
+++ b/source4/torture/rpc/wkssvc.c
@@ -217,7 +217,7 @@ static bool test_NetrWkstaUserGetInfo(struct torture_context *tctx,
        NTSTATUS status;
        struct wkssvc_NetrWkstaUserGetInfo r;
        union wkssvc_NetrWkstaUserInfo info;
-       const char *dom = lp_workgroup(tctx->lp_ctx);
+       const char *dom = lpcfg_workgroup(tctx->lp_ctx);
        struct cli_credentials *creds = cmdline_credentials;
        const char *user = cli_credentials_get_username(creds);
        int i;
@@ -495,7 +495,7 @@ static bool test_NetrLogonDomainNameAdd(struct torture_context *tctx,
        struct wkssvc_NetrLogonDomainNameAdd r;
        struct dcerpc_binding_handle *b = p->binding_handle;
 
-       r.in.domain_name = lp_workgroup(tctx->lp_ctx);
+       r.in.domain_name = lpcfg_workgroup(tctx->lp_ctx);
 
        torture_comment(tctx, "Testing NetrLogonDomainNameAdd\n");
 
@@ -514,7 +514,7 @@ static bool test_NetrLogonDomainNameDel(struct torture_context *tctx,
        struct wkssvc_NetrLogonDomainNameDel r;
        struct dcerpc_binding_handle *b = p->binding_handle;
 
-       r.in.domain_name = lp_workgroup(tctx->lp_ctx);
+       r.in.domain_name = lpcfg_workgroup(tctx->lp_ctx);
 
        torture_comment(tctx, "Testing NetrLogonDomainNameDel\n");
 
@@ -610,7 +610,7 @@ static bool test_NetrValidateName(struct torture_context *tctx,
        for (i=0; i<ARRAY_SIZE(levels); i++) {
 
                r.in.server_name = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
-               r.in.name = lp_workgroup(tctx->lp_ctx);
+               r.in.name = lpcfg_workgroup(tctx->lp_ctx);
                r.in.Account = NULL;
                r.in.Password = NULL;
                r.in.name_type = levels[i];
@@ -641,7 +641,7 @@ static bool test_NetrValidateName2(struct torture_context *tctx,
        for (i=0; i<ARRAY_SIZE(levels); i++) {
 
                r.in.server_name = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
-               r.in.name = lp_workgroup(tctx->lp_ctx);
+               r.in.name = lpcfg_workgroup(tctx->lp_ctx);
                r.in.Account = NULL;
                r.in.EncryptedPassword = NULL;
                r.in.name_type = levels[i];
@@ -1075,7 +1075,7 @@ static bool test_NetrGetJoinableOus(struct torture_context *tctx,
        struct dcerpc_binding_handle *b = p->binding_handle;
 
        r.in.server_name = dcerpc_server_name(p);
-       r.in.domain_name = lp_workgroup(tctx->lp_ctx);
+       r.in.domain_name = lpcfg_workgroup(tctx->lp_ctx);
        r.in.Account = NULL;
        r.in.unknown = NULL;
        r.in.num_ous = r.out.num_ous = &num_ous;
@@ -1102,7 +1102,7 @@ static bool test_NetrGetJoinableOus2(struct torture_context *tctx,
        struct dcerpc_binding_handle *b = p->binding_handle;
 
        r.in.server_name = dcerpc_server_name(p);
-       r.in.domain_name = lp_workgroup(tctx->lp_ctx);
+       r.in.domain_name = lpcfg_workgroup(tctx->lp_ctx);
        r.in.Account = NULL;
        r.in.EncryptedPassword = NULL;
        r.in.num_ous = r.out.num_ous = &num_ous;
@@ -1130,7 +1130,7 @@ static bool test_NetrUnjoinDomain(struct torture_context *tctx,
        struct dcerpc_binding_handle *b = p->binding_handle;
 
        admin_account = talloc_asprintf(tctx, "%s\\%s",
-                                       lp_workgroup(tctx->lp_ctx),
+                                       lpcfg_workgroup(tctx->lp_ctx),
                                        user);
 
        r.in.server_name = dcerpc_server_name(p);
@@ -1159,11 +1159,11 @@ static bool test_NetrJoinDomain(struct torture_context *tctx,
        struct dcerpc_binding_handle *b = p->binding_handle;
 
        admin_account = talloc_asprintf(tctx, "%s\\%s",
-                                       lp_workgroup(tctx->lp_ctx),
+                                       lpcfg_workgroup(tctx->lp_ctx),
                                        user);
 
        r.in.server_name = dcerpc_server_name(p);
-       r.in.domain_name = lp_dnsdomain(tctx->lp_ctx);
+       r.in.domain_name = lpcfg_dnsdomain(tctx->lp_ctx);
        r.in.account_ou = NULL;
        r.in.Account = admin_account;
        r.in.password = NULL;