From 9953db41fc8504e39b53f7b157ad27f3a26d5ba9 Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Thu, 17 Jul 1997 18:27:47 +0000
Subject: [PATCH] renamed err -> ret

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2403 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 kuser/kinit.c | 50 +++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/kuser/kinit.c b/kuser/kinit.c
index 1d1ce1ab4..758ae0307 100644
--- a/kuser/kinit.c
+++ b/kuser/kinit.c
@@ -48,7 +48,7 @@ usage (void)
 int
 main (int argc, char **argv)
 {
-  krb5_error_code err;
+  krb5_error_code ret;
   krb5_context context;
   krb5_ccache  ccache;
   krb5_principal principal;
@@ -81,24 +81,24 @@ main (int argc, char **argv)
   argc -= optind;
   argv += optind;
 
-  err = krb5_init_context (&context);
-  if (err)
-      errx (1, "krb5_init_context: %s", krb5_get_err_text(context, err));
+  ret = krb5_init_context (&context);
+  if (ret)
+      errx (1, "krb5_init_context: %s", krb5_get_err_text(context, ret));
   
-  err = krb5_cc_default (context, &ccache);
-  if (err)
-      errx (1, "krb5_cc_default: %s", krb5_get_err_text(context, err));
+  ret = krb5_cc_default (context, &ccache);
+  if (ret)
+      errx (1, "krb5_cc_default: %s", krb5_get_err_text(context, ret));
   
-  err = krb5_get_default_realm (context, &realm);
-  if (err)
+  ret = krb5_get_default_realm (context, &realm);
+  if (ret)
       errx (1, "krb5_get_default_realm: %s",
-	    krb5_get_err_text(context, err));
+	    krb5_get_err_text(context, ret));
 
   if(argv[0]){
       char *p;
-      err = krb5_parse_name (context, argv[0], &principal);
-      if (err)
-	  errx (1, "krb5_parse_name: %s", krb5_get_err_text(context, err));
+      ret = krb5_parse_name (context, argv[0], &principal);
+      if (ret)
+	  errx (1, "krb5_parse_name: %s", krb5_get_err_text(context, ret));
       krb5_unparse_name(context, principal, &p);
       fprintf (stderr, "%s's ", p);
       free(p);
@@ -106,26 +106,26 @@ main (int argc, char **argv)
       struct passwd *pw;
 
       pw = getpwuid(getuid());
-      err = krb5_build_principal(context, &principal,
+      ret = krb5_build_principal(context, &principal,
 				 strlen(realm), realm,
 				 pw->pw_name, NULL);
-      if (err)
+      if (ret)
 	  errx (1, "krb5_build_principal: %s",
-		krb5_get_err_text(context, err));
+		krb5_get_err_text(context, ret));
       fprintf (stderr, "%s@%s's ", pw->pw_name, realm);
   }
   free(realm);
 
-  err = krb5_cc_initialize (context, ccache, principal);
-  if (err)
+  ret = krb5_cc_initialize (context, ccache, principal);
+  if (ret)
       errx (1, "krb5_cc_initialize: %s",
-	    krb5_get_err_text(context, err));
+	    krb5_get_err_text(context, ret));
 
   memset(&cred, 0, sizeof(cred));
   cred.client = principal;
   cred.times.endtime = 0;
 
-  err = krb5_build_principal_ext (context,
+  ret = krb5_build_principal_ext (context,
 				  &server,
 				  strlen(principal->realm),
 				  principal->realm,
@@ -134,9 +134,9 @@ main (int argc, char **argv)
 				  strlen(principal->realm),
 				  principal->realm,
 				  NULL);
-  if (err)
+  if (ret)
       errx (1, "krb5_build_principal_ext: %s",
-	    krb5_get_err_text(context, err));
+	    krb5_get_err_text(context, ret));
 
   server->name.name_type = KRB5_NT_SRV_INST;
 
@@ -144,7 +144,7 @@ main (int argc, char **argv)
   cred.server = server;
   cred.times.endtime = 0;
 
-  err = krb5_get_in_tkt_with_password (context,
+  ret = krb5_get_in_tkt_with_password (context,
 				       options.i,
 				       NULL,
 				       NULL,
@@ -153,9 +153,9 @@ main (int argc, char **argv)
 				       ccache,
 				       &cred,
 				       NULL);
-  if (err)
+  if (ret)
       errx (1, "krb5_get_in_tkt_with_password: %s",
-	    krb5_get_err_text(context, err));
+	    krb5_get_err_text(context, ret));
   
   krb5_free_principal (context, principal);
   krb5_free_principal (context, server);