diff options
| -rw-r--r-- | librpc/ndr/ndr_misc.c (renamed from source4/librpc/ndr/ndr_misc.c) | 0 | ||||
| -rw-r--r-- | source3/Makefile.in | 2 | ||||
| -rw-r--r-- | source3/librpc/ndr/ndr_misc.c | 48 | ||||
| -rw-r--r-- | source4/librpc/config.mk | 2 |
4 files changed, 2 insertions, 50 deletions
diff --git a/source4/librpc/ndr/ndr_misc.c b/librpc/ndr/ndr_misc.c index 2e5ecbac6de..2e5ecbac6de 100644 --- a/source4/librpc/ndr/ndr_misc.c +++ b/librpc/ndr/ndr_misc.c diff --git a/source3/Makefile.in b/source3/Makefile.in index 4fc0f2a7601..2344289eeb0 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -258,7 +258,7 @@ DRSUAPI_OBJ = $(LIBNDR_DRSUAPI_OBJ) \ LIBNDR_OBJ = ../librpc/ndr/ndr_basic.o \ librpc/ndr/ndr.o \ - librpc/ndr/ndr_misc.o \ + ../librpc/ndr/ndr_misc.o \ librpc/gen_ndr/ndr_misc.o \ librpc/gen_ndr/ndr_security.o \ librpc/ndr/ndr_sec_helper.o \ diff --git a/source3/librpc/ndr/ndr_misc.c b/source3/librpc/ndr/ndr_misc.c deleted file mode 100644 index 1e04f04d40d..00000000000 --- a/source3/librpc/ndr/ndr_misc.c +++ /dev/null @@ -1,48 +0,0 @@ -/* - Unix SMB/CIFS implementation. - - UUID/GUID/policy_handle functions - - Copyright (C) Theodore Ts'o 1996, 1997, - Copyright (C) Jim McDonough 2002. - Copyright (C) Andrew Tridgell 2003. - Copyright (C) Stefan (metze) Metzmacher 2004. - - 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/>. -*/ - -#include "includes.h" -#include "system/network.h" -#include "librpc/ndr/libndr.h" - -_PUBLIC_ void ndr_print_in_addr(struct ndr_print *ndr, const char *name, const struct in_addr *_ip) -{ - struct in_addr ip; - - ip.s_addr = htonl(_ip->s_addr); - - ndr->print(ndr, "%-25s: %s", name, inet_ntoa(ip)); -} - -_PUBLIC_ void ndr_print_GUID(struct ndr_print *ndr, const char *name, const struct GUID *guid) -{ - ndr->print(ndr, "%-25s: %s", name, GUID_string(ndr, guid)); -} - -bool ndr_syntax_id_equal(const struct ndr_syntax_id *i1, - const struct ndr_syntax_id *i2) -{ - return GUID_equal(&i1->uuid, &i2->uuid) - && (i1->if_version == i2->if_version); -} diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk index 59b14b81345..e59fa01c986 100644 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@ -107,7 +107,7 @@ NDR_EFS_OBJ_FILES = $(gen_ndrsrcdir)/ndr_efs.o [SUBSYSTEM::NDR_MISC] PUBLIC_DEPENDENCIES = LIBNDR -NDR_MISC_OBJ_FILES = $(gen_ndrsrcdir)/ndr_misc.o $(ndrsrcdir)/ndr_misc.o +NDR_MISC_OBJ_FILES = $(gen_ndrsrcdir)/ndr_misc.o ../librpc/ndr/ndr_misc.o PUBLIC_HEADERS += $(gen_ndrsrcdir)/misc.h $(gen_ndrsrcdir)/ndr_misc.h |