diff options
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | source3/Makefile.in | 10 | ||||
-rw-r--r-- | source3/libnet/libnet_proto.h | 46 |
3 files changed, 47 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore index 0b260d5e0b..1d1513999b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,6 @@ *.patch semantic.cache source/TAGS -source/libnet/libnet_proto.h source/include/build_env.h source/include/config.h source/include/config.h.in diff --git a/source3/Makefile.in b/source3/Makefile.in index dbefd4add0..f6709e07d0 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -2300,15 +2300,13 @@ clean: delheaders # removed by "make clean" this will always be run when you do anything # afterwards. proto_exists: include/build_env.h \ - libnet/libnet_proto.h \ smbd/build_options.c @touch proto_exists delheaders: @echo Removing prototype headers @rm -f include/build_env.h \ - smbd/build_options.c \ - libnet/libnet_proto.h + smbd/build_options.c MKPROTO_SH = $(srcdir)/script/mkproto.sh @@ -2317,11 +2315,6 @@ include/build_env.h: script/build_env.sh @$(SHELL) $(srcdir)/script/build_env.sh $(srcdir) $(builddir) $(CC) \ > $(builddir)/include/build_env.h -libnet/libnet_proto.h: - @cd $(srcdir) && $(SHELL) $(MKPROTO_SH) $(AWK) \ - -h _LIBNET_PROTO_H_ $(builddir)/libnet/libnet_proto.h \ - $(LIBNET_OBJ) - # "make headers" or "make proto" calls a subshell because we need to # make sure these commands are executed in sequence even for a # parallel make. @@ -2329,7 +2322,6 @@ headers: $(MAKE) delheaders; \ $(MAKE) smbd/build_options.c; \ $(MAKE) include/build_env.h; \ - $(MAKE) libnet/libnet_proto.h; proto: headers diff --git a/source3/libnet/libnet_proto.h b/source3/libnet/libnet_proto.h new file mode 100644 index 0000000000..662ab7d0a9 --- /dev/null +++ b/source3/libnet/libnet_proto.h @@ -0,0 +1,46 @@ +/* + * Unix SMB/CIFS implementation. + * collected prototypes header + * + * frozen from "make proto" in May 2008 + * + * Copyright (C) Michael Adam 2008 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef _LIBNET_PROTO_H_ +#define _LIBNET_PROTO_H_ + + +/* The following definitions come from libnet/libnet_join.c */ + +NTSTATUS libnet_join_ok(const char *netbios_domain_name, + const char *machine_name, + const char *dc_name); +WERROR libnet_init_JoinCtx(TALLOC_CTX *mem_ctx, + struct libnet_JoinCtx **r); +WERROR libnet_init_UnjoinCtx(TALLOC_CTX *mem_ctx, + struct libnet_UnjoinCtx **r); +WERROR libnet_Join(TALLOC_CTX *mem_ctx, + struct libnet_JoinCtx *r); +WERROR libnet_Unjoin(TALLOC_CTX *mem_ctx, + struct libnet_UnjoinCtx *r); + +/* The following definitions come from librpc/gen_ndr/ndr_libnet_join.c */ + +_PUBLIC_ void ndr_print_libnet_JoinCtx(struct ndr_print *ndr, const char *name, int flags, const struct libnet_JoinCtx *r); +_PUBLIC_ void ndr_print_libnet_UnjoinCtx(struct ndr_print *ndr, const char *name, int flags, const struct libnet_UnjoinCtx *r); + +#endif /* _LIBNET_PROTO_H_ */ |