s4:lib/http: move to the toplevel

This is going to be used from the s3 RPC server soon...

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Samuel Cabrero <scabrero@suse.de>

diff --git a/source4/lib/http/gensec/basic.c b/libcli/http/gensec/basic.c
similarity index 100%
rename from source4/lib/http/gensec/basic.c
rename to libcli/http/gensec/basic.c

diff --git a/source4/lib/http/gensec/generic.c b/libcli/http/gensec/generic.c
similarity index 100%
rename from source4/lib/http/gensec/generic.c
rename to libcli/http/gensec/generic.c

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

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

diff --git a/source4/lib/http/http_auth.c b/libcli/http/http_auth.c
similarity index 100%
rename from source4/lib/http/http_auth.c
rename to libcli/http/http_auth.c

diff --git a/source4/lib/http/http_conn.c b/libcli/http/http_conn.c
similarity index 100%
rename from source4/lib/http/http_conn.c
rename to libcli/http/http_conn.c

diff --git a/source4/lib/http/http_internal.h b/libcli/http/http_internal.h
similarity index 100%
rename from source4/lib/http/http_internal.h
rename to libcli/http/http_internal.h

diff --git a/source4/lib/http/wscript_build b/libcli/http/wscript_build
similarity index 100%
rename from source4/lib/http/wscript_build
rename to libcli/http/wscript_build

diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c
index f7656e5d7cdcad74101150e46d1713dfec23e0a1..4c0ed15396f42abb757430b7a86d258dbfc99c98 100644 (file)
--- a/source4/librpc/rpc/dcerpc_connect.c
+++ b/source4/librpc/rpc/dcerpc_connect.c
@@ -35,7 +35,7 @@
 #include "auth/credentials/credentials.h"
 #include "param/param.h"
 #include "libcli/resolve/resolve.h"
-#include "lib/http/http.h"
+#include "libcli/http/http.h"
 #include "lib/util/util_net.h"
 
 struct dcerpc_pipe_connect {

diff --git a/source4/librpc/rpc/dcerpc_roh.c b/source4/librpc/rpc/dcerpc_roh.c
index 9280c84f79a270b16ad3a0494ae76aec47497e84..a5320c5144de4417113287dddb93bbe458953958 100644 (file)
--- a/source4/librpc/rpc/dcerpc_roh.c
+++ b/source4/librpc/rpc/dcerpc_roh.c
@@ -32,7 +32,7 @@
 #include "librpc/rpc/dcerpc_roh.h"
 #include "librpc/rpc/dcerpc_proto.h"
 #include "lib/param/param.h"
-#include "lib/http/http.h"
+#include "libcli/http/http.h"
 
 static ssize_t tstream_roh_pending_bytes(struct tstream_context *stream);
 static struct tevent_req * tstream_roh_readv_send(

diff --git a/source4/librpc/rpc/dcerpc_roh_channel_in.c b/source4/librpc/rpc/dcerpc_roh_channel_in.c
index cc53c2a7f419e9602ecd3dedfd0e639630c3b093..bc630f77e4298e70c3e35700e84125b7aa0bba4a 100644 (file)
--- a/source4/librpc/rpc/dcerpc_roh_channel_in.c
+++ b/source4/librpc/rpc/dcerpc_roh_channel_in.c
@@ -37,7 +37,7 @@
 #include "librpc/rpc/dcerpc.h"
 #include "librpc/rpc/dcerpc_roh.h"
 #include "librpc/rpc/dcerpc_proto.h"
-#include "lib/http/http.h"
+#include "libcli/http/http.h"
 
 struct roh_connect_channel_state {
        struct tevent_context           *ev;

diff --git a/source4/librpc/rpc/dcerpc_roh_channel_out.c b/source4/librpc/rpc/dcerpc_roh_channel_out.c
index 491bbadfa693be5616919fc8f410ecd0f4262612..4a227823f4a5133d9bd67f017dde4ede1fa8bb3f 100644 (file)
--- a/source4/librpc/rpc/dcerpc_roh_channel_out.c
+++ b/source4/librpc/rpc/dcerpc_roh_channel_out.c
@@ -37,7 +37,7 @@
 #include "librpc/rpc/dcerpc.h"
 #include "librpc/rpc/dcerpc_roh.h"
 #include "librpc/rpc/dcerpc_proto.h"
-#include "lib/http/http.h"
+#include "libcli/http/http.h"
 
 struct roh_connect_channel_state {
        struct tevent_context           *ev;

diff --git a/wscript_build b/wscript_build
index ac6c044a605b90cc762dca466ef4d6dfff1303a3..f9e033c0dab8cbc8e7356e3f93f47fc3ebbd34d8 100644 (file)
--- a/wscript_build
+++ b/wscript_build
@@ -71,7 +71,6 @@ bld.RECURSE('source4/lib/registry')
 bld.RECURSE('source4/lib/messaging')
 bld.RECURSE('source4/lib/events')
 bld.RECURSE('source4/lib/cmdline')
-bld.RECURSE('source4/lib/http')
 if bld.CHECK_FOR_THIRD_PARTY():
     bld.RECURSE('third_party')
 bld.RECURSE('source4/lib/stream')
@@ -117,6 +116,7 @@ bld.RECURSE('libcli/echo')
 bld.RECURSE('libcli/dns')
 bld.RECURSE('libcli/samsync')
 bld.RECURSE('libcli/registry')
+bld.RECURSE('libcli/http')
 bld.RECURSE('lib/mscat')
 bld.RECURSE('source4/lib/policy')
 bld.RECURSE('libcli/named_pipe_auth')