s3: give ../librpc/ndr/util.c its own header.

Guenther

7 files changed, 12 insertions, 7 deletions

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 58585a1bfc..a4e8ad58f7 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1570,13 +1570,6 @@ void wins_srv_tags_free(char **list);
 struct in_addr wins_srv_ip_tag(const char *tag, struct in_addr src_ip);
 unsigned wins_srv_count_tag(const char *tag);
 
-/* The following definitions come from librpc/ndr/util.c  */
-
-enum ndr_err_code ndr_push_server_id(struct ndr_push *ndr, int ndr_flags, const struct server_id *r);
-enum ndr_err_code ndr_pull_server_id(struct ndr_pull *ndr, int ndr_flags, struct server_id *r);
-void ndr_print_server_id(struct ndr_print *ndr, const char *name, const struct server_id *r);
-_PUBLIC_ void ndr_print_sockaddr_storage(struct ndr_print *ndr, const char *name, const struct sockaddr_storage *ss);
-
 /* The following definitions come from libsmb/cliconnect.c  */
 
 ADS_STATUS cli_session_setup_spnego(struct cli_state *cli, const char *user, 
diff --git a/source3/libads/ndr.c b/source3/libads/ndr.c
index 843ae3b615..603add001a 100644
--- a/source3/libads/ndr.c
+++ b/source3/libads/ndr.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "ads.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
+#include "librpc/ndr/util.h"
 
 void ndr_print_ads_auth_flags(struct ndr_print *ndr, const char *name, uint32_t r)
 {
diff --git a/source3/librpc/idl/messaging.idl b/source3/librpc/idl/messaging.idl
index faa9a6ef0c..22c34297e4 100644
--- a/source3/librpc/idl/messaging.idl
+++ b/source3/librpc/idl/messaging.idl
@@ -5,6 +5,7 @@
 */
 
 [
+  helper("../librpc/ndr/util.h"),
   pointer_default(unique)
 ]
 interface messaging
diff --git a/source3/librpc/idl/notify.idl b/source3/librpc/idl/notify.idl
index e776d5d715..592af19eeb 100644
--- a/source3/librpc/idl/notify.idl
+++ b/source3/librpc/idl/notify.idl
@@ -10,6 +10,7 @@ import "file_id.idl";
 */
 
 [
+  helper("../librpc/ndr/util.h"),
   pointer_default(unique)
 ]
 interface notify
diff --git a/source3/librpc/ndr/util.c b/source3/librpc/ndr/util.c
index b55b3d8c8c..d4e06df574 100644
--- a/source3/librpc/ndr/util.c
+++ b/source3/librpc/ndr/util.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "librpc/ndr/util.h"
 
 enum ndr_err_code ndr_push_server_id(struct ndr_push *ndr, int ndr_flags, const struct server_id *r)
 {
diff --git a/source3/librpc/ndr/util.h b/source3/librpc/ndr/util.h
new file mode 100644
index 0000000000..3f7be6bbaf
--- /dev/null
+++ b/source3/librpc/ndr/util.h
@@ -0,0 +1,7 @@
+
+/* The following definitions come from librpc/ndr/util.c  */
+
+enum ndr_err_code ndr_push_server_id(struct ndr_push *ndr, int ndr_flags, const struct server_id *r);
+enum ndr_err_code ndr_pull_server_id(struct ndr_pull *ndr, int ndr_flags, struct server_id *r);
+void ndr_print_server_id(struct ndr_print *ndr, const char *name, const struct server_id *r);
+_PUBLIC_ void ndr_print_sockaddr_storage(struct ndr_print *ndr, const char *name, const struct sockaddr_storage *ss);
diff --git a/source3/winbindd/winbindd_ndr.c b/source3/winbindd/winbindd_ndr.c
index 94aa7eb965..2f26d8d981 100644
--- a/source3/winbindd/winbindd_ndr.c
+++ b/source3/winbindd/winbindd_ndr.c
@@ -21,6 +21,7 @@
 #include "winbindd.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 #include "../librpc/gen_ndr/ndr_security.h"
+#include "librpc/ndr/util.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND