s4-smbtorture: move all LookupNames tests into RPC-LSA-LOOKUPNAMES.

Guenther

diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index e4234c7f47b48b7b808712afcc0daba4d2aa66f3..0ce75d8a86bfbb0341b4c25c630e29c97cb1708c 100644 (file)
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -2611,13 +2611,6 @@ bool torture_rpc_lsa(struct torture_context *tctx)
                if (!join) {
                        ret = false;
                }
                if (!join) {
                        ret = false;
                }

-               if (!test_LookupNames_wellknown(p, tctx, handle)) {
-                       ret = false;
-               }
-
-               if (!test_LookupNames_bogus(p, tctx, handle)) {
-                       ret = false;
-               }

 
                if (!test_LookupSids_async(p, tctx, handle)) {
                        ret = false;
 
                if (!test_LookupSids_async(p, tctx, handle)) {
                        ret = false;


@@ -2728,6 +2721,14 @@ static bool testcase_LookupNames(struct torture_context *tctx,
                ret = false;
        }
 
                ret = false;
        }
 

+       if (!test_LookupNames_wellknown(p, tctx, handle)) {
+               ret = false;
+       }
+
+       if (!test_LookupNames_bogus(p, tctx, handle)) {
+               ret = false;
+       }
+

        if (!test_lsa_Close(p, tctx, handle)) {
                ret = false;
        }
        if (!test_lsa_Close(p, tctx, handle)) {
                ret = false;
        }