* t_walk_rtree.c (main): Declare as returning int

	* get_in_tkt.c (_krb5_conf_boolean): Declare as taking a const char *

	* str_conv.c (krb5_timestamp_to_string): Work around gcc's warning
	that %c format in strftime might return only two digits for the
	year.

	* mk_safe.c, rd_rep.c, send_tgs.c: Remove unused goto label.

	* kdc_rep_dc.c (krb5_kdc_rep_decrypt_proc): Remove code with no
	effect.

	* init_ctx.c: Make krb5_brand[] look used.

	* chpw.c, decode_kdc.c, decrypt_tk.c, enc_helper.c, get_creds.c,
	get_in_tkt.c, gic_keytab.c, gic_pwd.c, preauth2.c, vfy_increds.c:
	Add parentheses around assignment used as truth value

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

1 files changed, 21 insertions, 21 deletions

diff --git a/src/lib/krb5/krb/preauth2.c b/src/lib/krb5/krb/preauth2.c
index 5ea61c9..2327f1e 100644
--- a/src/lib/krb5/krb/preauth2.c
+++ b/src/lib/krb5/krb/preauth2.c
@@ -116,19 +116,19 @@ krb5_error_code pa_enc_timestamp(krb5_context context,
 	fprintf (stderr, "; *etype=%d request->ktype[0]=%d\n",
 		 *etype, request->ktype[0]);
 #endif
-       if (ret = ((*gak_fct)(context, request->client,
-			     *etype ? *etype : request->ktype[0],
-			     prompter, prompter_data,
-			     salt, as_key, gak_data)))
+       if ((ret = ((*gak_fct)(context, request->client,
+			      *etype ? *etype : request->ktype[0],
+			      prompter, prompter_data,
+			      salt, as_key, gak_data))))
            return(ret);
     }
 
     /* now get the time of day, and encrypt it accordingly */
 
-    if (ret = krb5_us_timeofday(context, &pa_enc.patimestamp, &pa_enc.pausec))
+    if ((ret = krb5_us_timeofday(context, &pa_enc.patimestamp, &pa_enc.pausec)))
 	return(ret);
 
-    if (ret = encode_krb5_pa_enc_ts(&pa_enc, &tmp))
+    if ((ret = encode_krb5_pa_enc_ts(&pa_enc, &tmp)))
 	return(ret);
 
 #ifdef DEBUG
@@ -258,7 +258,7 @@ krb5_error_code pa_sam(krb5_context context,
 
     tmpsam.length = in_padata->length;
     tmpsam.data = (char *) in_padata->contents;
-    if (ret = decode_krb5_sam_challenge(&tmpsam, &sam_challenge))
+    if ((ret = decode_krb5_sam_challenge(&tmpsam, &sam_challenge)))
 	return(ret);
 
     if (sam_challenge->sam_flags & KRB5_SAM_MUST_PK_ENCRYPT_SAD) {
@@ -292,8 +292,8 @@ krb5_error_code pa_sam(krb5_context context,
 
     /* PROMPTER_INVOCATION */
     krb5int_set_prompt_types(context, &prompt_type);
-    if (ret = ((*prompter)(context, prompter_data, name,
-			   banner, 1, &kprompt))) {
+    if ((ret = ((*prompter)(context, prompter_data, name,
+			   banner, 1, &kprompt)))) {
 	krb5_xfree(sam_challenge);
 	krb5int_set_prompt_types(context, 0);
 	return(ret);
@@ -302,9 +302,9 @@ krb5_error_code pa_sam(krb5_context context,
 
     enc_sam_response_enc.sam_nonce = sam_challenge->sam_nonce;
     if (sam_challenge->sam_nonce == 0) {
-	if (ret = krb5_us_timeofday(context, 
+	if ((ret = krb5_us_timeofday(context, 
 				&enc_sam_response_enc.sam_timestamp,
-				&enc_sam_response_enc.sam_usec)) {
+				&enc_sam_response_enc.sam_usec))) {
 		krb5_xfree(sam_challenge);
 		return(ret);
 	}
@@ -323,8 +323,8 @@ krb5_error_code pa_sam(krb5_context context,
 	/* generate a salt using the requested principal */
 
 	if ((salt->length == -1) && (salt->data == NULL)) {
-	    if (ret = krb5_principal2salt(context, request->client,
-					  &defsalt)) {
+	    if ((ret = krb5_principal2salt(context, request->client,
+					  &defsalt))) {
 		krb5_xfree(sam_challenge);
 		return(ret);
 	    }
@@ -408,8 +408,8 @@ krb5_error_code pa_sam(krb5_context context,
     krb5_xfree(sam_challenge);
 
     /* encode the encoded part of the response */
-    if (ret = encode_krb5_enc_sam_response_enc(&enc_sam_response_enc,
-					       &scratch))
+    if ((ret = encode_krb5_enc_sam_response_enc(&enc_sam_response_enc,
+						&scratch)))
 	return(ret);
 
     ret = krb5_encrypt_data(context, as_key, 0, scratch,
@@ -426,7 +426,7 @@ krb5_error_code pa_sam(krb5_context context,
     if ((pa = malloc(sizeof(krb5_pa_data))) == NULL)
 	return(ENOMEM);
 
-    if (ret = encode_krb5_sam_response(&sam_response, &scratch)) {
+    if ((ret = encode_krb5_sam_response(&sam_response, &scratch))) {
 	free(pa);
 	return(ret);
     }
@@ -557,11 +557,11 @@ krb5_do_preauth(krb5_context context,
 		    (pa_types[j].flags & paorder[h])) {
 		    out_pa = NULL;
 
-		    if (ret = ((*pa_types[j].fct)(context, request,
-						  in_padata[i], &out_pa,
-						  salt, etype, as_key,
-						  prompter, prompter_data,
-						  gak_fct, gak_data))) {
+		    if ((ret = ((*pa_types[j].fct)(context, request,
+						   in_padata[i], &out_pa,
+						   salt, etype, as_key,
+						   prompter, prompter_data,
+						   gak_fct, gak_data)))) {
 			if (out_pa_list) {
 			    out_pa_list[out_pa_list_size++] = NULL;
 			    krb5_free_pa_data(context, out_pa_list);