oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

renamed err -> ret

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2403 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-07-17 18:27:47 +00:00
parent 0a2e34960c
commit 9953db41fc
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
kuser/kinit.c
View File

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