Reindent per krb5-batch-reindent.el.

Some minor reformatting added in places to avoid exceeding 80 columns.
Used Emacs 22.1 built-in C mode.

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

33 files changed, 125 insertions, 132 deletions

diff --git a/src/lib/gssapi/generic/gssapi_generic.c b/src/lib/gssapi/generic/gssapi_generic.c
index 3ef2c0c8e..dd254cf97 100644
--- a/src/lib/gssapi/generic/gssapi_generic.c
+++ b/src/lib/gssapi/generic/gssapi_generic.c
@@ -371,11 +371,11 @@ static struct mech_attr_info_desc {
 
 OM_uint32
 generic_gss_display_mech_attr(
-      OM_uint32         *minor_status,
-      gss_const_OID      mech_attr,
-      gss_buffer_t       name,
-      gss_buffer_t       short_desc,
-      gss_buffer_t       long_desc)
+    OM_uint32         *minor_status,
+    gss_const_OID      mech_attr,
+    gss_buffer_t       name,
+    gss_buffer_t       short_desc,
+    gss_buffer_t       long_desc)
 {
     size_t i;
 
diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
index 3d4158163..a41968ed8 100644
--- a/src/lib/gssapi/krb5/accept_sec_context.c
+++ b/src/lib/gssapi/krb5/accept_sec_context.c
@@ -1374,4 +1374,3 @@ krb5_gss_accept_sec_context(minor_status, context_handle,
                                            delegated_cred_handle,
                                            &exts);
 }
-
diff --git a/src/lib/gssapi/krb5/acquire_cred.c b/src/lib/gssapi/krb5/acquire_cred.c
index e71420881..b95a5397e 100644
--- a/src/lib/gssapi/krb5/acquire_cred.c
+++ b/src/lib/gssapi/krb5/acquire_cred.c
@@ -875,4 +875,3 @@ gss_krb5int_import_cred(OM_uint32 *minor_status,
         k5_mutex_destroy(&name.lock);
     return code;
 }
-
diff --git a/src/lib/gssapi/krb5/gssapi_krb5.c b/src/lib/gssapi/krb5/gssapi_krb5.c
index 8dccc60d0..4d4f545f5 100644
--- a/src/lib/gssapi/krb5/gssapi_krb5.c
+++ b/src/lib/gssapi/krb5/gssapi_krb5.c
@@ -647,8 +647,8 @@ krb5_gss_inquire_mech_for_saslname(OM_uint32 *minor_status,
             *mech_type = (gss_OID)gss_mech_krb5;
         return GSS_S_COMPLETE;
     } else if (sasl_mech_name->length == GS2_IAKERB_SASL_NAME_LEN &&
-        memcmp(sasl_mech_name->value,
-               GS2_IAKERB_SASL_NAME, GS2_IAKERB_SASL_NAME_LEN) == 0) {
+               memcmp(sasl_mech_name->value,
+                      GS2_IAKERB_SASL_NAME, GS2_IAKERB_SASL_NAME_LEN) == 0) {
         if (mech_type != NULL)
             *mech_type = (gss_OID)gss_mech_iakerb;
         return GSS_S_COMPLETE;
@@ -668,7 +668,8 @@ krb5_gss_inquire_saslname_for_mech(OM_uint32 *minor_status,
         if (!g_make_string_buffer(GS2_IAKERB_SASL_NAME, sasl_mech_name) ||
             !g_make_string_buffer("iakerb", mech_name) ||
             !g_make_string_buffer("Initial and Pass Through Authentication "
-                             "Kerberos Mechanism (IAKERB)", mech_description))
+                                  "Kerberos Mechanism (IAKERB)",
+                                  mech_description))
             goto fail;
     } else {
         if (!g_make_string_buffer(GS2_KRB5_SASL_NAME, sasl_mech_name) ||
@@ -703,10 +704,11 @@ krb5_gss_inquire_attrs_for_mech(OM_uint32 *minor_status,
     if (GSS_ERROR(major))
         goto cleanup;
 
-#define MA_SUPPORTED(ma)    do { \
-    major = gss_add_oid_set_member(minor_status, (gss_OID)ma, mech_attrs);  \
-    if (GSS_ERROR(major))                                                   \
-        goto cleanup;                                                       \
+#define MA_SUPPORTED(ma)    do {                                        \
+        major = gss_add_oid_set_member(minor_status, (gss_OID)ma,       \
+                                       mech_attrs);                     \
+        if (GSS_ERROR(major))                                           \
+            goto cleanup;                                               \
     } while (0)
 
     MA_SUPPORTED(GSS_C_MA_MECH_CONCRETE);
diff --git a/src/lib/gssapi/krb5/import_name.c b/src/lib/gssapi/krb5/import_name.c
index 7583be72d..0e730f98e 100644
--- a/src/lib/gssapi/krb5/import_name.c
+++ b/src/lib/gssapi/krb5/import_name.c
@@ -219,7 +219,7 @@ krb5_gss_import_name(minor_status, input_name_buffer,
             goto do_getpwuid;
 #endif
         } else if (g_OID_equal(input_name_type, gss_nt_exported_name)) {
-#define BOUNDS_CHECK(cp, end, n) \
+#define BOUNDS_CHECK(cp, end, n)                                        \
             do { if ((end) - (cp) < (n)) goto fail_name; } while (0)
             cp = (unsigned char *)tmp;
             end = cp + input_name_buffer->length;
diff --git a/src/lib/gssapi/krb5/init_sec_context.c b/src/lib/gssapi/krb5/init_sec_context.c
index ea00c22af..0133bf084 100644
--- a/src/lib/gssapi/krb5/init_sec_context.c
+++ b/src/lib/gssapi/krb5/init_sec_context.c
@@ -1135,4 +1135,3 @@ krb5_gss_init_sec_context(minor_status, claimant_cred_handle,
                                          time_rec,
                                          &exts);
 }
-
diff --git a/src/lib/gssapi/krb5/prf.c b/src/lib/gssapi/krb5/prf.c
index 66cbe7078..6fd34e954 100644
--- a/src/lib/gssapi/krb5/prf.c
+++ b/src/lib/gssapi/krb5/prf.c
@@ -132,4 +132,3 @@ cleanup:
     *minor_status = (OM_uint32)code;
     return (code == 0) ? GSS_S_COMPLETE : GSS_S_FAILURE;
 }
-
diff --git a/src/lib/gssapi/krb5/store_cred.c b/src/lib/gssapi/krb5/store_cred.c
index 94cfd4326..5b4dfe8f7 100644
--- a/src/lib/gssapi/krb5/store_cred.c
+++ b/src/lib/gssapi/krb5/store_cred.c
@@ -182,4 +182,3 @@ krb5_gss_store_cred(OM_uint32 *minor_status,
 
     return GSS_S_COMPLETE;
 }
-
diff --git a/src/lib/gssapi/mechglue/g_acquire_cred_with_pw.c b/src/lib/gssapi/mechglue/g_acquire_cred_with_pw.c
index 3030ee741..92b30bafe 100644
--- a/src/lib/gssapi/mechglue/g_acquire_cred_with_pw.c
+++ b/src/lib/gssapi/mechglue/g_acquire_cred_with_pw.c
@@ -177,7 +177,7 @@ OM_uint32 *		time_rec;
     /* for each requested mech attempt to obtain a credential */
     for (i = 0; i < mechs->count; i++) {
 	major = gss_add_cred_with_password(minor_status, (gss_cred_id_t)creds,
-			     desired_name, 
+			     desired_name,
 			     &mechs->elements[i],
 			     password,
 			     cred_usage, time_req, time_req, NULL,
diff --git a/src/lib/gssapi/mechglue/g_mechattr.c b/src/lib/gssapi/mechglue/g_mechattr.c
index 663e02ad4..64bb03bc3 100644
--- a/src/lib/gssapi/mechglue/g_mechattr.c
+++ b/src/lib/gssapi/mechglue/g_mechattr.c
@@ -90,11 +90,11 @@ testMechAttrsKnown(gss_const_OID_set critical,
 
 OM_uint32 KRB5_CALLCONV
 gss_indicate_mechs_by_attrs(
-      OM_uint32         *minor,
-      gss_const_OID_set  desired_mech_attrs,
-      gss_const_OID_set  except_mech_attrs,
-      gss_const_OID_set  critical_mech_attrs,
-      gss_OID_set       *mechs)
+    OM_uint32         *minor,
+    gss_const_OID_set  desired_mech_attrs,
+    gss_const_OID_set  except_mech_attrs,
+    gss_const_OID_set  critical_mech_attrs,
+    gss_OID_set       *mechs)
 {
     OM_uint32       status, tmpMinor;
     gss_OID_set     allMechs = GSS_C_NO_OID_SET;
@@ -154,10 +154,10 @@ cleanup:
 
 OM_uint32 KRB5_CALLCONV
 gss_inquire_attrs_for_mech(
-      OM_uint32         *minor,
-      gss_const_OID      mech_oid,
-      gss_OID_set       *mech_attrs,
-      gss_OID_set       *known_mech_attrs)
+    OM_uint32         *minor,
+    gss_const_OID      mech_oid,
+    gss_OID_set       *mech_attrs,
+    gss_OID_set       *known_mech_attrs)
 {
     OM_uint32       status, tmpMinor;
     gss_mechanism   mech;
@@ -214,11 +214,11 @@ gss_inquire_attrs_for_mech(
 
 OM_uint32 KRB5_CALLCONV
 gss_display_mech_attr(
-      OM_uint32         *minor,
-      gss_const_OID      mech_attr,
-      gss_buffer_t       name,
-      gss_buffer_t       short_desc,
-      gss_buffer_t       long_desc)
+    OM_uint32         *minor,
+    gss_const_OID      mech_attr,
+    gss_buffer_t       name,
+    gss_buffer_t       short_desc,
+    gss_buffer_t       long_desc)
 {
     return generic_gss_display_mech_attr(minor, mech_attr,
                                          name, short_desc, long_desc);
diff --git a/src/lib/kadm5/srv/pwqual_princ.c b/src/lib/kadm5/srv/pwqual_princ.c
index f733a393f..cbf2d7205 100644
--- a/src/lib/kadm5/srv/pwqual_princ.c
+++ b/src/lib/kadm5/srv/pwqual_princ.c
@@ -61,7 +61,7 @@ princ_check(krb5_context context, krb5_pwqual_moddata data,
 
 krb5_error_code
 pwqual_princ_initvt(krb5_context context, int maj_ver, int min_ver,
-                   krb5_plugin_vtable vtable)
+                    krb5_plugin_vtable vtable)
 {
     krb5_pwqual_vtable vt;
 
diff --git a/src/lib/krb5/asn.1/asn1_k_decode_fast.c b/src/lib/krb5/asn.1/asn1_k_decode_fast.c
index 6d9ddd436..57546ac93 100644
--- a/src/lib/krb5/asn.1/asn1_k_decode_fast.c
+++ b/src/lib/krb5/asn.1/asn1_k_decode_fast.c
@@ -76,4 +76,3 @@ asn1_decode_fast_finished_ptr(asn1buf *buf, krb5_fast_finished **valptr)
 {
     decode_ptr( krb5_fast_finished *, asn1_decode_fast_finished);
 }
-
diff --git a/src/lib/krb5/asn.1/asn1_k_decode_kdc.c b/src/lib/krb5/asn.1/asn1_k_decode_kdc.c
index 52c371b9b..1711ca04a 100644
--- a/src/lib/krb5/asn.1/asn1_k_decode_kdc.c
+++ b/src/lib/krb5/asn.1/asn1_k_decode_kdc.c
@@ -25,7 +25,7 @@
  */
 
 #include "asn1_k_decode_macros.h"
- 
+
 asn1_error_code
 asn1_decode_kdc_req(asn1buf *buf, krb5_kdc_req *val)
 {
@@ -47,7 +47,7 @@ error_out:
     val->padata = NULL;
     return retval;
 }
-  
+
 asn1_error_code
 asn1_decode_kdc_req_body(asn1buf *buf, krb5_kdc_req *val)
 {
diff --git a/src/lib/krb5/asn.1/asn1_k_decode_macros.h b/src/lib/krb5/asn.1/asn1_k_decode_macros.h
index de433c2da..e7c8a54eb 100644
--- a/src/lib/krb5/asn.1/asn1_k_decode_macros.h
+++ b/src/lib/krb5/asn.1/asn1_k_decode_macros.h
@@ -41,11 +41,11 @@
 #define clean_return(val) { retval = val; goto error_out; }
 
 /* Declare useful decoder variables. */
-#define setup()                                                  \
-    asn1_error_code retval;                                      \
-    asn1_class asn1class;                                        \
-    asn1_construction construction KRB5_ATTR_UNUSED;             \
-    asn1_tagnum tagnum;                                          \
+#define setup()                                         \
+    asn1_error_code retval;                             \
+    asn1_class asn1class;                               \
+    asn1_construction construction KRB5_ATTR_UNUSED;    \
+    asn1_tagnum tagnum;                                 \
     unsigned int length, taglen KRB5_ATTR_UNUSED
 
 #define unused_var(x) if (0) { x = 0; x = x - x; }
diff --git a/src/lib/krb5/asn.1/asn1_k_decode_sam.c b/src/lib/krb5/asn.1/asn1_k_decode_sam.c
index ae4e42f4b..70405eb2f 100644
--- a/src/lib/krb5/asn.1/asn1_k_decode_sam.c
+++ b/src/lib/krb5/asn.1/asn1_k_decode_sam.c
@@ -270,4 +270,3 @@ error_out:
     krb5_free_predicted_sam_response_contents(NULL, val);
     return retval;
 }
-
diff --git a/src/lib/krb5/asn.1/asn1_k_encode.c b/src/lib/krb5/asn.1/asn1_k_encode.c
index 746b9128c..fffe9474c 100644
--- a/src/lib/krb5/asn.1/asn1_k_encode.c
+++ b/src/lib/krb5/asn.1/asn1_k_encode.c
@@ -1419,7 +1419,7 @@ static unsigned int iakerb_finished_optional(const void *p)
 }
 
 DEFSEQTYPE(iakerb_finished, krb5_iakerb_finished, iakerb_finished_fields,
-iakerb_finished_optional);
+           iakerb_finished_optional);
 
 /* Exported complete encoders -- these produce a krb5_data with
    the encoding in the correct byte order.  */
diff --git a/src/lib/krb5/asn.1/krb5_decode_kdc.c b/src/lib/krb5/asn.1/krb5_decode_kdc.c
index 36380c2fb..ac6ef2056 100644
--- a/src/lib/krb5/asn.1/krb5_decode_kdc.c
+++ b/src/lib/krb5/asn.1/krb5_decode_kdc.c
@@ -95,7 +95,7 @@ decode_krb5_kdc_req_body(const krb5_data *code, krb5_kdc_req **repptr)
 
     cleanup(free);
 }
-  
+
 krb5_error_code
 decode_krb5_fast_req(const krb5_data *code, krb5_fast_req **repptr)
 {
@@ -167,4 +167,3 @@ decode_krb5_pa_pk_as_req_draft9(const krb5_data *code,
     cleanup(free);
 }
 #endif /* DISABLE_PKINIT */
-
diff --git a/src/lib/krb5/asn.1/krb5_decode_macros.h b/src/lib/krb5/asn.1/krb5_decode_macros.h
index 16ae6fe2f..aada1be62 100644
--- a/src/lib/krb5/asn.1/krb5_decode_macros.h
+++ b/src/lib/krb5/asn.1/krb5_decode_macros.h
@@ -53,9 +53,9 @@
     retval = asn1buf_wrap_data(&buf,code);      \
     if (retval) return retval
 
-#define setup_no_tagnum(type)                                    \
-    asn1_class asn1class KRB5_ATTR_UNUSED;                       \
-    asn1_construction construction KRB5_ATTR_UNUSED;             \
+#define setup_no_tagnum(type)                           \
+    asn1_class asn1class KRB5_ATTR_UNUSED;              \
+    asn1_construction construction KRB5_ATTR_UNUSED;    \
     setup_buf_only(type)
 
 #define setup_no_length(type)                   \
diff --git a/src/lib/krb5/krb/authdata.c b/src/lib/krb5/krb/authdata.c
index 351762eb1..a24143062 100644
--- a/src/lib/krb5/krb/authdata.c
+++ b/src/lib/krb5/krb/authdata.c
@@ -1199,7 +1199,7 @@ krb5_ser_authdata_context_init(krb5_context kcontext)
 
 krb5_error_code
 krb5int_copy_authdatum(krb5_context context,
-               const krb5_authdata *inad, krb5_authdata **outad)
+                       const krb5_authdata *inad, krb5_authdata **outad)
 {
     krb5_authdata *tmpad;
 
diff --git a/src/lib/krb5/krb/authdata_dec.c b/src/lib/krb5/krb/authdata_dec.c
index 5c9efbb16..9809b3376 100644
--- a/src/lib/krb5/krb/authdata_dec.c
+++ b/src/lib/krb5/krb/authdata_dec.c
@@ -105,7 +105,7 @@ grow_find_authdata(krb5_context context, struct find_authdata_context *fctx,
     }
     fctx->out[fctx->length+1] = NULL;
     retval = krb5int_copy_authdatum(context, elem,
-                            &fctx->out[fctx->length]);
+                                    &fctx->out[fctx->length]);
     if (retval == 0)
         fctx->length++;
     return retval;
diff --git a/src/lib/krb5/krb/copy_auth.c b/src/lib/krb5/krb/copy_auth.c
index a22d8cbb8..06a06450c 100644
--- a/src/lib/krb5/krb/copy_auth.c
+++ b/src/lib/krb5/krb/copy_auth.c
@@ -86,7 +86,7 @@ krb5_merge_authdata(krb5_context context,
     if (inauthdat1) {
         for (nelems = 0; inauthdat1[nelems]; nelems++) {
             retval = krb5int_copy_authdatum(context, inauthdat1[nelems],
-                                    &tempauthdat[nelems]);
+                                            &tempauthdat[nelems]);
             if (retval) {
                 krb5_free_authdata(context, tempauthdat);
                 return retval;
@@ -97,7 +97,7 @@ krb5_merge_authdata(krb5_context context,
     if (inauthdat2) {
         for (nelems2 = 0; inauthdat2[nelems2]; nelems2++) {
             retval = krb5int_copy_authdatum(context, inauthdat2[nelems2],
-                                    &tempauthdat[nelems++]);
+                                            &tempauthdat[nelems++]);
             if (retval) {
                 krb5_free_authdata(context, tempauthdat);
                 return retval;
diff --git a/src/lib/krb5/krb/fast.c b/src/lib/krb5/krb/fast.c
index 0d04cc2b0..2290d4874 100644
--- a/src/lib/krb5/krb/fast.c
+++ b/src/lib/krb5/krb/fast.c
@@ -153,7 +153,7 @@ krb5int_fast_as_armor(krb5_context context,
                                  &ccache);
         if (retval == 0) {
             retval = krb5int_tgtname(context, target_realm, target_realm,
-                                  &target_principal);
+                                     &target_principal);
         }
         if (retval == 0) {
             krb5_data config_data;
diff --git a/src/lib/krb5/krb/gic_opt.c b/src/lib/krb5/krb/gic_opt.c
index acb6f126d..a98a47ed2 100644
--- a/src/lib/krb5/krb/gic_opt.c
+++ b/src/lib/krb5/krb/gic_opt.c
@@ -228,8 +228,8 @@ krb5_get_init_creds_opt_free(krb5_context context,
 
 static krb5_error_code
 gic_opte_copy(krb5_context context,
-                      krb5_get_init_creds_opt *opt,
-                      krb5_gic_opt_ext **opte)
+              krb5_get_init_creds_opt *opt,
+              krb5_gic_opt_ext **opte)
 {
     krb5_gic_opt_ext *oe;
 
diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c
index 4896bef02..f244d566e 100644
--- a/src/lib/krb5/krb/init_ctx.c
+++ b/src/lib/krb5/krb/init_ctx.c
@@ -143,12 +143,12 @@ krb5_init_context_profile(profile_t profile, krb5_flags flags,
      * The context being NULL is ok.
      */
     krb5_win_ccdll_load(ctx);
-p
-    /*
-     * krb5_vercheck() is defined in win_glue.c, and this is
-     * where we handle the timebomb and version server checks.
-     */
-    retval = krb5_vercheck();
+    p
+        /*
+         * krb5_vercheck() is defined in win_glue.c, and this is
+         * where we handle the timebomb and version server checks.
+         */
+        retval = krb5_vercheck();
     if (retval)
         return retval;
 #endif
diff --git a/src/lib/krb5/krb/int-proto.h b/src/lib/krb5/krb/int-proto.h
index 4a3cea80d..336c04571 100644
--- a/src/lib/krb5/krb/int-proto.h
+++ b/src/lib/krb5/krb/int-proto.h
@@ -29,7 +29,7 @@
 
 krb5_error_code
 krb5int_tgtname(krb5_context context, const krb5_data *, const krb5_data *,
-             krb5_principal *);
+                krb5_principal *);
 
 krb5_error_code
 krb5int_libdefault_boolean(krb5_context, const krb5_data *, const char *,
diff --git a/src/lib/krb5/krb/rd_cred.c b/src/lib/krb5/krb/rd_cred.c
index df9497b2d..22eb4ec7c 100644
--- a/src/lib/krb5/krb/rd_cred.c
+++ b/src/lib/krb5/krb/rd_cred.c
@@ -208,15 +208,15 @@ krb5_rd_cred(krb5_context context, krb5_auth_context auth_context,
      * If decrypting with the subsession key fails, perhaps the
      * credentials are stored in the session key so try decrypting with that.
      */
-     if (auth_context->recv_subkey == NULL ||
-         (retval = krb5_rd_cred_basic(context, pcreddata,
-                                      auth_context->recv_subkey,
-                                      &replaydata, pppcreds))) {
-         retval = krb5_rd_cred_basic(context, pcreddata,
-                                     auth_context->key,
-                                     &replaydata, pppcreds);
-         if (retval)
-             return retval;
+    if (auth_context->recv_subkey == NULL ||
+        (retval = krb5_rd_cred_basic(context, pcreddata,
+                                     auth_context->recv_subkey,
+                                     &replaydata, pppcreds))) {
+        retval = krb5_rd_cred_basic(context, pcreddata,
+                                    auth_context->key,
+                                    &replaydata, pppcreds);
+        if (retval)
+            return retval;
     }
 
     if (auth_context->auth_context_flags & KRB5_AUTH_CONTEXT_DO_TIME) {
diff --git a/src/lib/krb5/krb/s4u_authdata.c b/src/lib/krb5/krb/s4u_authdata.c
index 54713cc85..d93e75816 100644
--- a/src/lib/krb5/krb/s4u_authdata.c
+++ b/src/lib/krb5/krb/s4u_authdata.c
@@ -190,7 +190,7 @@ s4u2proxy_export_authdata(krb5_context kcontext,
 
     *out_authdata = authdata;
 
-    return 0; 
+    return 0;
 }
 
 static krb5_error_code
@@ -287,8 +287,8 @@ s4u2proxy_get_attribute(krb5_context kcontext,
                         const krb5_data *attribute,
                         krb5_boolean *authenticated,
                         krb5_boolean *complete,
-                        krb5_data *value, 
-                        krb5_data *display_value, 
+                        krb5_data *value,
+                        krb5_data *display_value,
                         int *more)
 {
     struct s4u2proxy_context *s4uctx = (struct s4u2proxy_context *)request_context;
@@ -423,7 +423,7 @@ s4u2proxy_size(krb5_context kcontext,
         if (code != 0)
             return code;
     }
-                            
+
     *sizep += sizeof(krb5_int32); /* authenticated flag */
 
     return code;
@@ -463,7 +463,7 @@ s4u2proxy_externalize(krb5_context kcontext,
         if (code != 0)
             return code;
     }
-    
+
     krb5_ser_pack_int32(s4uctx->authenticated, &bp, &remain); /* authenticated */
 
     *buffer = bp;
@@ -599,4 +599,3 @@ krb5plugin_authdata_client_ftable_v0 krb5int_s4u2proxy_authdata_client_ftable =
     s4u2proxy_internalize,
     s4u2proxy_copy
 };
-
diff --git a/src/lib/krb5/krb/s4u_creds.c b/src/lib/krb5/krb/s4u_creds.c
index 57e8b92d4..e4cc8a14b 100644
--- a/src/lib/krb5/krb/s4u_creds.c
+++ b/src/lib/krb5/krb/s4u_creds.c
@@ -82,7 +82,7 @@ s4u_identify_user(krb5_context context,
 
         return krb5_copy_principal(context,
                                    anonymous ? in_creds->server
-                                             : in_creds->client,
+                                   : in_creds->client,
                                    canon_user);
     }
 
@@ -685,14 +685,14 @@ krb5_get_credentials_for_user(krb5_context context, krb5_flags options,
 
     if (in_creds->client != NULL &&
         in_creds->client->type == KRB5_NT_ENTERPRISE_PRINCIPAL) {
-       /* Post-canonicalisation check for enterprise principals */
-       krb5_creds mcreds = *in_creds;
-       mcreds.client = realm;
-       code = krb5_get_credentials(context, options | KRB5_GC_CACHED,
-                                   ccache, &mcreds, out_creds);
-       if ((code != KRB5_CC_NOTFOUND && code != KRB5_CC_NOT_KTYPE)
-           || (options & KRB5_GC_CACHED))
-           goto cleanup;
+        /* Post-canonicalisation check for enterprise principals */
+        krb5_creds mcreds = *in_creds;
+        mcreds.client = realm;
+        code = krb5_get_credentials(context, options | KRB5_GC_CACHED,
+                                    ccache, &mcreds, out_creds);
+        if ((code != KRB5_CC_NOTFOUND && code != KRB5_CC_NOT_KTYPE)
+            || (options & KRB5_GC_CACHED))
+            goto cleanup;
     }
 
     code = krb5_get_self_cred_from_kdc(context, options, ccache,
diff --git a/src/lib/krb5/krb/t_expire_warn.c b/src/lib/krb5/krb/t_expire_warn.c
index c6ff8242e..1e59acba1 100644
--- a/src/lib/krb5/krb/t_expire_warn.c
+++ b/src/lib/krb5/krb/t_expire_warn.c
@@ -30,7 +30,7 @@ static int exp_dummy, prompt_dummy;
 
 static krb5_error_code
 prompter_cb(krb5_context ctx, void *data, const char *name,
-	    const char *banner, int num_prompts, krb5_prompt prompts[])
+            const char *banner, int num_prompts, krb5_prompt prompts[])
 {
     /* Not expecting any actual prompts, only banners. */
     assert(num_prompts == 0);
@@ -41,7 +41,7 @@ prompter_cb(krb5_context ctx, void *data, const char *name,
 
 static void
 expire_cb(krb5_context ctx, void *data, krb5_timestamp password_expiration,
-	  krb5_timestamp account_expiration, krb5_boolean is_last_req)
+          krb5_timestamp account_expiration, krb5_boolean is_last_req)
 {
     printf("password_expiration = %ld\n", (long)password_expiration);
     printf("account_expiration = %ld\n", (long)account_expiration);
@@ -59,26 +59,26 @@ main(int argc, char **argv)
     krb5_creds creds;
 
     if (argc < 4) {
-	fprintf(stderr, "Usage: %s username password {1|0} [service]\n",
-		argv[0]);
-	return 1;
+        fprintf(stderr, "Usage: %s username password {1|0} [service]\n",
+                argv[0]);
+        return 1;
     }
     user = argv[1];
     password = argv[2];
     use_cb = atoi(argv[3]);
     if (argc >= 5)
-	service = argv[4];
+        service = argv[4];
 
     assert(krb5_init_context(&ctx) == 0);
     assert(krb5_get_init_creds_opt_alloc(ctx, &opt) == 0);
     if (use_cb) {
-	assert(krb5_get_init_creds_opt_set_expire_callback(ctx, opt, expire_cb,
-							   &exp_dummy) == 0);
+        assert(krb5_get_init_creds_opt_set_expire_callback(ctx, opt, expire_cb,
+                                                           &exp_dummy) == 0);
     }
     assert(krb5_parse_name(ctx, user, &client) == 0);
     assert(krb5_get_init_creds_password(ctx, &creds, client, password,
-					prompter_cb, &prompt_dummy, 0, service,
-					opt) == 0);
+                                        prompter_cb, &prompt_dummy, 0, service,
+                                        opt) == 0);
     krb5_get_init_creds_opt_free(ctx, opt);
     krb5_free_principal(ctx, client);
     krb5_free_cred_contents(ctx, &creds);
diff --git a/src/lib/krb5/krb/t_vfy_increds.c b/src/lib/krb5/krb/t_vfy_increds.c
index 4fb2498f2..e5d68777a 100644
--- a/src/lib/krb5/krb/t_vfy_increds.c
+++ b/src/lib/krb5/krb/t_vfy_increds.c
@@ -51,6 +51,6 @@ main(int argc, char **argv)
     assert(krb5_cc_close(context, ccache) == 0);
 
     if (krb5_verify_init_creds(context, &creds, NULL, NULL, NULL, NULL) != 0)
-	return 1;
+        return 1;
     return 0;
 }
diff --git a/src/lib/krb5/krb/val_renew.c b/src/lib/krb5/krb/val_renew.c
index ef37bdfed..39912aaa8 100644
--- a/src/lib/krb5/krb/val_renew.c
+++ b/src/lib/krb5/krb/val_renew.c
@@ -46,7 +46,7 @@
  */
 static krb5_error_code
 get_new_creds(krb5_context context, krb5_ccache ccache, krb5_creds *in_creds,
-	      krb5_flags kdcopt, krb5_creds **out_creds)
+              krb5_flags kdcopt, krb5_creds **out_creds)
 {
     krb5_error_code code;
     krb5_creds old_creds, *new_creds = NULL;
@@ -55,19 +55,19 @@ get_new_creds(krb5_context context, krb5_ccache ccache, krb5_creds *in_creds,
 
     /* Retrieve an existing cached credential matching in_creds. */
     code = krb5_cc_retrieve_cred(context, ccache, KRB5_TC_SUPPORTED_KTYPES,
-				 in_creds, &old_creds);
+                                 in_creds, &old_creds);
     if (code != 0)
-	return code;
+        return code;
 
     /* Use KDC options from old credential as well as requested options. */
     kdcopt |= (old_creds.ticket_flags & KDC_TKT_COMMON_MASK);
 
     /* Use the old credential to get a new credential from the KDC. */
     code = krb5_get_cred_via_tkt(context, &old_creds, kdcopt,
-				 old_creds.addresses, in_creds, &new_creds);
+                                 old_creds.addresses, in_creds, &new_creds);
     krb5_free_cred_contents(context, &old_creds);
     if (code != 0)
-	return code;
+        return code;
 
     *out_creds = new_creds;
     return code;
@@ -80,7 +80,7 @@ get_new_creds(krb5_context context, krb5_ccache ccache, krb5_creds *in_creds,
  */
 static krb5_error_code
 gc_valrenew(krb5_context context, krb5_ccache ccache, krb5_creds *in_creds,
-	    krb5_flags kdcopt, krb5_creds **out_creds)
+            krb5_flags kdcopt, krb5_creds **out_creds)
 {
     krb5_error_code code;
     krb5_creds *new_creds = NULL;
@@ -89,7 +89,7 @@ gc_valrenew(krb5_context context, krb5_ccache ccache, krb5_creds *in_creds,
     /* Get the validated or renewed credential. */
     code = get_new_creds(context, ccache, in_creds, kdcopt, &new_creds);
     if (code != 0)
-	goto cleanup;
+        goto cleanup;
 
     /* Reinitialize the cache without changing its default principal. */
     code = krb5_cc_get_principal(context, ccache, &default_princ);
@@ -102,7 +102,7 @@ gc_valrenew(krb5_context context, krb5_ccache ccache, krb5_creds *in_creds,
     /* Store the validated or renewed cred in the now-empty cache. */
     code = krb5_cc_store_cred(context, ccache, new_creds);
     if (code != 0)
-	goto cleanup;
+        goto cleanup;
 
     *out_creds = new_creds;
     new_creds = NULL;
@@ -135,29 +135,29 @@ krb5_get_credentials_renew(krb5_context context, krb5_flags options,
  */
 static krb5_error_code
 get_valrenewed_creds(krb5_context context, krb5_creds *out_creds,
-		     krb5_principal client, krb5_ccache ccache,
-		     char *in_tkt_service, int kdcopt)
+                     krb5_principal client, krb5_ccache ccache,
+                     char *in_tkt_service, int kdcopt)
 {
     krb5_error_code code;
     krb5_creds in_creds, *new_creds;
     krb5_principal server = NULL;
 
     if (in_tkt_service != NULL) {
-	/* Parse in_tkt_service, but use the client's realm. */
-	code = krb5_parse_name(context, in_tkt_service, &server);
-	if (code != 0)
-	    goto cleanup;
-	krb5_free_data_contents(context, &server->realm);
-	code = krb5int_copy_data_contents(context, &client->realm,
-					  &server->realm);
-	if (code != 0)
-	    goto cleanup;
+        /* Parse in_tkt_service, but use the client's realm. */
+        code = krb5_parse_name(context, in_tkt_service, &server);
+        if (code != 0)
+            goto cleanup;
+        krb5_free_data_contents(context, &server->realm);
+        code = krb5int_copy_data_contents(context, &client->realm,
+                                          &server->realm);
+        if (code != 0)
+            goto cleanup;
     } else {
-	/* Use the TGT name for the client's realm. */
-	code = krb5int_tgtname(context, &client->realm, &client->realm,
-			       &server);
-	if (code != 0)
-	    goto cleanup;
+        /* Use the TGT name for the client's realm. */
+        code = krb5int_tgtname(context, &client->realm, &client->realm,
+                               &server);
+        if (code != 0)
+            goto cleanup;
     }
 
     memset(&in_creds, 0, sizeof(krb5_creds));
@@ -167,7 +167,7 @@ get_valrenewed_creds(krb5_context context, krb5_creds *out_creds,
     /* Get the validated or renewed credential from the KDC. */
     code = get_new_creds(context, ccache, &in_creds, kdcopt, &new_creds);
     if (code != 0)
-	goto cleanup;
+        goto cleanup;
 
     /* Fill in *out_creds and free the unwanted new_creds container. */
     *out_creds = *new_creds;
@@ -180,18 +180,18 @@ cleanup:
 
 krb5_error_code KRB5_CALLCONV
 krb5_get_validated_creds(krb5_context context, krb5_creds *creds,
-			 krb5_principal client, krb5_ccache ccache,
-			 char *in_tkt_service)
+                         krb5_principal client, krb5_ccache ccache,
+                         char *in_tkt_service)
 {
     return get_valrenewed_creds(context, creds, client, ccache,
-				in_tkt_service, KDC_OPT_VALIDATE);
+                                in_tkt_service, KDC_OPT_VALIDATE);
 }
 
 krb5_error_code KRB5_CALLCONV
 krb5_get_renewed_creds(krb5_context context, krb5_creds *creds,
-		       krb5_principal client, krb5_ccache ccache,
-		       char *in_tkt_service)
+                       krb5_principal client, krb5_ccache ccache,
+                       char *in_tkt_service)
 {
     return get_valrenewed_creds(context, creds, client, ccache,
-				in_tkt_service, KDC_OPT_RENEW);
+                                in_tkt_service, KDC_OPT_RENEW);
 }
diff --git a/src/lib/krb5/os/locate_kdc.c b/src/lib/krb5/os/locate_kdc.c
index 8bcfb2678..acfce8c87 100644
--- a/src/lib/krb5/os/locate_kdc.c
+++ b/src/lib/krb5/os/locate_kdc.c
@@ -186,8 +186,8 @@ add_host_to_list(struct serverlist *list, const char *hostname, int port,
 
 static krb5_error_code
 locate_srv_conf_1(krb5_context context, const krb5_data *realm,
-                       const char * name, struct serverlist *serverlist,
-                       int socktype, int udpport, int sec_udpport)
+                  const char * name, struct serverlist *serverlist,
+                  int socktype, int udpport, int sec_udpport)
 {
     const char  *realm_srv_names[4];
     char **hostlist, *host, *port, *cp;
diff --git a/src/lib/krb5/os/trace.c b/src/lib/krb5/os/trace.c
index 83df52eb7..a31b0059f 100644
--- a/src/lib/krb5/os/trace.c
+++ b/src/lib/krb5/os/trace.c
@@ -8,7 +8,7 @@
  *   require a specific license from the United States Government.
  *   It is the responsibility of any person or organization contemplating
  *   export to obtain such a license before exporting.
- * 
+ *
  * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
  * distribute this software and its documentation for any purpose and
  * without fee is hereby granted, provided that the above copyright