* accept_sec_context.c (krb5_gss_accept_sec_context): Cleanup

 	assignments in conditionals.
	* k5seal.c (make_seal_token_v1): Likewise.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13260 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index ec3c4cf49ece02ee0b19854818fa6afab9caf2fd..dae9eb155c2299270f9f9351aaa0bde03b373363 100644 (file)
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-04  Ezra Peisach  <epeisach@mit.edu>
+
+       * accept_sec_context.c (krb5_gss_accept_sec_context): Cleanup
+       assignments in conditionals.
+       * k5seal.c (make_seal_token_v1): Likewise.
+
 2001-05-14  Ezra Peisach  <epeisach@mit.edu>
 
        * wrap_size_limit.c (krb5_gss_wrap_size_limit): Get rid of unused

diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
index e028aa68c14de3029294fb3fd503a387aee647ab..b01e49fd297b5af8d14f0ecf2dd8b67e37b04aba 100644 (file)
--- a/src/lib/gssapi/krb5/accept_sec_context.c
+++ b/src/lib/gssapi/krb5/accept_sec_context.c
@@ -363,8 +363,8 @@ krb5_gss_accept_sec_context(minor_status, context_handle,
        /* gss krb5 v1 */
 
        /* stash this now, for later. */
-       if (code = krb5_c_checksum_length(context, CKSUMTYPE_RSA_MD5,
-                                        &md5len)) {
+       code = krb5_c_checksum_length(context, CKSUMTYPE_RSA_MD5, &md5len);
+       if (code) {
           major_status = GSS_S_FAILURE;
           goto fail;
        }
@@ -494,9 +494,10 @@ krb5_gss_accept_sec_context(minor_status, context_handle,
 
                   /* store the delegated credential */
 
-                  if (code = rd_and_store_for_creds(context, &option,
-                                                    (delegated_cred_handle) ?
-                                                    &deleg_cred : NULL)) {
+                  code = rd_and_store_for_creds(context, &option,
+                                                (delegated_cred_handle) ?
+                                                &deleg_cred : NULL);
+                  if (code) {
                       major_status = GSS_S_FAILURE;
                       goto fail;
                   }

diff --git a/src/lib/gssapi/krb5/k5seal.c b/src/lib/gssapi/krb5/k5seal.c
index ff46afad88be14d25521745a1944f75b6a772018..913802a057ff14839271c4f1eea5bcd952864e17 100644 (file)
--- a/src/lib/gssapi/krb5/k5seal.c
+++ b/src/lib/gssapi/krb5/k5seal.c
@@ -166,7 +166,8 @@ make_seal_token_v1 (krb5_context context,
        abort ();
     }
 
-    if (code = krb5_c_checksum_length(context, md5cksum.checksum_type, &sumlen))
+    code = krb5_c_checksum_length(context, md5cksum.checksum_type, &sumlen);
+    if (code)
        return(code);
     md5cksum.length = sumlen;