Oops, mismerge in principal.c

2011-10-31 00:29:36 -05:00
parent 104bb8ef53
commit c353962428
1 changed files with 1 additions and 1 deletions
--- a/lib/krb5/principal.c
+++ b/lib/krb5/principal.c
@@ -1872,7 +1872,7 @@ krb5_name_canon_iterator_start(krb5_context context,
    if (in_creds) {
 	if (!state->is_trivial) {
 	    ret = krb5_copy_creds(context, in_creds, &state->creds);
-	    if (ret) goto err;
+	    if (ret) goto out;
 	}
 	state->tmp_princ = state->creds->server; /* so we don't leak */
    }