summaryrefslogtreecommitdiff
path: root/librpc/ndr
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-11-04 17:42:53 +1100
committerAndrew Bartlett <abartlet@samba.org>2009-11-12 16:34:01 +1100
commitfd5174e88ca1727a91d6dc9bf9bd898ff9087fe8 (patch)
tree7f1511fcea311f2ef637ca23dee8699ba00adfb6 /librpc/ndr
parenta8769e667514f83a45ee3e825d21a351987d0210 (diff)
downloadsamba-fd5174e88ca1727a91d6dc9bf9bd898ff9087fe8.tar.gz
samba-fd5174e88ca1727a91d6dc9bf9bd898ff9087fe8.tar.bz2
samba-fd5174e88ca1727a91d6dc9bf9bd898ff9087fe8.zip
lib/util Split data_blob_hex_string() into upper and lower
Rather than have a repeat of the bugs we found at the plugfest where hexidecimal strings must be in upper or lower case in particular places, ensure that each caller chooses which case they want. This reverts most of the callers back to upper case, as things were before tridge's patch. The critical call in the extended DN code is of course handled in lower case. Andrew Bartlett
Diffstat (limited to 'librpc/ndr')
-rw-r--r--librpc/ndr/ndr_drsuapi.c2
-rw-r--r--librpc/ndr/uuid.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/librpc/ndr/ndr_drsuapi.c b/librpc/ndr/ndr_drsuapi.c
index bfc3c75b4e..15f2f842bd 100644
--- a/librpc/ndr/ndr_drsuapi.c
+++ b/librpc/ndr/ndr_drsuapi.c
@@ -91,7 +91,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsReplicaOID(struct ndr_print *ndr, const char *
if (r->binary_oid) {
char *partial_oid = NULL;
DATA_BLOB oid_blob = data_blob_const(r->binary_oid, r->length);
- char *hex_str = data_blob_hex_string(ndr, &oid_blob);
+ char *hex_str = data_blob_hex_string_upper(ndr, &oid_blob);
ber_read_partial_OID_String(ndr, oid_blob, (const char **)&partial_oid);
ndr->depth++;
ndr->print(ndr, "%-25s: 0x%s (%s)", "binary_oid", hex_str, partial_oid);
diff --git a/librpc/ndr/uuid.c b/librpc/ndr/uuid.c
index 004a8d35cc..df17d7824e 100644
--- a/librpc/ndr/uuid.c
+++ b/librpc/ndr/uuid.c
@@ -291,7 +291,7 @@ _PUBLIC_ char *GUID_hexstring(TALLOC_CTX *mem_ctx, const struct GUID *guid)
return NULL;
}
- ret = data_blob_hex_string(mem_ctx, &guid_blob);
+ ret = data_blob_hex_string_upper(mem_ctx, &guid_blob);
talloc_free(tmp_mem);
return ret;
}