diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-04-15 14:36:13 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-04-15 14:36:13 +1000 |
| commit | 4678d1c6f4de1af9144de37d6d4b35c6c39e254d (patch) | |
| tree | 94e58cf112ef34412bc5521f4bc9f56424ee967f /source4 | |
| parent | 86b50a0e6eacc14e157602811f30f11dccc471a8 (diff) | |
| parent | 92d321006d1748ac47cf9b52330212f4ae03f502 (diff) | |
| download | samba-4678d1c6f4de1af9144de37d6d4b35c6c39e254d.tar.gz samba-4678d1c6f4de1af9144de37d6d4b35c6c39e254d.tar.bz2 samba-4678d1c6f4de1af9144de37d6d4b35c6c39e254d.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into libcli-auth-merge-without-netlogond
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/include/includes.h | 4 | ||||
| -rw-r--r-- | source4/setup/provision_group_policy.ldif | 10 | ||||
| -rw-r--r-- | source4/torture/rpc/spoolss.c | 33 | ||||
| -rw-r--r-- | source4/torture/rpc/svcctl.c | 3 |
4 files changed, 49 insertions, 1 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h index d9b7759e7e..4862a62e22 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -64,6 +64,10 @@ /* String routines */ #include "../lib/util/safe_string.h" +/* Thread functions. */ +#include "../lib/util/smb_threads.h" +#include "../lib/util/smb_threads_internal.h" + #if 0 /* darn, we can't do this now that we don't link the ldb tools to all the smb libs */ #define TALLOC_ABORT(reason) smb_panic(reason) diff --git a/source4/setup/provision_group_policy.ldif b/source4/setup/provision_group_policy.ldif index 0f3e1f15f9..98c09b997e 100644 --- a/source4/setup/provision_group_policy.ldif +++ b/source4/setup/provision_group_policy.ldif @@ -1,3 +1,13 @@ +dn: CN=Default Domain Policy,CN=System,${DOMAINDN} +objectClass: top +objectClass: domainPolicy +isCriticalSystemObject: TRUE + +dn: CN=AppCategories,CN=Default Domain Policy,CN=System,${DOMAINDN} +objectClass: top +objectClass: classStore +isCriticalSystemObject: TRUE + dn: CN={${POLICYGUID}},CN=Policies,CN=System,${DOMAINDN} objectClass: top objectClass: container diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index b1889704a7..d17b3c7b60 100644 --- a/source4/torture/rpc/spoolss.c +++ b/source4/torture/rpc/spoolss.c @@ -1101,7 +1101,38 @@ static bool test_SetJob(struct torture_context *tctx, r.in.ctr = NULL; r.in.command = command; - torture_comment(tctx, "Testing SetJob\n"); + switch (command) { + case SPOOLSS_JOB_CONTROL_PAUSE: + torture_comment(tctx, "Testing SetJob: SPOOLSS_JOB_CONTROL_PAUSE\n"); + break; + case SPOOLSS_JOB_CONTROL_RESUME: + torture_comment(tctx, "Testing SetJob: SPOOLSS_JOB_CONTROL_RESUME\n"); + break; + case SPOOLSS_JOB_CONTROL_CANCEL: + torture_comment(tctx, "Testing SetJob: SPOOLSS_JOB_CONTROL_CANCEL\n"); + break; + case SPOOLSS_JOB_CONTROL_RESTART: + torture_comment(tctx, "Testing SetJob: SPOOLSS_JOB_CONTROL_RESTART\n"); + break; + case SPOOLSS_JOB_CONTROL_DELETE: + torture_comment(tctx, "Testing SetJob: SPOOLSS_JOB_CONTROL_DELETE\n"); + break; + case SPOOLSS_JOB_CONTROL_SEND_TO_PRINTER: + torture_comment(tctx, "Testing SetJob: SPOOLSS_JOB_CONTROL_SEND_TO_PRINTER\n"); + break; + case SPOOLSS_JOB_CONTROL_LAST_PAGE_EJECTED: + torture_comment(tctx, "Testing SetJob: SPOOLSS_JOB_CONTROL_LAST_PAGE_EJECTED\n"); + break; + case SPOOLSS_JOB_CONTROL_RETAIN: + torture_comment(tctx, "Testing SetJob: SPOOLSS_JOB_CONTROL_RETAIN\n"); + break; + case SPOOLSS_JOB_CONTROL_RELEASE: + torture_comment(tctx, "Testing SetJob: SPOOLSS_JOB_CONTROL_RELEASE\n"); + break; + default: + torture_comment(tctx, "Testing SetJob\n"); + break; + } status = dcerpc_spoolss_SetJob(p, tctx, &r); torture_assert_ntstatus_ok(tctx, status, "SetJob failed"); diff --git a/source4/torture/rpc/svcctl.c b/source4/torture/rpc/svcctl.c index e38e8daba1..631e367c3b 100644 --- a/source4/torture/rpc/svcctl.c +++ b/source4/torture/rpc/svcctl.c @@ -374,6 +374,9 @@ static bool test_EnumServicesStatus(struct torture_context *tctx, struct dcerpc_ for(i = 0; i < services_returned; i++) { + torture_assert(tctx, service[i].service_name, + "Service without name returned!"); + printf("%-20s \"%s\", Type: %d, State: %d\n", service[i].service_name, service[i].display_name, service[i].status.type, service[i].status.state); |