r7734: A few missing pieces...

rafal
(This used to be commit 15e2a67fe08daa722c55cd3afd46e838eb653e22)

diff --git a/source4/libnet/config.mk b/source4/libnet/config.mk
index 3b95f9ba60d36b57c32a12a837794b91477ef044..5b9073e2f5a4964aefa018f31b55cc3f101263e1 100644 (file)
--- a/source4/libnet/config.mk
+++ b/source4/libnet/config.mk
@@ -11,10 +11,10 @@ ADD_OBJ_FILES = \
                libnet/libnet_vampire.o \
                libnet/libnet_user.o \
                libnet/libnet_share.o \
+               libnet/libnet_lookup.o \
                libnet/userinfo.o \
                libnet/userman.o \
-               libnet/domain.o \
-               libnet/lookup.o
+               libnet/domain.o 
 
 REQUIRED_SUBSYSTEMS = RPC_NDR_SAMR RPC_NDR_SRVSVC LIBCLI_COMPOSITE LIBCLI_RESOLVE LIBSAMBA3
 # End SUBSYSTEM LIBNET

diff --git a/source4/libnet/libnet.h b/source4/libnet/libnet.h
index 092d09599f5f7f394a4a533ca83a926afe741064..470c98dca955f1f0440ea7d3ccc388f250819973 100644 (file)
--- a/source4/libnet/libnet.h
+++ b/source4/libnet/libnet.h
@@ -43,3 +43,4 @@ struct libnet_context {
 #include "libnet/libnet_vampire.h"
 #include "libnet/libnet_user.h"
 #include "libnet/libnet_share.h"
+#include "libnet/libnet_lookup.h"

diff --git a/source4/libnet/libnet_lookup.c b/source4/libnet/libnet_lookup.c
index 05923ce177b163ad2aa4dde872cfce130d9e3ef7..c6dc6d07417c3d7aadca8a3b16d782e9cabbefc6 100644 (file)
--- a/source4/libnet/libnet_lookup.c
+++ b/source4/libnet/libnet_lookup.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
 #include "lib/events/events.h"
+#include "libnet/libnet.h"
 #include "libcli/composite/composite.h"
 #include "libcli/composite/monitor.h"
 #include "libnet/composite.h"
@@ -38,7 +39,7 @@ struct lookup_state {
 };
 
 
-struct composite_context *libnet_Lookup_send(struct libnet_lookup *io)
+struct composite_context *libnet_Lookup_send(struct libnet_Lookup *io)
 {
        struct composite_context *c;
        struct lookup_state *s;
@@ -76,7 +77,7 @@ failed:
 
 
 NTSTATUS libnet_Lookup_recv(struct composite_context *c, TALLOC_CTX *mem_ctx,
-                           struct libnet_lookup *io)
+                           struct libnet_Lookup *io)
 {
        NTSTATUS status;
        struct lookup_state *s;
@@ -88,7 +89,7 @@ NTSTATUS libnet_Lookup_recv(struct composite_context *c, TALLOC_CTX *mem_ctx,
 }
 
 
-NTSTATUS libnet_Lookup(TALLOC_CTX *mem_ctx, struct libnet_lookup *io)
+NTSTATUS libnet_Lookup(TALLOC_CTX *mem_ctx, struct libnet_Lookup *io)
 {
        struct composite_context *c = libnet_Lookup_send(io);
        return libnet_Lookup_recv(c, mem_ctx, io);