summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-23 21:59:15 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-23 21:59:15 +0200
commitf18296151d1d8774b861ef6bd751b48ef9ee2f92 (patch)
tree611553ae425f963afeaa4ba7b028bbce7415d1a6 /source3
parent9d2d66610947a78c33616b7df7e9bf0c224b73e6 (diff)
parent0b68762af7055bb3f60e28ab543dcad2736028e9 (diff)
downloadsamba-f18296151d1d8774b861ef6bd751b48ef9ee2f92.tar.gz
samba-f18296151d1d8774b861ef6bd751b48ef9ee2f92.tar.bz2
samba-f18296151d1d8774b861ef6bd751b48ef9ee2f92.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3')
-rw-r--r--source3/include/proto.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 61f864d3eb..7a5cd3b07e 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2418,7 +2418,6 @@ ADS_STATUS gp_get_machine_token(ADS_STRUCT *ads,
/* The following definitions come from librpc/ndr/util.c */
-NTSTATUS ndr_map_error2ntstatus(enum ndr_err_code ndr_err);
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);