sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

r1240: Ensure we don't shadow Heimdal globals.

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison 2004-06-24 19:25:20 +00:00 committed by Gerald (Jerry) Carter
parent fece76cfc2
commit 464d2e9048
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/libsmb/asn1.c
View File

@ -320,17 +320,17 @@ int asn1_tag_remaining(ASN1_DATA *data)
BOOL asn1_read_OID(ASN1_DATA *data, char **OID) BOOL asn1_read_OID(ASN1_DATA *data, char **OID)
{ {
uint8 b; uint8 b;
pstring oid; pstring oid_str;
fstring el; fstring el;
if (!asn1_start_tag(data, ASN1_OID)) return False; if (!asn1_start_tag(data, ASN1_OID)) return False;
asn1_read_uint8(data, &b); asn1_read_uint8(data, &b);
oid[0] = 0; oid_str[0] = 0;
fstr_sprintf(el, "%u", b/40); fstr_sprintf(el, "%u", b/40);
pstrcat(oid, el); pstrcat(oid_str, el);
fstr_sprintf(el, " %u", b%40); fstr_sprintf(el, " %u", b%40);
pstrcat(oid, el); pstrcat(oid_str, el);
while (asn1_tag_remaining(data) > 0) { while (asn1_tag_remaining(data) > 0) {
unsigned v = 0; unsigned v = 0;
@ -339,12 +339,12 @@ BOOL asn1_read_OID(ASN1_DATA *data, char **OID)
v = (v<<7) | (b&0x7f); v = (v<<7) | (b&0x7f);
} while (!data->has_error && b & 0x80); } while (!data->has_error && b & 0x80);
fstr_sprintf(el, " %u", v); fstr_sprintf(el, " %u", v);
pstrcat(oid, el); pstrcat(oid_str, el);
} }
asn1_end_tag(data); asn1_end_tag(data);
*OID = strdup(oid); *OID = strdup(oid_str);
return !data->has_error; return !data->has_error;
} }

12
source/libsmb/clispnego.c
View File

@ -141,9 +141,9 @@ BOOL spnego_parse_negTokenInit(DATA_BLOB blob,
asn1_start_tag(&data,ASN1_CONTEXT(0)); asn1_start_tag(&data,ASN1_CONTEXT(0));
asn1_start_tag(&data,ASN1_SEQUENCE(0)); asn1_start_tag(&data,ASN1_SEQUENCE(0));
for (i=0; asn1_tag_remaining(&data) > 0 && i < ASN1_MAX_OIDS; i++) { for (i=0; asn1_tag_remaining(&data) > 0 && i < ASN1_MAX_OIDS; i++) {
char *oid = NULL; char *oid_str = NULL;
asn1_read_OID(&data,&oid); asn1_read_OID(&data,&oid_str);
OIDs[i] = oid; OIDs[i] = oid_str;
} }
OIDs[i] = NULL; OIDs[i] = NULL;
asn1_end_tag(&data); 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_CONTEXT(0));
asn1_start_tag(&data, ASN1_SEQUENCE(0)); asn1_start_tag(&data, ASN1_SEQUENCE(0));
for (i=0; asn1_tag_remaining(&data) > 0 && i < ASN1_MAX_OIDS; i++) { for (i=0; asn1_tag_remaining(&data) > 0 && i < ASN1_MAX_OIDS; i++) {
char *oid = NULL; char *oid_str = NULL;
asn1_read_OID(&data,&oid); asn1_read_OID(&data,&oid_str);
OIDs[i] = oid; OIDs[i] = oid_str;
} }
OIDs[i] = NULL; OIDs[i] = NULL;
asn1_end_tag(&data); asn1_end_tag(&data);

2
source/utils/net_ads.c
View File

@ -1456,7 +1456,7 @@ int net_ads(int argc, const char **argv)
#else #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"); d_printf("ADS support not compiled in\n");
return -1; return -1;