Move libcli-util error code to top-level.

diff --git a/source4/libcli/util/doserr.c b/libcli/util/doserr.c
similarity index 100%
rename from source4/libcli/util/doserr.c
rename to libcli/util/doserr.c

diff --git a/source4/libcli/util/doserr.h b/libcli/util/doserr.h
similarity index 100%
rename from source4/libcli/util/doserr.h
rename to libcli/util/doserr.h

diff --git a/source4/libcli/util/error.h b/libcli/util/error.h
similarity index 100%
rename from source4/libcli/util/error.h
rename to libcli/util/error.h

diff --git a/source4/libcli/util/errormap.c b/libcli/util/errormap.c
similarity index 100%
rename from source4/libcli/util/errormap.c
rename to libcli/util/errormap.c

diff --git a/source4/libcli/util/nterr.c b/libcli/util/nterr.c
similarity index 100%
rename from source4/libcli/util/nterr.c
rename to libcli/util/nterr.c

diff --git a/source4/libcli/util/werror.h b/libcli/util/werror.h
similarity index 100%
rename from source4/libcli/util/werror.h
rename to libcli/util/werror.h

diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index 8d9a1f5fa8bf4063da21d487dcaa0921dd9ac8ee..887cdf81675684e19963db628de9c869a9a973e6 100644 (file)
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -5,9 +5,9 @@ mkinclude wbclient/config.mk
 
 [SUBSYSTEM::LIBSAMBA-ERRORS]
 
-LIBSAMBA-ERRORS_OBJ_FILES = $(addprefix $(libclisrcdir)/util/, doserr.o errormap.o nterr.o)
+LIBSAMBA-ERRORS_OBJ_FILES = $(addprefix ../libcli/util/, doserr.o errormap.o nterr.o)
 
-PUBLIC_HEADERS += $(addprefix $(libclisrcdir)/, util/error.h util/ntstatus.h util/doserr.h util/werror.h)
+PUBLIC_HEADERS += $(addprefix ../libcli/util/, util/error.h util/ntstatus.h util/doserr.h util/werror.h)
 
 [SUBSYSTEM::LIBCLI_LSA]
 PUBLIC_DEPENDENCIES = RPC_NDR_LSA

diff --git a/source4/torture/rpc/epmapper.c b/source4/torture/rpc/epmapper.c
index 708d46a5dcb2a167108c0913f6df7bef6a354427..e99b3b13549954fc9c5d68da4c0e4853241031ff 100644 (file)
--- a/source4/torture/rpc/epmapper.c
+++ b/source4/torture/rpc/epmapper.c
@@ -268,9 +268,7 @@ struct torture_suite *torture_rpc_epmapper(TALLOC_CTX *mem_ctx)
                                                                                          &ndr_table_epmapper);
 
        torture_rpc_tcase_add_test(tcase, "Lookup", test_Lookup);
-
        torture_rpc_tcase_add_test(tcase, "Insert", test_Insert);
-
        torture_rpc_tcase_add_test(tcase, "InqObject", test_InqObject);
 
        return suite;