Removed all references to DECLARG and OLDDECLARG.

Added krb5_context to all krb5_routines.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4810 dc483132-0cff-0310-8789-dd5450dbe970

1 files changed, 20 insertions, 19 deletions

diff --git a/src/lib/krb5/krb/parse.c b/src/lib/krb5/krb/parse.c
index 3e5edfd6f1..fe051ae683 100644
--- a/src/lib/krb5/krb/parse.c
+++ b/src/lib/krb5/krb/parse.c
@@ -65,7 +65,8 @@
  * that arbitrarily large multi-component names are a Good Thing.....
  */
 krb5_error_code
-krb5_parse_name(name, nprincipal)
+krb5_parse_name(context, name, nprincipal)
+    	krb5_context context;
 	const char	*name;
 	krb5_principal	*nprincipal;
 {
@@ -149,7 +150,7 @@ krb5_parse_name(name, nprincipal)
 	 */
 	if (!parsed_realm) {
 	    if (!default_realm) {
-		retval = krb5_get_default_realm(&default_realm);
+		retval = krb5_get_default_realm(context, &default_realm);
 		if (retval) {
 		    krb5_xfree(principal->data);
 		    krb5_xfree((char *)principal);
@@ -157,7 +158,7 @@ krb5_parse_name(name, nprincipal)
 		}
 		default_realm_size = strlen(default_realm);
 	    }
-	    krb5_princ_realm(principal)->length = default_realm_size;
+	    krb5_princ_realm(context, principal)->length = default_realm_size;
 	    realmsize = default_realm_size;
 	}
 	/*
@@ -174,20 +175,20 @@ krb5_parse_name(name, nprincipal)
 				cp++;
 				size++;
 			} else if (c == COMPONENT_SEP) {
-				krb5_princ_component(principal, i)->length = size;
+				krb5_princ_component(context, principal, i)->length = size;
 				size = 0;
 				i++;
 			} else if (c == REALM_SEP) {
-				krb5_princ_component(principal, i)->length = size;
+				krb5_princ_component(context, principal, i)->length = size;
 				size = 0;
 				parsed_realm = cp+1;
 			} else
 				size++;
 		}
 		if (parsed_realm)
-			krb5_princ_realm(principal)->length = size;
+			krb5_princ_realm(context, principal)->length = size;
 		else
-			krb5_princ_component(principal, i)->length = size;
+			krb5_princ_component(context, principal, i)->length = size;
 		if (i + 1 != components) {
 			fprintf(stderr,
 				"Programming error in krb5_parse_name!");
@@ -200,8 +201,8 @@ krb5_parse_name(name, nprincipal)
 		 * principal structure
 		 */
 		for (i=0; i < components; i++)
-			krb5_princ_component(principal, i)->length = fcompsize[i];
-		krb5_princ_realm(principal)->length = realmsize;
+			krb5_princ_component(context, principal, i)->length = fcompsize[i];
+		krb5_princ_realm(context, principal)->length = realmsize;
 	}
 	/*	
 	 * Now, we need to allocate the space for the strings themselves.....
@@ -212,19 +213,19 @@ krb5_parse_name(name, nprincipal)
 		krb5_xfree(principal);
 		return ENOMEM;
 	}
-	krb5_princ_set_realm_data(principal, tmpdata);
+	krb5_princ_set_realm_data(context, principal, tmpdata);
 	for (i=0; i < components; i++) {
 		char *tmpdata =
-		  malloc(krb5_princ_component(principal, i)->length + 1);
+		  malloc(krb5_princ_component(context, principal, i)->length + 1);
 		if (!tmpdata) {
 			for (i--; i >= 0; i--)
-				krb5_xfree(krb5_princ_component(principal, i)->data);
-			krb5_xfree(krb5_princ_realm(principal)->data);
+				krb5_xfree(krb5_princ_component(context, principal, i)->data);
+			krb5_xfree(krb5_princ_realm(context, principal)->data);
 			krb5_xfree(principal->data);
 			krb5_xfree(principal);
 			return(ENOMEM);
 		}
-		krb5_princ_component(principal, i)->data = tmpdata;
+		krb5_princ_component(context, principal, i)->data = tmpdata;
 	}
 	
 	/*
@@ -232,7 +233,7 @@ krb5_parse_name(name, nprincipal)
 	 * time filling in the krb5_principal structure which we just
 	 * allocated.
 	 */
-	q = krb5_princ_component(principal, 0)->data;
+	q = krb5_princ_component(context, principal, 0)->data;
 	for (i=0,cp = name; c = *cp; cp++) {
 		if (c == QUOTECHAR) {
 			cp++;
@@ -256,20 +257,20 @@ krb5_parse_name(name, nprincipal)
 			i++;
 			*q++ = '\0';
 			if (c == COMPONENT_SEP) 
-				q = krb5_princ_component(principal, i)->data;
+				q = krb5_princ_component(context, principal, i)->data;
 			else
-				q = krb5_princ_realm(principal)->data;
+				q = krb5_princ_realm(context, principal)->data;
 		} else
 			*q++ = c;
 	}
 	*q++ = '\0';
 	if (!parsed_realm)
-		strcpy(krb5_princ_realm(principal)->data, default_realm);
+		strcpy(krb5_princ_realm(context, principal)->data, default_realm);
 	/*
 	 * Alright, we're done.  Now stuff a pointer to this monstrosity
 	 * into the return variable, and let's get out of here.
 	 */
-	krb5_princ_type(principal) = KRB5_NT_PRINCIPAL;
+	krb5_princ_type(context, principal) = KRB5_NT_PRINCIPAL;
 	*nprincipal = principal;
 	return(0);
 }