svn commit: samba r2138 - in trunk/source/libsmb: .

[abartlet at samba.org]

Author: abartlet
Date: 2004-08-31 20:16:31 +0000 (Tue, 31 Aug 2004)
New Revision: 2138

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/trunk/source/libsmb&rev=2138&nolog=1

Log:
Merge from 3.0 -> trunk.  

Avoid using a variable name 'oid' at it conflicts with system headers.

Andrew Bartlett

Modified:
   trunk/source/libsmb/clispnego.c


Changeset:
Modified: trunk/source/libsmb/clispnego.c
===================================================================
--- trunk/source/libsmb/clispnego.c	2004-08-31 19:56:16 UTC (rev 2137)
+++ trunk/source/libsmb/clispnego.c	2004-08-31 20:16:31 UTC (rev 2138)
@@ -141,9 +141,9 @@
 	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 @@
 	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);