Untabify. Normalize whitespace. Reindent. Fix some of the most

egregious formatting quirks.  Add emacs mode settings to flag
untabified source files.

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

1 files changed, 94 insertions, 93 deletions

diff --git a/src/lib/gssapi/krb5/gssapi_krb5.c b/src/lib/gssapi/krb5/gssapi_krb5.c
index 95a8763..64812a7 100644
--- a/src/lib/gssapi/krb5/gssapi_krb5.c
+++ b/src/lib/gssapi/krb5/gssapi_krb5.c
@@ -1,6 +1,7 @@
+/* -*- mode: c; indent-tabs-mode: nil -*- */
 /*
  * Copyright 1993 by OpenVision Technologies, Inc.
- * 
+ *
  * Permission to use, copy, modify, distribute, and sell this software
  * and its documentation for any purpose is hereby granted without fee,
  * provided that the above copyright notice appears in all copies and
@@ -10,7 +11,7 @@
  * without specific, written prior permission. OpenVision makes no
  * representations about the suitability of this software for any
  * purpose.  It is provided "as is" without express or implied warranty.
- * 
+ *
  * OPENVISION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
  * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
  * EVENT SHALL OPENVISION BE LIABLE FOR ANY SPECIAL, INDIRECT OR
@@ -22,14 +23,14 @@
 
 /*
  * Copyright (C) 1998 by the FundsXpress, INC.
- * 
+ *
  * All rights reserved.
- * 
+ *
  * Export of this software from the United States of America may 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
@@ -40,7 +41,7 @@
  * permission.  FundsXpress makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
@@ -61,21 +62,21 @@
 
 /*
  * The OID of the draft krb5 mechanism, assigned by IETF, is:
- * 	iso(1) org(3) dod(5) internet(1) security(5)
- *	kerberosv5(2) = 1.3.5.1.5.2
+ *      iso(1) org(3) dod(5) internet(1) security(5)
+ *      kerberosv5(2) = 1.3.5.1.5.2
  * The OID of the krb5_name type is:
- * 	iso(1) member-body(2) US(840) mit(113554) infosys(1) gssapi(2)
- * 	krb5(2) krb5_name(1) = 1.2.840.113554.1.2.2.1
+ *      iso(1) member-body(2) US(840) mit(113554) infosys(1) gssapi(2)
+ *      krb5(2) krb5_name(1) = 1.2.840.113554.1.2.2.1
  * The OID of the krb5_principal type is:
- * 	iso(1) member-body(2) US(840) mit(113554) infosys(1) gssapi(2)
- * 	krb5(2) krb5_principal(2) = 1.2.840.113554.1.2.2.2
+ *      iso(1) member-body(2) US(840) mit(113554) infosys(1) gssapi(2)
+ *      krb5(2) krb5_principal(2) = 1.2.840.113554.1.2.2.2
  * The OID of the proposed standard krb5 mechanism is:
- * 	iso(1) member-body(2) US(840) mit(113554) infosys(1) gssapi(2)
- * 	krb5(2) = 1.2.840.113554.1.2.2
+ *      iso(1) member-body(2) US(840) mit(113554) infosys(1) gssapi(2)
+ *      krb5(2) = 1.2.840.113554.1.2.2
  * The OID of the proposed standard krb5 v2 mechanism is:
- * 	iso(1) member-body(2) US(840) mit(113554) infosys(1) gssapi(2)
- * 	krb5v2(3) = 1.2.840.113554.1.2.3
- *	
+ *      iso(1) member-body(2) US(840) mit(113554) infosys(1) gssapi(2)
+ *      krb5v2(3) = 1.2.840.113554.1.2.3
+ *
  */
 
 /*
@@ -86,26 +87,26 @@
  */
 
 const gss_OID_desc krb5_gss_oid_array[] = {
-   /* this is the official, rfc-specified OID */
-   {GSS_MECH_KRB5_OID_LENGTH, GSS_MECH_KRB5_OID},
-   /* this pre-RFC mech OID */
-   {GSS_MECH_KRB5_OLD_OID_LENGTH, GSS_MECH_KRB5_OLD_OID},
-   /* this is the unofficial, incorrect mech OID emitted by MS */
-   {GSS_MECH_KRB5_WRONG_OID_LENGTH, GSS_MECH_KRB5_WRONG_OID},
-   /* this is the v2 assigned OID */
-   {9, "\052\206\110\206\367\022\001\002\003"},
-   /* these two are name type OID's */
+    /* this is the official, rfc-specified OID */
+    {GSS_MECH_KRB5_OID_LENGTH, GSS_MECH_KRB5_OID},
+    /* this pre-RFC mech OID */
+    {GSS_MECH_KRB5_OLD_OID_LENGTH, GSS_MECH_KRB5_OLD_OID},
+    /* this is the unofficial, incorrect mech OID emitted by MS */
+    {GSS_MECH_KRB5_WRONG_OID_LENGTH, GSS_MECH_KRB5_WRONG_OID},
+    /* this is the v2 assigned OID */
+    {9, "\052\206\110\206\367\022\001\002\003"},
+    /* these two are name type OID's */
 
     /* 2.1.1. Kerberos Principal Name Form:  (rfc 1964)
      * This name form shall be represented by the Object Identifier {iso(1)
      * member-body(2) United States(840) mit(113554) infosys(1) gssapi(2)
      * krb5(2) krb5_name(1)}.  The recommended symbolic name for this type
      * is "GSS_KRB5_NT_PRINCIPAL_NAME". */
-   {10, "\052\206\110\206\367\022\001\002\002\001"},
+    {10, "\052\206\110\206\367\022\001\002\002\001"},
 
-   /* gss_nt_krb5_principal.  Object identifier for a krb5_principal. Do not use. */
-   {10, "\052\206\110\206\367\022\001\002\002\002"},
-   { 0, 0 }
+    /* gss_nt_krb5_principal.  Object identifier for a krb5_principal. Do not use. */
+    {10, "\052\206\110\206\367\022\001\002\002\002"},
+    { 0, 0 }
 };
 
 const gss_OID_desc * const gss_mech_krb5              = krb5_gss_oid_array+0;
@@ -116,11 +117,11 @@ const gss_OID_desc * const gss_nt_krb5_principal      = krb5_gss_oid_array+5;
 const gss_OID_desc * const GSS_KRB5_NT_PRINCIPAL_NAME = krb5_gss_oid_array+4;
 
 static const gss_OID_set_desc oidsets[] = {
-   {1, (gss_OID) krb5_gss_oid_array+0},
-   {1, (gss_OID) krb5_gss_oid_array+1},
-   {3, (gss_OID) krb5_gss_oid_array+0},
-   {1, (gss_OID) krb5_gss_oid_array+2},
-   {3, (gss_OID) krb5_gss_oid_array+0},
+    {1, (gss_OID) krb5_gss_oid_array+0},
+    {1, (gss_OID) krb5_gss_oid_array+1},
+    {3, (gss_OID) krb5_gss_oid_array+0},
+    {1, (gss_OID) krb5_gss_oid_array+2},
+    {3, (gss_OID) krb5_gss_oid_array+0},
 };
 
 const gss_OID_set_desc * const gss_mech_set_krb5 = oidsets+0;
@@ -137,54 +138,54 @@ g_set kg_vdb = G_SET_INIT;
  */
 OM_uint32
 kg_get_defcred(minor_status, cred)
-     OM_uint32 *minor_status;
-     gss_cred_id_t *cred;
+    OM_uint32 *minor_status;
+    gss_cred_id_t *cred;
 {
     OM_uint32 major;
-    
-    if ((major = krb5_gss_acquire_cred(minor_status, 
-				      (gss_name_t) NULL, GSS_C_INDEFINITE, 
-				      GSS_C_NULL_OID_SET, GSS_C_INITIATE, 
-				      cred, NULL, NULL)) && GSS_ERROR(major)) {
-      return(major);
-   }
-   *minor_status = 0;
-   return(GSS_S_COMPLETE);
+
+    if ((major = krb5_gss_acquire_cred(minor_status,
+                                       (gss_name_t) NULL, GSS_C_INDEFINITE,
+                                       GSS_C_NULL_OID_SET, GSS_C_INITIATE,
+                                       cred, NULL, NULL)) && GSS_ERROR(major)) {
+        return(major);
+    }
+    *minor_status = 0;
+    return(GSS_S_COMPLETE);
 }
 
 OM_uint32
 kg_sync_ccache_name (krb5_context context, OM_uint32 *minor_status)
 {
     OM_uint32 err = 0;
-    
-    /* 
+
+    /*
      * Sync up the context ccache name with the GSSAPI ccache name.
-     * If kg_ccache_name is NULL -- normal unless someone has called 
-     * gss_krb5_ccache_name() -- then the system default ccache will 
+     * If kg_ccache_name is NULL -- normal unless someone has called
+     * gss_krb5_ccache_name() -- then the system default ccache will
      * be picked up and used by resetting the context default ccache.
      * This is needed for platforms which support multiple ccaches.
      */
-    
+
     if (!err) {
         /* if NULL, resets the context default ccache */
         err = krb5_cc_set_default_name(context,
-				       (char *) k5_getspecific(K5_KEY_GSS_KRB5_CCACHE_NAME));
+                                       (char *) k5_getspecific(K5_KEY_GSS_KRB5_CCACHE_NAME));
     }
-    
+
     *minor_status = err;
     return (*minor_status == 0) ? GSS_S_COMPLETE : GSS_S_FAILURE;
 }
 
 /* This function returns whether or not the caller set a cccache name.  Used by
- * gss_acquire_cred to figure out if the caller wants to only look at this 
+ * gss_acquire_cred to figure out if the caller wants to only look at this
  * ccache or search the cache collection for the desired name */
 OM_uint32
-kg_caller_provided_ccache_name (OM_uint32 *minor_status, 
-int *out_caller_provided_name)
+kg_caller_provided_ccache_name (OM_uint32 *minor_status,
+                                int *out_caller_provided_name)
 {
     if (out_caller_provided_name) {
-        *out_caller_provided_name = 
-	  (k5_getspecific(K5_KEY_GSS_KRB5_CCACHE_NAME) != NULL);
+        *out_caller_provided_name =
+            (k5_getspecific(K5_KEY_GSS_KRB5_CCACHE_NAME) != NULL);
     }
 
     *minor_status = 0;
@@ -199,31 +200,31 @@ kg_get_ccache_name (OM_uint32 *minor_status, const char **out_name)
     char *kg_ccache_name;
 
     kg_ccache_name = k5_getspecific(K5_KEY_GSS_KRB5_CCACHE_NAME);
-    
+
     if (kg_ccache_name != NULL) {
-	name = strdup(kg_ccache_name);
-	if (name == NULL)
-	    err = ENOMEM;
+        name = strdup(kg_ccache_name);
+        if (name == NULL)
+            err = ENOMEM;
     } else {
-	krb5_context context = NULL;
-
-	/* Reset the context default ccache (see text above), and then
-	   retrieve it.  */
-	err = krb5_gss_init_context(&context);
-	if (!err)
-	    err = krb5_cc_set_default_name (context, NULL);
-	if (!err) {
-	    name = krb5_cc_default_name(context);
-	    if (name) {
-		name = strdup(name);
-		if (name == NULL)
-		    err = ENOMEM;
-	    }
-	}
-	if (err && context)
-	    save_error_info(err, context);
-	if (context)
-	    krb5_free_context(context);
+        krb5_context context = NULL;
+
+        /* Reset the context default ccache (see text above), and then
+           retrieve it.  */
+        err = krb5_gss_init_context(&context);
+        if (!err)
+            err = krb5_cc_set_default_name (context, NULL);
+        if (!err) {
+            name = krb5_cc_default_name(context);
+            if (name) {
+                name = strdup(name);
+                if (name == NULL)
+                    err = ENOMEM;
+            }
+        }
+        if (err && context)
+            save_error_info(err, context);
+        if (context)
+            krb5_free_context(context);
     }
 
     if (!err) {
@@ -231,7 +232,7 @@ kg_get_ccache_name (OM_uint32 *minor_status, const char **out_name)
             *out_name = name;
         }
     }
-    
+
     *minor_status = err;
     return (*minor_status == 0) ? GSS_S_COMPLETE : GSS_S_FAILURE;
 }
@@ -245,12 +246,12 @@ kg_set_ccache_name (OM_uint32 *minor_status, const char *name)
     krb5_error_code kerr;
 
     if (name) {
-	new_name = malloc(strlen(name) + 1);
-	if (new_name == NULL) {
-	    *minor_status = ENOMEM;
-	    return GSS_S_FAILURE;
-	}
-	strcpy(new_name, name);
+        new_name = malloc(strlen(name) + 1);
+        if (new_name == NULL) {
+            *minor_status = ENOMEM;
+            return GSS_S_FAILURE;
+        }
+        strcpy(new_name, name);
     }
 
     kg_ccache_name = k5_getspecific(K5_KEY_GSS_KRB5_CCACHE_NAME);
@@ -259,11 +260,11 @@ kg_set_ccache_name (OM_uint32 *minor_status, const char *name)
     new_name = swap;
     kerr = k5_setspecific(K5_KEY_GSS_KRB5_CCACHE_NAME, kg_ccache_name);
     if (kerr != 0) {
-	/* Can't store, so free up the storage.  */
-	free(kg_ccache_name);
-	/* ??? free(new_name); */
-	*minor_status = kerr;
-	return GSS_S_FAILURE;
+        /* Can't store, so free up the storage.  */
+        free(kg_ccache_name);
+        /* ??? free(new_name); */
+        *minor_status = kerr;
+        return GSS_S_FAILURE;
     }
 
     free (new_name);