diff options
| author | Jeremy Allison <jra@samba.org> | 2009-10-17 10:36:33 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-10-17 10:36:33 -0700 |
| commit | 7c51fa6d699a653cafa90df8e44911b576118ebd (patch) | |
| tree | 543bf9ca698e03eff81104898b33e77f1abed319 /source4/torture/local | |
| parent | cc3a6770c77ec8fe1cd63bf4c682853c56201f0c (diff) | |
| parent | 3e3214fd91471bca5b6c4d3782e922d252d588fb (diff) | |
| download | samba-7c51fa6d699a653cafa90df8e44911b576118ebd.tar.gz samba-7c51fa6d699a653cafa90df8e44911b576118ebd.tar.bz2 samba-7c51fa6d699a653cafa90df8e44911b576118ebd.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'source4/torture/local')
| -rw-r--r-- | source4/torture/local/config.mk | 1 | ||||
| -rw-r--r-- | source4/torture/local/local.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk index 1c3a721ac9..7633d6c4db 100644 --- a/source4/torture/local/config.mk +++ b/source4/torture/local/config.mk @@ -41,6 +41,7 @@ TORTURE_LOCAL_OBJ_FILES = \ $(torturesrcdir)/../../lib/util/tests/parmlist.o \ $(torturesrcdir)/../../lib/util/tests/str.o \ $(torturesrcdir)/../../lib/util/tests/time.o \ + $(torturesrcdir)/../../lib/util/tests/asn1_tests.o \ $(torturesrcdir)/../../lib/util/tests/data_blob.o \ $(torturesrcdir)/../../lib/util/tests/file.o \ $(torturesrcdir)/../../lib/util/tests/genrand.o \ diff --git a/source4/torture/local/local.c b/source4/torture/local/local.c index 4180d308da..8c6fd5e10c 100644 --- a/source4/torture/local/local.c +++ b/source4/torture/local/local.c @@ -39,6 +39,7 @@ torture_local_util_str, torture_local_util_time, torture_local_util_data_blob, + torture_local_util_asn1, torture_local_idtree, torture_local_genrand, torture_local_iconv, |