Make the updated RPC-LSA pass against Win2008, and Samba4 to match

diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index 84f11ef3a8f7564b6c762acb9da88017004e8a0a..b009d2f2f8a2466ab649876d5414ddd1a37b0c6c 100644 (file)
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -488,6 +488,7 @@ static NTSTATUS dcesrv_lsa_QueryInfoPolicy2(struct dcesrv_call_state *dce_call,
 
        case LSA_POLICY_INFO_MOD:
        case LSA_POLICY_INFO_AUDIT_FULL_SET:
+       case LSA_POLICY_INFO_AUDIT_FULL_QUERY:
                /* windows gives INVALID_PARAMETER */
                r->out.info = NULL;
                return NT_STATUS_INVALID_PARAMETER;

diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index 875a85752225dfda1040060775361a145ae2e646..69df965f1975e105415a1e2e235f094e9d234bac 100644 (file)
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -1727,7 +1727,7 @@ static bool test_QueryForestTrustInformation(struct dcerpc_pipe *p,
        status = dcerpc_lsa_lsaRQueryForestTrustInformation(p, tctx, &r);
 
        if (!NT_STATUS_IS_OK(status)) {
-               printf("lsaRQueryForestTrustInformation failed - %s\n", nt_errstr(status));
+               printf("lsaRQueryForestTrustInformation of %s failed - %s\n", trusted_domain_name, nt_errstr(status));
                ret = false;
        }
 
@@ -2337,6 +2337,7 @@ static bool test_QueryInfoPolicyCalls(    bool version2,
                switch (i) {
                case LSA_POLICY_INFO_MOD:
                case LSA_POLICY_INFO_AUDIT_FULL_SET:
+               case LSA_POLICY_INFO_AUDIT_FULL_QUERY:
                        if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER)) {
                                printf("Server should have failed level %u: %s\n", i, nt_errstr(status));
                                ret = false;