Whitespace

Also remove the erroneously added gssapi_err_krb5 error table sources.

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

diff --git a/src/appl/gss-sample/gss-client.c b/src/appl/gss-sample/gss-client.c
index c8213edfda5dc26fa99b7912122838ddbabfb7b1..79c01d6f3d7d9f9a5784c4c3197c250c7f061c77 100644 (file)
--- a/src/appl/gss-sample/gss-client.c
+++ b/src/appl/gss-sample/gss-client.c
@@ -114,11 +114,11 @@ connect_to_server(char *host, u_short port)
     struct sockaddr_in saddr;
     struct hostent *hp;
     int     s;
+
 #ifdef _WIN32
     WSADATA wsadata;
     int wsastartuperror = WSAStartup(0x202, &wsadata);
-    if (wsastartuperror)
-    {
+    if (wsastartuperror) {
         fprintf(stderr, "WSAStartup error: %x\n", wsastartuperror);
         return -1;
     }

diff --git a/src/lib/crypto/krb/Makefile.in b/src/lib/crypto/krb/Makefile.in
index 865124d677f2f3c743b9d97c3176a864156ac043..b65559ba11435e7df98567f230970b25310da652 100644 (file)
--- a/src/lib/crypto/krb/Makefile.in
+++ b/src/lib/crypto/krb/Makefile.in
@@ -85,7 +85,7 @@ OBJS=\
        $(OUTPRE)checksum_dk_hmac.$(OBJEXT)     \
        $(OUTPRE)checksum_hmac_md5.$(OBJEXT)    \
        $(OUTPRE)checksum_unkeyed.$(OBJEXT)     \
-    $(OUTPRE)checksum_length.$(OBJEXT) \
+       $(OUTPRE)checksum_length.$(OBJEXT)      \
        $(OUTPRE)cksumtype_to_string.$(OBJEXT)  \
        $(OUTPRE)cksumtypes.$(OBJEXT)           \
        $(OUTPRE)coll_proof_cksum.$(OBJEXT)     \

diff --git a/src/lib/crypto/krb/prng.c b/src/lib/crypto/krb/prng.c
index ad2745fa6a3b691ed4176357b34cf149437da428..bed2a46b92110034d894754ae492d59cc5ad947f 100644 (file)
--- a/src/lib/crypto/krb/prng.c
+++ b/src/lib/crypto/krb/prng.c
@@ -40,6 +40,7 @@ k5_get_os_entropy(unsigned char *buf, size_t len)
 {
     krb5_boolean result;
     HCRYPTPROV provider;
+
     if (!CryptAcquireContext(&provider, NULL, NULL, PROV_RSA_FULL, 0))
         return FALSE;
     result = CryptGenRandom(provider, len, buf);

diff --git a/src/lib/gssapi/krb5/gssapi_err_krb5.c b/src/lib/gssapi/krb5/gssapi_err_krb5.c
deleted file mode 100644 (file)
index c17eb4b..0000000
--- a/src/lib/gssapi/krb5/gssapi_err_krb5.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * lib/gssapi/krb5/gssapi_err_krb5.c:
- * This file is automatically generated; please do not edit it.
- */
-#if defined(_WIN32)
-# include "win-mac.h"
-#endif
-
-#if !defined(_WIN32)
-extern void initialize_k5g_error_table (void);
-#endif
-
-#define N_(x) (x)
-
-/* Lclint doesn't handle null annotations on arrays
-   properly, so we need this typedef in each
-   generated .c file.  */
-/*@-redef@*/
-typedef /*@null@*/ const char *ncptr;
-/*@=redef@*/
-
-static ncptr const text[] = {
-       N_("Principal in credential cache does not match desired name"),
-       N_("No principal in keytab matches desired name"),
-       N_("Credential cache has no TGT"),
-       N_("Authenticator has no subkey"),
-       N_("Context is already fully established"),
-       N_("Unknown signature type in token"),
-       N_("Invalid field length in token"),
-       N_("Attempt to use incomplete security context"),
-       N_("Bad magic number for krb5_gss_ctx_id_t"),
-       N_("Bad magic number for krb5_gss_cred_id_t"),
-       N_("Bad magic number for krb5_gss_enc_desc"),
-       N_("Sequence number in token is corrupt"),
-       N_("Credential cache is empty"),
-       N_("Acceptor and Initiator share no checksum types"),
-       N_("Requested lucid context version not supported"),
-       N_("PRF input too long"),
-       N_("Bad magic number for iakerb_ctx_id_t"),
-    0
-};
-
-#include <com_err.h>
-
-const struct error_table et_k5g_error_table = { text, 39756032L, 17 };
-
-#if !defined(_WIN32)
-void initialize_k5g_error_table (void)
-    /*@modifies internalState@*/
-{
-    (void) add_error_table (&et_k5g_error_table);
-}
-#endif

diff --git a/src/lib/gssapi/krb5/gssapi_err_krb5.h b/src/lib/gssapi/krb5/gssapi_err_krb5.h
deleted file mode 100644 (file)
index d2fcaaf..0000000
--- a/src/lib/gssapi/krb5/gssapi_err_krb5.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * lib/gssapi/krb5/gssapi_err_krb5.h:
- * This file is automatically generated; please do not edit it.
- */
-
-#include <com_err.h>
-
-#define KG_CCACHE_NOMATCH                        (39756032L)
-#define KG_KEYTAB_NOMATCH                        (39756033L)
-#define KG_TGT_MISSING                           (39756034L)
-#define KG_NO_SUBKEY                             (39756035L)
-#define KG_CONTEXT_ESTABLISHED                   (39756036L)
-#define KG_BAD_SIGN_TYPE                         (39756037L)
-#define KG_BAD_LENGTH                            (39756038L)
-#define KG_CTX_INCOMPLETE                        (39756039L)
-#define KG_CONTEXT                               (39756040L)
-#define KG_CRED                                  (39756041L)
-#define KG_ENC_DESC                              (39756042L)
-#define KG_BAD_SEQ                               (39756043L)
-#define KG_EMPTY_CCACHE                          (39756044L)
-#define KG_NO_CTYPES                             (39756045L)
-#define KG_LUCID_VERSION                         (39756046L)
-#define KG_INPUT_TOO_LONG                        (39756047L)
-#define KG_IAKERB_CONTEXT                        (39756048L)
-#define ERROR_TABLE_BASE_k5g (39756032L)
-
-extern const struct error_table et_k5g_error_table;
-
-#if !defined(_WIN32)
-/* for compatibility with older versions... */
-extern void initialize_k5g_error_table (void) /*@modifies internalState@*/;
-#else
-#define initialize_k5g_error_table()
-#endif
-
-#if !defined(_WIN32)
-#define init_k5g_err_tbl initialize_k5g_error_table
-#define k5g_err_base ERROR_TABLE_BASE_k5g
-#endif

diff --git a/src/lib/gssapi/mechglue/g_initialize.c b/src/lib/gssapi/mechglue/g_initialize.c
index 2e751968be6e429f4b0c849012a54a44f271fc37..b34f3cf379ae68c77e581dfbdfe2951c08348ca3 100644 (file)
--- a/src/lib/gssapi/mechglue/g_initialize.c
+++ b/src/lib/gssapi/mechglue/g_initialize.c
@@ -102,7 +102,7 @@ gssint_mechglue_init(void)
        err = gss_spnegoint_lib_init();
 #endif
 
-    err = gssint_mecherrmap_init();
+       err = gssint_mecherrmap_init();
        return err;
 }
 

diff --git a/src/lib/gssapi32.def b/src/lib/gssapi32.def
index 8e1cbd22da594a53e8e219d3c76a6ea2aa54f4b4..a22f609d2ec299cb1875f5f6ff975b33a5d9fe25 100644 (file)
--- a/src/lib/gssapi32.def
+++ b/src/lib/gssapi32.def
@@ -169,4 +169,4 @@ EXPORTS
        gss_nt_exported_name                            @136    DATA
        gss_nt_service_name_v2                          @137    DATA
 ; Added in 1.10
-    gss_pname_to_uid                @138
+       gss_pname_to_uid                                @138

diff --git a/src/lib/krb5_32.def b/src/lib/krb5_32.def
index 7481de598eba26033148f92ce8c3621e7e4c2aee..cff28772ae7785ecf115ea8689fc90ddcb504cd0 100644 (file)
--- a/src/lib/krb5_32.def
+++ b/src/lib/krb5_32.def
@@ -410,5 +410,5 @@ EXPORTS
        krb5_sname_match                                @384
        k5_kt_get_principal                             @385 ; PRIVATE GSSAPI
        krb5_init_context_profile                       @386
-    krb5int_c_mandatory_cksumtype   @387 ; PRIVATE GSSAPI
-    krb5int_arcfour_gsscrypt        @388 ; PRIVATE GSSAPI
+       krb5int_c_mandatory_cksumtype                   @387 ; PRIVATE GSSAPI
+       krb5int_arcfour_gsscrypt                        @388 ; PRIVATE GSSAPI