From c3539624289d0ee3f9bd32123ccfcd41304d2465 Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@cryptonector.com>
Date: Mon, 31 Oct 2011 00:29:36 -0500
Subject: [PATCH] Oops, mismerge in principal.c

---
 lib/krb5/principal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/krb5/principal.c b/lib/krb5/principal.c
index 73963092c..6c3fa39b1 100644
--- 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 */
     }