summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--librpc/ndr/libndr.h1
-rw-r--r--librpc/ndr/ndr.c5
-rw-r--r--source3/include/proto.h1
-rw-r--r--source3/librpc/ndr/util.c3
4 files changed, 6 insertions, 4 deletions
diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h
index ff20755700..302a5ec773 100644
--- 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 63b2cc323c..068e07f84a 100644
--- 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 ddb5c5e68b..1e90479fcc 100644
--- 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 ada98108e5..13fe6e175a 100644
--- 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 };