diff options
| author | Ezra Peisach <epeisach@mit.edu> | 2000-10-03 16:57:44 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 2000-10-03 16:57:44 +0000 |
| commit | 1c211e936ef3e0e4d0b87bc84df0e8208750c9c3 (patch) | |
| tree | f63580c77a4555df818cb7a3509ed5fcb1165f4e /src/lib/gssapi | |
| parent | c3c16b4f345567123f1771a533b61399a71939c9 (diff) | |
| download | krb5-1c211e936ef3e0e4d0b87bc84df0e8208750c9c3.tar.gz krb5-1c211e936ef3e0e4d0b87bc84df0e8208750c9c3.tar.xz krb5-1c211e936ef3e0e4d0b87bc84df0e8208750c9c3.zip | |
Clean up assignments in conditionals warnings by separating the
assignment from the test.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12714 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/gssapi')
| -rw-r--r-- | src/lib/gssapi/krb5/add_cred.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/lib/gssapi/krb5/add_cred.c b/src/lib/gssapi/krb5/add_cred.c index 63975f5b0c..5cc1784870 100644 --- a/src/lib/gssapi/krb5/add_cred.c +++ b/src/lib/gssapi/krb5/add_cred.c @@ -182,8 +182,8 @@ krb5_gss_add_cred(minor_status, input_cred_handle, new_cred->rfc_mech = cred->rfc_mech; new_cred->tgt_expire = cred->tgt_expire; - if (code = krb5_copy_principal(context, cred->princ, - &new_cred->princ)) { + code = krb5_copy_principal(context, cred->princ, &new_cred->princ); + if (code) { free(new_cred); *minor_status = code; @@ -204,9 +204,10 @@ krb5_gss_add_cred(minor_status, input_cred_handle, ktboth[sizeof(ktboth) - 1] = '\0'; strncat(ktboth, ":", sizeof(ktboth) - 1 - strlen(ktboth)); - if (code = krb5_kt_get_name(context, cred->keytab, - ktboth+strlen(ktboth), - sizeof(ktboth)-strlen(ktboth))) { + code = krb5_kt_get_name(context, cred->keytab, + ktboth+strlen(ktboth), + sizeof(ktboth)-strlen(ktboth)); + if (code) { krb5_free_principal(context, new_cred->princ); free(new_cred); @@ -214,7 +215,8 @@ krb5_gss_add_cred(minor_status, input_cred_handle, return(GSS_S_FAILURE); } - if (code = krb5_kt_resolve(context, ktboth, &new_cred->keytab)) { + code = krb5_kt_resolve(context, ktboth, &new_cred->keytab); + if (code) { krb5_free_principal(context, new_cred->princ); free(new_cred); @@ -263,7 +265,8 @@ krb5_gss_add_cred(minor_status, input_cred_handle, strncat(ccboth, ":", sizeof(ccboth) - 1 - strlen(ccboth)); strncat(ccboth, ccname, sizeof(ccboth) - 1 - strlen(ccboth)); - if (code = krb5_cc_resolve(context, ccboth, &new_cred->ccache)) { + code = krb5_cc_resolve(context, ccboth, &new_cred->ccache); + if (code) { if (new_cred->rcache) krb5_rc_close(context, new_cred->rcache); if (new_cred->keytab) |