summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-20 19:20:12 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-20 19:20:12 +0200
commit41b02b7ac042fda700170c1e701de53d7e559e60 (patch)
tree29c38a0973e1d4f6b08010dea27645ead5d7dde8 /source4
parent4b65445582c877aa90a51b97112d0047f51d37c7 (diff)
downloadsamba-41b02b7ac042fda700170c1e701de53d7e559e60.tar.gz
samba-41b02b7ac042fda700170c1e701de53d7e559e60.tar.bz2
samba-41b02b7ac042fda700170c1e701de53d7e559e60.zip
Move orpc to top-level directory.
Diffstat (limited to 'source4')
-rw-r--r--source4/librpc/config.mk2
-rw-r--r--source4/librpc/ndr/ndr_orpc.c173
2 files changed, 1 insertions, 174 deletions
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 02542cbfea..a988dcf420 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -259,7 +259,7 @@ NDR_PROTECTED_STORAGE_OBJ_FILES = $(gen_ndrsrcdir)/ndr_protected_storage.o
[SUBSYSTEM::NDR_ORPC]
PUBLIC_DEPENDENCIES = LIBNDR
-NDR_ORPC_OBJ_FILES = $(gen_ndrsrcdir)/ndr_orpc.o $(ndrsrcdir)/ndr_orpc.o
+NDR_ORPC_OBJ_FILES = $(gen_ndrsrcdir)/ndr_orpc.o ../librpc/ndr/ndr_orpc.o
[SUBSYSTEM::NDR_OXIDRESOLVER]
PUBLIC_DEPENDENCIES = LIBNDR NDR_ORPC NDR_MISC
diff --git a/source4/librpc/ndr/ndr_orpc.c b/source4/librpc/ndr/ndr_orpc.c
deleted file mode 100644
index 6a55048e43..0000000000
--- a/source4/librpc/ndr/ndr_orpc.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
-
- routines for marshalling/unmarshalling DCOM string arrays
-
- Copyright (C) Jelmer Vernooij 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 "librpc/gen_ndr/ndr_orpc.h"
-
-enum ndr_err_code ndr_pull_DUALSTRINGARRAY(struct ndr_pull *ndr, int ndr_flags, struct DUALSTRINGARRAY *ar)
-{
- uint16_t num_entries, security_offset;
- uint16_t towerid;
- uint32_t towernum = 0, conformant_size;
-
- if (!(ndr_flags & NDR_SCALARS)) {
- return NDR_ERR_SUCCESS;
- }
-
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &conformant_size));
- NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &num_entries));
- NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &security_offset));
-
- ar->stringbindings = talloc_array(ndr, struct STRINGBINDING *, num_entries);
- ar->stringbindings[0] = NULL;
-
- do {
- /* 'Peek' */
- NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &towerid));
-
- if (towerid > 0) {
- ndr->offset -= 2;
- ar->stringbindings = talloc_realloc(ndr, ar->stringbindings, struct STRINGBINDING *, towernum+2);
- ar->stringbindings[towernum] = talloc(ndr, struct STRINGBINDING);
- NDR_CHECK(ndr_pull_STRINGBINDING(ndr, ndr_flags, ar->stringbindings[towernum]));
- towernum++;
- }
- } while (towerid != 0);
-
- ar->stringbindings[towernum] = NULL;
- towernum = 0;
-
- ar->securitybindings = talloc_array(ndr, struct SECURITYBINDING *, num_entries);
- ar->securitybindings[0] = NULL;
-
- do {
- /* 'Peek' */
- NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &towerid));
-
- if (towerid > 0) {
- ndr->offset -= 2;
- ar->securitybindings = talloc_realloc(ndr, ar->securitybindings, struct SECURITYBINDING *, towernum+2);
- ar->securitybindings[towernum] = talloc(ndr, struct SECURITYBINDING);
- NDR_CHECK(ndr_pull_SECURITYBINDING(ndr, ndr_flags, ar->securitybindings[towernum]));
- towernum++;
- }
- } while (towerid != 0);
-
- ar->securitybindings[towernum] = NULL;
-
- return NDR_ERR_SUCCESS;
-}
-
-enum ndr_err_code ndr_push_DUALSTRINGARRAY(struct ndr_push *ndr, int ndr_flags, const struct DUALSTRINGARRAY *ar)
-{
- return ndr_push_error(ndr, NDR_ERR_STRING, "ndr_push_DUALSTRINGARRAY not implemented");
-}
-
-/*
- print a dom_sid
-*/
-void ndr_print_DUALSTRINGARRAY(struct ndr_print *ndr, const char *name, const struct DUALSTRINGARRAY *ar)
-{
- int i;
- ndr->print(ndr, "%-25s: DUALSTRINGARRAY", name);
- ndr->depth++;
- ndr->print(ndr, "STRING BINDINGS");
- ndr->depth++;
- for (i=0;ar->stringbindings[i];i++) {
- char *idx = NULL;
- asprintf(&idx, "[%d]", i);
- if (idx) {
- ndr_print_STRINGBINDING(ndr, idx, ar->stringbindings[i]);
- free(idx);
- }
- }
- ndr->depth--;
- ndr->print(ndr, "SECURITY BINDINGS");
- ndr->depth++;
- for (i=0;ar->securitybindings[i];i++) {
- char *idx = NULL;
- asprintf(&idx, "[%d]", i);
- if (idx) {
- ndr_print_SECURITYBINDING(ndr, idx, ar->securitybindings[i]);
- free(idx);
- }
- }
- ndr->depth--;
-}
-
-enum ndr_err_code ndr_pull_STRINGARRAY(struct ndr_pull *ndr, int ndr_flags, struct STRINGARRAY *ar)
-{
- uint16_t towerid;
- uint32_t towernum = 0;
- uint16_t num_entries;
-
- if (!(ndr_flags & NDR_SCALARS)) {
- return NDR_ERR_SUCCESS;
- }
-
- NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &num_entries));
-
- ar->stringbindings = talloc_array(ndr, struct STRINGBINDING *, 1);
- ar->stringbindings[0] = NULL;
-
- do {
- /* 'Peek' */
- NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &towerid));
-
- if (towerid > 0) {
- ndr->offset -= 2;
- ar->stringbindings = talloc_realloc(ndr, ar->stringbindings, struct STRINGBINDING *, towernum+2);
- ar->stringbindings[towernum] = talloc(ndr, struct STRINGBINDING);
- NDR_CHECK(ndr_pull_STRINGBINDING(ndr, ndr_flags, ar->stringbindings[towernum]));
- towernum++;
- }
- } while (towerid != 0);
-
- ar->stringbindings[towernum] = NULL;
- towernum = 0;
-
- return NDR_ERR_SUCCESS;
-}
-
-enum ndr_err_code ndr_push_STRINGARRAY(struct ndr_push *ndr, int ndr_flags, const struct STRINGARRAY *ar)
-{
- return ndr_push_error(ndr, NDR_ERR_STRING, "ndr_push_STRINGARRAY not implemented");
-}
-
-/*
- print a dom_sid
-*/
-void ndr_print_STRINGARRAY(struct ndr_print *ndr, const char *name, const struct STRINGARRAY *ar)
-{
- int i;
- ndr->print(ndr, "%-25s: STRINGARRAY", name);
- ndr->depth++;
- for (i=0;ar->stringbindings[i];i++) {
- char *idx = NULL;
- asprintf(&idx, "[%d]", i);
- if (idx) {
- ndr_print_STRINGBINDING(ndr, idx, ar->stringbindings[i]);
- free(idx);
- }
- }
- ndr->depth--;
-}