ndr: move null_ndr_syntax_id to the common libndr location.

Guenther

diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h
index ff20755700d4890660971315a97704a538c923d1..302a5ec7739287aaf6e7e6ecf6c3a050fea9b5c9 100644 (file)
--- a/librpc/ndr/libndr.h
+++ b/librpc/ndr/libndr.h
@@ -328,6 +328,7 @@ typedef void (*ndr_print_function_t)(struct ndr_print *, const char *, int, cons
 
 extern const struct ndr_syntax_id ndr_transfer_syntax;
 extern const struct ndr_syntax_id ndr64_transfer_syntax;
+extern const struct ndr_syntax_id null_ndr_syntax_id;
 
 struct ndr_interface_call {
        const char *name;

diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c
index 63b2cc323c6c2df2e89d3d7ba1f521588bf1bcb8..068e07f84a3312af1af08ba0fd44fbda69634121 100644 (file)
--- a/librpc/ndr/ndr.c
+++ b/librpc/ndr/ndr.c
@@ -46,6 +46,11 @@ const struct ndr_syntax_id ndr64_transfer_syntax = {
   1
 };
 
+const struct ndr_syntax_id null_ndr_syntax_id = {
+  { 0, 0, 0, { 0, 0 }, { 0, 0, 0, 0, 0, 0 } },
+  0
+};
+
 /*
   work out the number of bytes needed to align on a n byte boundary
 */

diff --git a/source3/include/proto.h b/source3/include/proto.h
index ddb5c5e68b71a7845dbf85374717b831ab8be2e8..1e90479fcc0c42d5075a4bf32c8884f4c5b0a8ec 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1586,7 +1586,6 @@ enum ndr_err_code ndr_pull_server_id(struct ndr_pull *ndr, int ndr_flags, struct
 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);
 const char *ndr_errstr(enum ndr_err_code err);
-extern const struct ndr_syntax_id null_ndr_syntax_id;
 
 /* The following definitions come from libsmb/cliconnect.c  */
 

diff --git a/source3/librpc/ndr/util.c b/source3/librpc/ndr/util.c
index ada98108e50dbd422d94302a4b22de332709d4be..13fe6e175a4d2487e173359fbd23e17ef3e95da9 100644 (file)
--- a/source3/librpc/ndr/util.c
+++ b/source3/librpc/ndr/util.c
@@ -141,6 +141,3 @@ _PUBLIC_ void ndr_print_sockaddr_storage(struct ndr_print *ndr, const char *name
        char addr[INET6_ADDRSTRLEN];
        ndr->print(ndr, "%-25s: %s", name, print_sockaddr(addr, sizeof(addr), ss));
 }
-
-const struct ndr_syntax_id null_ndr_syntax_id =
-{ { 0, 0, 0, { 0, 0 }, { 0, 0, 0, 0, 0, 0 } }, 0 };