8332 krb5: misleading-indentation

Reviewed by: Jason King <jason.brian.king@gmail.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Gordon Ross <gwr@nexenta.com>

4 files changed, 34 insertions, 35 deletions

diff --git a/usr/src/cmd/krb5/kadmin/dbutil/dump.c b/usr/src/cmd/krb5/kadmin/dbutil/dump.c
index a512d7527f..3f6b3b8f54 100644
--- a/usr/src/cmd/krb5/kadmin/dbutil/dump.c
+++ b/usr/src/cmd/krb5/kadmin/dbutil/dump.c
@@ -2833,9 +2833,9 @@ load_db(argc, argv)
 	    exit_status++;
 	    goto error;
 	}
-    }
-    else
+    } else {
 	db_locked = 1;
+    }
     
 	if (log_ctx && log_ctx->iproprole) {
 		if (add_update)
diff --git a/usr/src/cmd/krb5/kadmin/server/server_stubs.c b/usr/src/cmd/krb5/kadmin/server/server_stubs.c
index 76eef7227a..b90f5d54d1 100644
--- a/usr/src/cmd/krb5/kadmin/server/server_stubs.c
+++ b/usr/src/cmd/krb5/kadmin/server/server_stubs.c
@@ -554,42 +554,42 @@ create_principal_2_svc(cprinc_arg *arg, struct svc_req *rqstp)
 	 log_unauth("kadm5_create_principal", prime_arg,
 		client_name, service_name, client_addr(rqstp, buf));
     } else {
-	 ret.code = kadm5_create_principal((void *)handle,
+	ret.code = kadm5_create_principal((void *)handle,
 						&arg->rec, arg->mask,
 						arg->passwd);
 	/* Solaris Kerberos */
-	 if( ret.code != 0 )
+	if( ret.code != 0 )
 	     errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code);
 
-		audit_kadmind_auth(rqstp->rq_xprt, l_port,
+	audit_kadmind_auth(rqstp->rq_xprt, l_port,
 				"kadm5_create_principal",
 				prime_arg, client_name, ret.code);
-	 log_done("kadm5_create_principal", prime_arg,
+	log_done("kadm5_create_principal", prime_arg,
 	    errmsg ? errmsg : "success",
 	    client_name, service_name, client_addr(rqstp, buf));
 
-	  if (errmsg != NULL)
+	if (errmsg != NULL)
 		krb5_free_error_message(handle ? handle->context : NULL, errmsg);
 
-		if (policy_migrate && (ret.code == 0)) {
-			arg->rec.policy = strdup("default");
-			if ((arg->mask & KADM5_PW_EXPIRATION)) {
-				arg->mask = 0;
-				arg->mask |= KADM5_POLICY;
-				arg->mask |= KADM5_PW_EXPIRATION;
-			} else {
-				arg->mask = 0;
-				arg->mask |= KADM5_POLICY;
-			}
-
-			retval = kadm5_modify_principal((void *)handle,
-					&arg->rec, arg->mask);
-			log_done("kadm5_modify_principal",
-				prime_arg, ((retval == 0) ? "success" :
-				error_message(retval)), client_name,
-				service_name, client_addr(rqstp, buf));
+	if (policy_migrate && (ret.code == 0)) {
+		arg->rec.policy = strdup("default");
+		if ((arg->mask & KADM5_PW_EXPIRATION)) {
+			arg->mask = 0;
+			arg->mask |= KADM5_POLICY;
+			arg->mask |= KADM5_PW_EXPIRATION;
+		} else {
+			arg->mask = 0;
+			arg->mask |= KADM5_POLICY;
 		}
+
+		retval = kadm5_modify_principal((void *)handle,
+				&arg->rec, arg->mask);
+		log_done("kadm5_modify_principal",
+			prime_arg, ((retval == 0) ? "success" :
+			error_message(retval)), client_name,
+			service_name, client_addr(rqstp, buf));
 	}
+    }
 
 error:
     if (name)
diff --git a/usr/src/cmd/krb5/klist/klist.c b/usr/src/cmd/krb5/klist/klist.c
index 22c9a152ef..00fa45cfe4 100644
--- a/usr/src/cmd/krb5/klist/klist.c
+++ b/usr/src/cmd/krb5/klist/klist.c
@@ -2,7 +2,6 @@
  * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * clients/klist/klist.c
@@ -632,7 +631,7 @@ show_credential(cred)
 		fputs("\t",stdout);
 	else
 		fputs(", ",stdout);
-		fputs(gettext("renew until "), stdout);
+	fputs(gettext("renew until "), stdout);
 	printtime(cred->times.renew_till);
 	extra_field += 2;
     }
diff --git a/usr/src/cmd/krb5/krb5kdc/do_as_req.c b/usr/src/cmd/krb5/krb5kdc/do_as_req.c
index 4c415006ad..ed7383aebc 100644
--- a/usr/src/cmd/krb5/krb5kdc/do_as_req.c
+++ b/usr/src/cmd/krb5/krb5kdc/do_as_req.c
@@ -477,19 +477,19 @@ errout:
 	free_padata_context(kdc_context, &pa_context);
 
     if (status) {
-	const char * emsg = 0;
+	const char *emsg = NULL;
 	if (errcode) 
 	    emsg = krb5_get_error_message (kdc_context, errcode);
 
-	    audit_krb5kdc_as_req(&from_in4, (in_port_t)from->port,
-				0, cname, sname, errcode);
+	audit_krb5kdc_as_req(&from_in4, (in_port_t)from->port,
+	    0, cname, sname, errcode);
         krb5_klog_syslog(LOG_INFO, "AS_REQ (%s) %s: %s: %s for %s%s%s",
-			 ktypestr,
-	       fromstring, status, 
-	       cname ? cname : "<unknown client>",
-	       sname ? sname : "<unknown server>",
-	       errcode ? ", " : "",
-	       errcode ? emsg : "");
+	    ktypestr,
+	    fromstring, status,
+	    cname ? cname : "<unknown client>",
+	    sname ? sname : "<unknown server>",
+	    errcode ? ", " : "",
+	    errcode ? emsg : "");
 	if (errcode)
 	    krb5_free_error_message (kdc_context, emsg);
     }