Commit 79277678 authored by Jeremy Allison's avatar Jeremy Allison Committed by Gerald (Jerry) Carter
Browse files

r1240: Ensure we don't shadow Heimdal globals. 

Jeremy.
(This used to be commit 464d2e90480c676688a851a141aabddf992e0b0e)
parent 7984ec9e

source3/libsmb/asn1.c

+6 −6
Original line number Diff line number Diff line
@@ -320,17 +320,17 @@ int asn1_tag_remaining(ASN1_DATA *data) 
BOOL asn1_read_OID(ASN1_DATA *data, char **OID)

{

	uint8 b;

	pstring oid;

	pstring oid_str;

	fstring el;



	if (!asn1_start_tag(data, ASN1_OID)) return False;

	asn1_read_uint8(data, &b);



	oid[0] = 0;

	oid_str[0] = 0;

	fstr_sprintf(el, "%u",  b/40);

	pstrcat(oid, el);

	pstrcat(oid_str, el);

	fstr_sprintf(el, " %u",  b%40);

	pstrcat(oid, el);

	pstrcat(oid_str, el);



	while (asn1_tag_remaining(data) > 0) {

		unsigned v = 0;
@@ -339,12 +339,12 @@ BOOL asn1_read_OID(ASN1_DATA *data, char **OID) 
			v = (v<<7) | (b&0x7f);

		} while (!data->has_error && b & 0x80);

		fstr_sprintf(el, " %u",  v);

		pstrcat(oid, el);

		pstrcat(oid_str, el);

	}



	asn1_end_tag(data);



	*OID = strdup(oid);

	*OID = strdup(oid_str);



	return !data->has_error;

}

source3/libsmb/clispnego.c

+6 −6
Original line number Diff line number Diff line
@@ -141,9 +141,9 @@ BOOL spnego_parse_negTokenInit(DATA_BLOB blob, 
	asn1_start_tag(&data,ASN1_CONTEXT(0));

	asn1_start_tag(&data,ASN1_SEQUENCE(0));

	for (i=0; asn1_tag_remaining(&data) > 0 && i < ASN1_MAX_OIDS; i++) {

		char *oid = NULL;

		asn1_read_OID(&data,&oid);

		OIDs[i] = oid;

		char *oid_str = NULL;

		asn1_read_OID(&data,&oid_str);

		OIDs[i] = oid_str;

	}

	OIDs[i] = NULL;

	asn1_end_tag(&data);
@@ -230,9 +230,9 @@ BOOL parse_negTokenTarg(DATA_BLOB blob, char *OIDs[ASN1_MAX_OIDS], DATA_BLOB *se 
	asn1_start_tag(&data, ASN1_CONTEXT(0));

	asn1_start_tag(&data, ASN1_SEQUENCE(0));

	for (i=0; asn1_tag_remaining(&data) > 0 && i < ASN1_MAX_OIDS; i++) {

		char *oid = NULL;

		asn1_read_OID(&data,&oid);

		OIDs[i] = oid;

		char *oid_str = NULL;

		asn1_read_OID(&data,&oid_str);

		OIDs[i] = oid_str;

	}

	OIDs[i] = NULL;

	asn1_end_tag(&data);

source3/utils/net_ads.c

+1 −1
Original line number Diff line number Diff line
@@ -1456,7 +1456,7 @@ int net_ads(int argc, const char **argv) 


#else



static int net_ads_noads(int argc, const char **argv)

static int net_ads_noads(void)

{

	d_printf("ADS support not compiled in\n");

	return -1;