summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-12-31 14:57:43 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:49:35 -0500
commit912f556dbaa13598eb378d5bf0919235e552de48 (patch)
treec71d1e09b9f9f2a1f05e8d2201dd4e937ceaec34 /source4
parentf54ef2a8f6c12301dfe743bad47971e8ec9fb985 (diff)
downloadsamba-912f556dbaa13598eb378d5bf0919235e552de48.tar.gz
samba-912f556dbaa13598eb378d5bf0919235e552de48.tar.bz2
samba-912f556dbaa13598eb378d5bf0919235e552de48.zip
r12651: Remove STR_LARGE_SIZE as it's no longer used
(This used to be commit 8e95aee6fba4d3632f4718428bdb1f07cb58fab4)
Diffstat (limited to 'source4')
-rw-r--r--source4/librpc/idl/idl_types.h1
-rw-r--r--source4/librpc/ndr/libndr.h1
-rw-r--r--source4/librpc/ndr/ndr_string.c14
3 files changed, 2 insertions, 14 deletions
diff --git a/source4/librpc/idl/idl_types.h b/source4/librpc/idl/idl_types.h
index 98a8d1c093..054aef608b 100644
--- a/source4/librpc/idl/idl_types.h
+++ b/source4/librpc/idl/idl_types.h
@@ -10,7 +10,6 @@
#define STR_CONFORMANT LIBNDR_FLAG_STR_CONFORMANT
#define STR_CHARLEN LIBNDR_FLAG_STR_CHARLEN
#define STR_UTF8 LIBNDR_FLAG_STR_UTF8
-#define STR_LARGE_SIZE LIBNDR_FLAG_STR_LARGE_SIZE
/*
a UCS2 string prefixed with [size], 32 bits
diff --git a/source4/librpc/ndr/libndr.h b/source4/librpc/ndr/libndr.h
index 86962bd563..e5234ac7ed 100644
--- a/source4/librpc/ndr/libndr.h
+++ b/source4/librpc/ndr/libndr.h
@@ -115,7 +115,6 @@ struct ndr_print {
#define LIBNDR_FLAG_STR_CHARLEN (1<<11)
#define LIBNDR_FLAG_STR_UTF8 (1<<12)
#define LIBNDR_FLAG_STR_FIXLEN15 (1<<13)
-#define LIBNDR_FLAG_STR_LARGE_SIZE (1<<14)
#define LIBNDR_STRING_FLAGS (0x7FFC)
diff --git a/source4/librpc/ndr/ndr_string.c b/source4/librpc/ndr/ndr_string.c
index fbccdb6bed..9eb26c2c83 100644
--- a/source4/librpc/ndr/ndr_string.c
+++ b/source4/librpc/ndr/ndr_string.c
@@ -65,7 +65,6 @@ NTSTATUS ndr_pull_string(struct ndr_pull *ndr, int ndr_flags, const char **s)
switch (flags & LIBNDR_STRING_FLAGS) {
case LIBNDR_FLAG_STR_LEN4|LIBNDR_FLAG_STR_SIZE4:
case LIBNDR_FLAG_STR_LEN4|LIBNDR_FLAG_STR_SIZE4|LIBNDR_FLAG_STR_NOTERM:
- case LIBNDR_FLAG_STR_LEN4|LIBNDR_FLAG_STR_SIZE4|LIBNDR_FLAG_STR_NOTERM|LIBNDR_FLAG_STR_LARGE_SIZE:
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &len1));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &ofs));
if (ofs != 0) {
@@ -94,16 +93,8 @@ NTSTATUS ndr_pull_string(struct ndr_pull *ndr, int ndr_flags, const char **s)
}
NDR_CHECK(ndr_pull_advance(ndr, (len2 + c_len_term)*byte_mul));
- if (ndr->flags & LIBNDR_FLAG_STR_LARGE_SIZE) {
- if (len1 != 0 && len2 == 0) {
- DEBUG(6,("len1[%u] != (len2[%u]) '%s'\n", len1, len2, as));
- } else if (len1 != (len2 + 1)) {
- DEBUG(6,("len1[%u] != (len2[%u]+1) '%s'\n", len1, len2, as));
- }
- } else {
- if (len1 != len2) {
- DEBUG(6,("len1[%u] != len2[%u] '%s'\n", len1, len2, as));
- }
+ if (len1 != len2) {
+ DEBUG(6,("len1[%u] != len2[%u] '%s'\n", len1, len2, as));
}
/* this is a way of detecting if a string is sent with the wrong
@@ -351,7 +342,6 @@ NTSTATUS ndr_push_string(struct ndr_push *ndr, int ndr_flags, const char *s)
case LIBNDR_FLAG_STR_LEN4|LIBNDR_FLAG_STR_SIZE4|LIBNDR_FLAG_STR_NOTERM:
c_len_term = 0;
- case LIBNDR_FLAG_STR_LEN4|LIBNDR_FLAG_STR_SIZE4|LIBNDR_FLAG_STR_NOTERM|LIBNDR_FLAG_STR_LARGE_SIZE:
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, c_len+c_len_term));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, c_len));