[CIFS] remove level of indentation from decode_negTokenInit

Most of this function takes place inside of an unnecessary "else"
clause. The other 2 cases both return 0, so we can remove some
indentation here.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>

fs/cifs/asn1.c

@@ -483,6 +483,7 @@ decode_negTokenInit(unsigned char *security_blob, int length,
 
 	asn1_open(&ctx, security_blob, length);
 
+	/* GSSAPI header */
 	if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) {
 		cFYI(1, ("Error decoding negTokenInit header"));
 		return 0;
@@ -490,16 +491,16 @@ decode_negTokenInit(unsigned char *security_blob, int length,
 		   || (tag != ASN1_EOC)) {
 		cFYI(1, ("cls = %d con = %d tag = %d", cls, con, tag));
 		return 0;
-	} else {
-		/*      remember to free obj->oid */
+	}
+
+	/* Check for SPNEGO OID -- remember to free obj->oid */
 	rc = asn1_header_decode(&ctx, &end, &cls, &con, &tag);
 	if (rc) {
 		if ((tag == ASN1_OJI) && (con == ASN1_PRI) &&
 		    (cls == ASN1_UNI)) {
 			rc = asn1_oid_decode(&ctx, end, &oid, &oidlen);
 			if (rc) {
-					rc = compare_oid(oid, oidlen,
-							 SPNEGO_OID,
+				rc = compare_oid(oid, oidlen, SPNEGO_OID,
 						 SPNEGO_OID_LEN);
 				kfree(oid);
 			}
@@ -507,6 +508,7 @@ decode_negTokenInit(unsigned char *security_blob, int length,
 			rc = 0;
 	}
 
+	/* SPNEGO OID not present or garbled -- bail out */
 	if (!rc) {
 		cFYI(1, ("Error decoding negTokenInit header"));
 		return 0;
@@ -567,22 +569,17 @@ decode_negTokenInit(unsigned char *security_blob, int length,
 		if ((tag == ASN1_OJI) && (con == ASN1_PRI)) {
 			if (asn1_oid_decode(&ctx, end, &oid, &oidlen)) {
 
-					cFYI(1,
-					  ("OID len = %d oid = 0x%lx 0x%lx "
-					   "0x%lx 0x%lx",
-					   oidlen, *oid, *(oid + 1),
-					   *(oid + 2), *(oid + 3)));
+				cFYI(1, ("OID len = %d oid = 0x%lx 0x%lx "
+					 "0x%lx 0x%lx", oidlen, *oid,
+					 *(oid + 1), *(oid + 2), *(oid + 3)));
 
-					if (compare_oid(oid, oidlen,
-							MSKRB5_OID,
+				if (compare_oid(oid, oidlen, MSKRB5_OID,
 						MSKRB5_OID_LEN))
 					use_kerberos = true;
-					else if (compare_oid(oid, oidlen,
-							     KRB5_OID,
+				else if (compare_oid(oid, oidlen, KRB5_OID,
 						     KRB5_OID_LEN))
 					use_kerberos = true;
-					else if (compare_oid(oid, oidlen,
-							     NTLMSSP_OID,
+				else if (compare_oid(oid, oidlen, NTLMSSP_OID,
 						     NTLMSSP_OID_LEN))
 					use_ntlmssp = true;
 
@@ -594,19 +591,16 @@ decode_negTokenInit(unsigned char *security_blob, int length,
 	}
 
 	if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) {
-			cFYI(1,
-			     ("Error decoding last part negTokenInit exit3"));
+		cFYI(1, ("Error decoding last part negTokenInit exit3"));
 		return 0;
 	} else if ((cls != ASN1_CTX) || (con != ASN1_CON)) {
 		/* tag = 3 indicating mechListMIC */
-			cFYI(1,
-			     ("Exit 4 cls = %d con = %d tag = %d end = %p (%d)",
+		cFYI(1, ("Exit 4 cls = %d con = %d tag = %d end = %p (%d)",
 			 cls, con, tag, end, *end));
 		return 0;
 	}
 	if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) {
-			cFYI(1,
-			     ("Error decoding last part negTokenInit exit5"));
+		cFYI(1, ("Error decoding last part negTokenInit exit5"));
 		return 0;
 	} else if ((cls != ASN1_UNI) || (con != ASN1_CON)
 		   || (tag != ASN1_SEQ)) {
@@ -615,29 +609,24 @@ decode_negTokenInit(unsigned char *security_blob, int length,
 	}
 
 	if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) {
-			cFYI(1,
-			     ("Error decoding last part negTokenInit exit 7"));
+		cFYI(1, ("Error decoding last part negTokenInit exit 7"));
 		return 0;
 	} else if ((cls != ASN1_CTX) || (con != ASN1_CON)) {
-			cFYI(1,
-			     ("Exit 8 cls = %d con = %d tag = %d end = %p (%d)",
+		cFYI(1, ("Exit 8 cls = %d con = %d tag = %d end = %p (%d)",
 			 cls, con, tag, end, *end));
 		return 0;
 	}
 	if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) {
-			cFYI(1,
-			     ("Error decoding last part negTokenInit exit9"));
+		cFYI(1, ("Error decoding last part negTokenInit exit9"));
 		return 0;
 	} else if ((cls != ASN1_UNI) || (con != ASN1_PRI)
 		   || (tag != ASN1_GENSTR)) {
-			cFYI(1,
-			     ("Exit10 cls = %d con = %d tag = %d end = %p (%d)",
+		cFYI(1, ("Exit10 cls = %d con = %d tag = %d end = %p (%d)",
 			 cls, con, tag, end, *end));
 		return 0;
 	}
 	cFYI(1, ("Need to call asn1_octets_decode() function for %s",
 		 ctx.pointer));	/* is this UTF-8 or ASCII? */
-	}
 
 	if (use_kerberos)
 		*secType = Kerberos;

fs/cifs/cifsfs.h

@@ -101,5 +101,5 @@ extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg);
 extern const struct export_operations cifs_export_ops;
 #endif /* EXPERIMENTAL */
 
-#define CIFS_VERSION   "1.53"
+#define CIFS_VERSION   "1.54"
 #endif				/* _CIFSFS_H */