diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
| commit | 5209a846a9157e649fcdcb561f7eaf19c8c0e465 (patch) | |
| tree | b0a7e52b5646c8eec182dbc391e7934b6804488c /source4/torture/local/local.c | |
| parent | 625359b2e266105022309df8985720108ecd6f67 (diff) | |
| parent | 2ee8d29d22bcb1c350ab59d71b0aee548489bc9c (diff) | |
| download | samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.gz samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.bz2 samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv
Conflicts:
source4/lib/registry/ldb.c
source4/rpc_server/winreg/rpc_winreg.c
Diffstat (limited to 'source4/torture/local/local.c')
| -rw-r--r-- | source4/torture/local/local.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/torture/local/local.c b/source4/torture/local/local.c index bf53df4a11..6b38cd6db0 100644 --- a/source4/torture/local/local.c +++ b/source4/torture/local/local.c @@ -23,7 +23,7 @@ #include "torture/ndr/ndr.h" #include "torture/ndr/proto.h" #include "torture/auth/proto.h" -#include "lib/crypto/test_proto.h" +#include "../lib/crypto/test_proto.h" #include "lib/registry/tests/proto.h" /* ignore me */ static struct torture_suite * @@ -36,6 +36,8 @@ torture_local_util_strlist, torture_local_util_file, torture_local_util_str, + torture_local_util_time, + torture_local_util_data_blob, torture_local_idtree, torture_local_genrand, torture_local_iconv, |