[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gss branch, master, updated. gss-1-0-0-9-gfe4fb4e
|
From: |
Simon Josefsson |
|
Subject: |
[SCM] GNU gss branch, master, updated. gss-1-0-0-9-gfe4fb4e |
|
Date: |
Thu, 22 Apr 2010 07:32:22 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gss".
http://git.savannah.gnu.org/cgit/gss.git/commit/?id=fe4fb4ead362914411279f0fb9f67c7f70639d1c
The branch, master has been updated
via fe4fb4ead362914411279f0fb9f67c7f70639d1c (commit)
from 4f29fd355fc621e0f72a6a4c18eed8eadbed9e82 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit fe4fb4ead362914411279f0fb9f67c7f70639d1c
Author: Simon Josefsson <address@hidden>
Date: Thu Apr 22 09:32:16 2010 +0200
Indent code.
-----------------------------------------------------------------------
Summary of changes:
cfg.mk | 2 +
lib/asn1.c | 11 ++---
lib/headers/gss.h.in | 7 ++-
lib/headers/gss/api.h | 6 +-
lib/headers/gss/ext.h | 6 +--
lib/krb5/checksum.c | 9 ++--
lib/krb5/checksum.h | 4 +-
lib/krb5/context.c | 8 +--
lib/krb5/cred.c | 2 +-
lib/krb5/msg.c | 8 ++--
lib/krb5/name.c | 6 +-
lib/krb5/oid.c | 5 ++
lib/meta.c | 109 +++++++++++++++++++++++-------------------------
lib/meta.h | 3 +-
lib/name.c | 3 +-
lib/obsolete.c | 2 +-
lib/oid.c | 7 +++
lib/saslname.c | 15 +++----
lib/version.c | 2 +-
src/gss.c | 14 +++---
tests/basic.c | 2 +-
tests/krb5context.c | 8 +--
tests/saslname.c | 3 +-
23 files changed, 121 insertions(+), 121 deletions(-)
diff --git a/cfg.mk b/cfg.mk
index 16191ef..12c69fc 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -21,6 +21,8 @@ WFLAGS ?= --enable-gcc-warnings
ADDFLAGS ?=
CFGFLAGS ?= --enable-gtk-doc $(ADDFLAGS) $(WFLAGS)
+INDENT_SOURCES = `find . -name \*.[ch] -o -name gss.h.in | grep -v -e
^./build-aux/ -e ^./lib/gl/ -e ^./gl/ -e ^./src/gl/`
+
ifeq ($(.DEFAULT_GOAL),abort-due-to-no-makefile)
.DEFAULT_GOAL := bootstrap
endif
diff --git a/lib/asn1.c b/lib/asn1.c
index b15a2e9..9a1633d 100644
--- a/lib/asn1.c
+++ b/lib/asn1.c
@@ -60,7 +60,7 @@ _gss_asn1_length_der (size_t len, unsigned char *ans, size_t
* ans_len)
}
static size_t
-_gss_asn1_get_length_der (const char *der, size_t der_len, size_t *len)
+_gss_asn1_get_length_der (const char *der, size_t der_len, size_t * len)
{
size_t ans;
size_t k, punt;
@@ -163,8 +163,7 @@ _gss_encapsulate_token_prefix (const char *prefix, size_t
prefixlen,
**/
extern OM_uint32
gss_encapsulate_token (const gss_buffer_t input_token,
- const gss_OID token_oid,
- gss_buffer_t output_token)
+ const gss_OID token_oid, gss_buffer_t output_token)
{
int rc;
@@ -263,8 +262,7 @@ _gss_decapsulate_token (const char *in, size_t inlen,
**/
OM_uint32
gss_decapsulate_token (const gss_buffer_t input_token,
- const gss_OID token_oid,
- gss_buffer_t output_token)
+ const gss_OID token_oid, gss_buffer_t output_token)
{
gss_OID_desc tmpoid;
char *oid = NULL, *out = NULL;
@@ -279,8 +277,7 @@ gss_decapsulate_token (const gss_buffer_t input_token,
if (_gss_decapsulate_token ((char *) input_token->value,
input_token->length,
- &oid, &oidlen,
- &out, &outlen) != 0)
+ &oid, &oidlen, &out, &outlen) != 0)
return GSS_S_DEFECTIVE_TOKEN;
tmpoid.length = oidlen;
diff --git a/lib/headers/gss.h.in b/lib/headers/gss.h.in
index 2bb2742..4ac4085 100644
--- a/lib/headers/gss.h.in
+++ b/lib/headers/gss.h.in
@@ -24,7 +24,8 @@
#define _GSS_H
# ifdef __cplusplus
-extern "C" {
+extern "C"
+{
# endif
/**
@@ -74,11 +75,13 @@ extern "C" {
# include <gss/api.h>
# include <gss/ext.h>
+ /* *INDENT-OFF* */
@INCLUDE_GSS_KRB5@
@INCLUDE_GSS_KRB5_EXT@
+ /* *INDENT-ON* */
# ifdef __cplusplus
}
# endif
-#endif /* _GSS_H */
+#endif /* _GSS_H */
diff --git a/lib/headers/gss/api.h b/lib/headers/gss/api.h
index 2d99dce..862bd89 100644
--- a/lib/headers/gss/api.h
+++ b/lib/headers/gss/api.h
@@ -632,16 +632,16 @@ gss_unseal (OM_uint32 * minor_status,
/* RFC 5801 SASL GS2 interfaces. */
OM_uint32
-gss_inquire_saslname_for_mech (OM_uint32 *minor_status,
+gss_inquire_saslname_for_mech (OM_uint32 * minor_status,
const gss_OID desired_mech,
gss_buffer_t sasl_mech_name,
gss_buffer_t mech_name,
gss_buffer_t mech_description);
OM_uint32
-gss_inquire_mech_for_saslname (OM_uint32 *minor_status,
+gss_inquire_mech_for_saslname (OM_uint32 * minor_status,
const gss_buffer_t sasl_mech_name,
- gss_OID *mech_type);
+ gss_OID * mech_type);
#endif /* GSSAPI_H_ */
diff --git a/lib/headers/gss/ext.h b/lib/headers/gss/ext.h
index 6e67719..005ef65 100644
--- a/lib/headers/gss/ext.h
+++ b/lib/headers/gss/ext.h
@@ -36,12 +36,10 @@ extern int gss_userok (const gss_name_t name, const char
*username);
/* See asn1.c. */
extern OM_uint32
gss_encapsulate_token (const gss_buffer_t input_token,
- const gss_OID token_oid,
- gss_buffer_t output_token);
+ const gss_OID token_oid, gss_buffer_t output_token);
extern OM_uint32
gss_decapsulate_token (const gss_buffer_t input_token,
- const gss_OID token_oid,
- gss_buffer_t output_token);
+ const gss_OID token_oid, gss_buffer_t output_token);
/* Static versions of the public OIDs for use, e.g., in static
variable initalization. See oid.c. */
diff --git a/lib/krb5/checksum.c b/lib/krb5/checksum.c
index a5513b7..13765c8 100644
--- a/lib/krb5/checksum.c
+++ b/lib/krb5/checksum.c
@@ -36,10 +36,9 @@ pack_uint32 (OM_uint32 i, char *buf)
}
static int
-hash_cb (OM_uint32 *minor_status,
+hash_cb (OM_uint32 * minor_status,
gss_ctx_id_t * context_handle,
- const gss_channel_bindings_t input_chan_bindings,
- char **out)
+ const gss_channel_bindings_t input_chan_bindings, char **out)
{
gss_ctx_id_t ctx = *context_handle;
_gss_krb5_ctx_t k5 = ctx->krb5;
@@ -100,7 +99,7 @@ hash_cb (OM_uint32 *minor_status,
/* Create the checksum value field from input parameters. */
OM_uint32
-_gss_krb5_checksum_pack (OM_uint32 *minor_status,
+_gss_krb5_checksum_pack (OM_uint32 * minor_status,
const gss_cred_id_t initiator_cred_handle,
gss_ctx_id_t * context_handle,
const gss_channel_bindings_t input_chan_bindings,
@@ -225,7 +224,7 @@ _gss_krb5_checksum_pack (OM_uint32 *minor_status,
}
OM_uint32
-_gss_krb5_checksum_parse (OM_uint32 *minor_status,
+_gss_krb5_checksum_parse (OM_uint32 * minor_status,
gss_ctx_id_t * context_handle,
const gss_channel_bindings_t input_chan_bindings)
{
diff --git a/lib/krb5/checksum.h b/lib/krb5/checksum.h
index 11bcdd7..bd9117f 100644
--- a/lib/krb5/checksum.h
+++ b/lib/krb5/checksum.h
@@ -21,13 +21,13 @@
*/
OM_uint32
-_gss_krb5_checksum_pack (OM_uint32 *minor_status,
+_gss_krb5_checksum_pack (OM_uint32 * minor_status,
const gss_cred_id_t initiator_cred_handle,
gss_ctx_id_t * context_handle,
const gss_channel_bindings_t input_chan_bindings,
OM_uint32 req_flags, char **data, size_t * datalen);
OM_uint32
-_gss_krb5_checksum_parse (OM_uint32 *minor_status,
+_gss_krb5_checksum_parse (OM_uint32 * minor_status,
gss_ctx_id_t * context_handle,
const gss_channel_bindings_t input_chan_bindings);
diff --git a/lib/krb5/context.c b/lib/krb5/context.c
index 2e54942..74a8076 100644
--- a/lib/krb5/context.c
+++ b/lib/krb5/context.c
@@ -393,8 +393,7 @@ gss_krb5_accept_sec_context (OM_uint32 * minor_status,
return GSS_S_FAILURE;
rc = _gss_krb5_checksum_parse (minor_status,
- context_handle,
- input_chan_bindings);
+ context_handle, input_chan_bindings);
if (rc != GSS_S_COMPLETE)
return GSS_S_FAILURE;
@@ -415,9 +414,8 @@ gss_krb5_accept_sec_context (OM_uint32 * minor_status,
}
rc = shishi_encapreppart_seqnumber_get (cxk5->sh,
- shishi_ap_encapreppart (cxk5->
- ap),
- &cxk5->acceptseqnr);
+ shishi_ap_encapreppart
+ (cxk5->ap), &cxk5->acceptseqnr);
if (rc != SHISHI_OK)
{
/* A strict 1964 implementation would return
diff --git a/lib/krb5/cred.c b/lib/krb5/cred.c
index 24f31f0..a247676 100644
--- a/lib/krb5/cred.c
+++ b/lib/krb5/cred.c
@@ -38,7 +38,7 @@ acquire_cred1 (OM_uint32 * minor_status,
if (desired_name == GSS_C_NO_NAME)
{
- gss_buffer_desc buf = { 4, (char*) "host" };
+ gss_buffer_desc buf = { 4, (char *) "host" };
maj_stat = gss_import_name (minor_status, &buf,
GSS_C_NT_HOSTBASED_SERVICE, &name);
diff --git a/lib/krb5/msg.c b/lib/krb5/msg.c
index 2d6d65d..119669e 100644
--- a/lib/krb5/msg.c
+++ b/lib/krb5/msg.c
@@ -233,8 +233,7 @@ gss_krb5_wrap (OM_uint32 * minor_status,
memset (p + 8 + 4, 0, 4);
}
- rc = shishi_encrypt_iv_etype (k5->sh, k5->key, 0, SHISHI_DES3_CBC_NONE,
- p + 16, 8, /* cksum */
+ rc = shishi_encrypt_iv_etype (k5->sh, k5->key, 0, SHISHI_DES3_CBC_NONE,
p + 16, 8, /* cksum */
p + 8, 8, &tmp, &tmplen);
if (rc != SHISHI_OK || tmplen != 8)
return GSS_S_FAILURE;
@@ -370,7 +369,7 @@ gss_krb5_unwrap (OM_uint32 * minor_status,
if (padlen > 8)
return GSS_S_BAD_MIC;
for (i = 1; i <= padlen; i++)
- if (data[tok.length - i] != (int)padlen)
+ if (data[tok.length - i] != (int) padlen)
return GSS_S_BAD_MIC;
/* Write header and confounder next to data */
@@ -401,7 +400,8 @@ gss_krb5_unwrap (OM_uint32 * minor_status,
return GSS_S_FAILURE;
}
- memcpy (output_message_buffer->value, pt, tok.length - 4 * 8 - padlen);
+ memcpy (output_message_buffer->value, pt,
+ tok.length - 4 * 8 - padlen);
}
break;
diff --git a/lib/krb5/name.c b/lib/krb5/name.c
index 8ff0ff1..b57a3bb 100644
--- a/lib/krb5/name.c
+++ b/lib/krb5/name.c
@@ -71,8 +71,8 @@ gss_krb5_canonicalize_name (OM_uint32 * minor_status,
char *p;
/* We don't support service-names without hostname part because
- we can't compute a canonicalized name of the local host.
- Calling gethostname does not give a canonicalized name. */
+ we can't compute a canonicalized name of the local host.
+ Calling gethostname does not give a canonicalized name. */
if (!memchr (input_name->value, '@', input_name->length))
{
*minor_status = GSS_KRB5_S_G_BAD_SERVICE_NAME;
@@ -80,7 +80,7 @@ gss_krb5_canonicalize_name (OM_uint32 * minor_status,
}
/* We don't do DNS name canoncalization since that is
- insecure. */
+ insecure. */
maj_stat = gss_duplicate_name (minor_status, input_name, output_name);
if (GSS_ERROR (maj_stat))
diff --git a/lib/krb5/oid.c b/lib/krb5/oid.c
index 63f7e1d..9af5fd7 100644
--- a/lib/krb5/oid.c
+++ b/lib/krb5/oid.c
@@ -34,6 +34,7 @@
gss_OID_desc GSS_KRB5_static = {
9, (void *) "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02"
};
+
gss_OID GSS_KRB5 = &GSS_KRB5_static;
/*
@@ -45,6 +46,7 @@ gss_OID GSS_KRB5 = &GSS_KRB5_static;
gss_OID_desc GSS_KRB5_NT_USER_NAME_static = {
10, (void *) "\x2a\x86\x48\x86\xf7\x12\x01\x02\x01\x01"
};
+
gss_OID GSS_KRB5_NT_USER_NAME = &GSS_KRB5_NT_USER_NAME_static;
/*
@@ -67,6 +69,7 @@ gss_OID GSS_KRB5_NT_HOSTBASED_SERVICE_NAME =
gss_OID_desc GSS_KRB5_NT_PRINCIPAL_NAME_static = {
10, (void *) "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x01"
};
+
gss_OID GSS_KRB5_NT_PRINCIPAL_NAME = &GSS_KRB5_NT_PRINCIPAL_NAME_static;
/*
@@ -78,6 +81,7 @@ gss_OID GSS_KRB5_NT_PRINCIPAL_NAME =
&GSS_KRB5_NT_PRINCIPAL_NAME_static;
gss_OID_desc GSS_KRB5_NT_MACHINE_UID_NAME_static = {
10, (void *) "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x02"
};
+
gss_OID GSS_KRB5_NT_MACHINE_UID_NAME = &GSS_KRB5_NT_MACHINE_UID_NAME_static;
/*
@@ -89,4 +93,5 @@ gss_OID GSS_KRB5_NT_MACHINE_UID_NAME =
&GSS_KRB5_NT_MACHINE_UID_NAME_static;
gss_OID_desc GSS_KRB5_NT_STRING_UID_NAME_static = {
10, (void *) "\x2a\x86\x48\x86\xf7\x12\x01\x02\x01\x03"
};
+
gss_OID GSS_KRB5_NT_STRING_UID_NAME = &GSS_KRB5_NT_STRING_UID_NAME_static;
diff --git a/lib/meta.c b/lib/meta.c
index 579cbf6..e4b2762 100644
--- a/lib/meta.c
+++ b/lib/meta.c
@@ -28,63 +28,59 @@
# include "krb5/protos.h"
#endif
-static _gss_mech_api_desc _gss_mech_apis[] =
- {
+static _gss_mech_api_desc _gss_mech_apis[] = {
#ifdef USE_KERBEROS5
- {
- &GSS_KRB5_static,
- "GS2-KRB5",
- "Kerberos V5",
- N_("Kerberos V5 GSS-API mechanism"),
- {
- /* Mandatory name-types. */
- &GSS_KRB5_NT_PRINCIPAL_NAME_static,
- &GSS_C_NT_HOSTBASED_SERVICE_static,
- &GSS_C_NT_EXPORT_NAME_static
- },
- gss_krb5_init_sec_context,
- gss_krb5_canonicalize_name,
- gss_krb5_export_name,
- gss_krb5_wrap,
- gss_krb5_unwrap,
- gss_krb5_get_mic,
- gss_krb5_verify_mic,
- gss_krb5_display_status,
- gss_krb5_acquire_cred,
- gss_krb5_release_cred,
- gss_krb5_accept_sec_context,
- gss_krb5_delete_sec_context,
- gss_krb5_context_time,
- gss_krb5_inquire_cred,
- gss_krb5_inquire_cred_by_mech},
+ {
+ &GSS_KRB5_static,
+ "GS2-KRB5",
+ "Kerberos V5",
+ N_("Kerberos V5 GSS-API mechanism"),
+ {
+ /* Mandatory name-types. */
+ &GSS_KRB5_NT_PRINCIPAL_NAME_static,
+ &GSS_C_NT_HOSTBASED_SERVICE_static,
+ &GSS_C_NT_EXPORT_NAME_static},
+ gss_krb5_init_sec_context,
+ gss_krb5_canonicalize_name,
+ gss_krb5_export_name,
+ gss_krb5_wrap,
+ gss_krb5_unwrap,
+ gss_krb5_get_mic,
+ gss_krb5_verify_mic,
+ gss_krb5_display_status,
+ gss_krb5_acquire_cred,
+ gss_krb5_release_cred,
+ gss_krb5_accept_sec_context,
+ gss_krb5_delete_sec_context,
+ gss_krb5_context_time,
+ gss_krb5_inquire_cred,
+ gss_krb5_inquire_cred_by_mech},
#endif
- {
- NULL,
- NULL,
- NULL,
- NULL,
- {
- NULL,
- NULL,
- NULL
- },
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL
- }
- };
+ {
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ {
+ NULL,
+ NULL,
+ NULL},
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL}
+};
_gss_mech_api_t
_gss_find_mech_no_default (const gss_OID oid)
@@ -117,8 +113,7 @@ _gss_find_mech_by_saslname (const gss_buffer_t
sasl_mech_name)
size_t i;
if (sasl_mech_name == NULL
- || sasl_mech_name->value == NULL
- || sasl_mech_name->length == 0)
+ || sasl_mech_name->value == NULL || sasl_mech_name->length == 0)
return NULL;
for (i = 0; _gss_mech_apis[i].mech; i++)
diff --git a/lib/meta.h b/lib/meta.h
index 90196ed..3b2313b 100644
--- a/lib/meta.h
+++ b/lib/meta.h
@@ -123,7 +123,8 @@ typedef struct _gss_mech_api_struct
_gss_mech_api_t _gss_find_mech (const gss_OID oid);
_gss_mech_api_t _gss_find_mech_no_default (const gss_OID oid);
-_gss_mech_api_t _gss_find_mech_by_saslname (const gss_buffer_t sasl_mech_name);
+_gss_mech_api_t _gss_find_mech_by_saslname (const gss_buffer_t
+ sasl_mech_name);
OM_uint32 _gss_indicate_mechs1 (OM_uint32 * minor_status,
gss_OID_set * mech_set);
diff --git a/lib/name.c b/lib/name.c
index e5291e6..b159d12 100644
--- a/lib/name.c
+++ b/lib/name.c
@@ -88,8 +88,7 @@ gss_import_name (OM_uint32 * minor_status,
return GSS_S_FAILURE;
}
memcpy ((*output_name)->value,
- input_name_buffer->value,
- input_name_buffer->length);
+ input_name_buffer->value, input_name_buffer->length);
(*output_name)->type = input_name_type;
diff --git a/lib/obsolete.c b/lib/obsolete.c
index ce9e8f0..6be01c0 100644
--- a/lib/obsolete.c
+++ b/lib/obsolete.c
@@ -29,7 +29,7 @@ gss_sign (OM_uint32 * minor_status,
gss_buffer_t message_buffer, gss_buffer_t message_token)
{
return gss_get_mic (minor_status, context_handle,
- (gss_qop_t)qop_req, message_buffer, message_token);
+ (gss_qop_t) qop_req, message_buffer, message_token);
}
diff --git a/lib/oid.c b/lib/oid.c
index 7bab8da..1276bff 100644
--- a/lib/oid.c
+++ b/lib/oid.c
@@ -36,6 +36,7 @@
gss_OID_desc GSS_C_NT_USER_NAME_static = {
10, (void *) "\x2a\x86\x48\x86\xf7\x12\x01\x02\x01\x01"
};
+
gss_OID GSS_C_NT_USER_NAME = &GSS_C_NT_USER_NAME_static;
/*
@@ -52,6 +53,7 @@ gss_OID GSS_C_NT_USER_NAME = &GSS_C_NT_USER_NAME_static;
gss_OID_desc GSS_C_NT_MACHINE_UID_NAME_static = {
10, (void *) "\x2a\x86\x48\x86\xf7\x12\x01\x02\x01\x02"
};
+
gss_OID GSS_C_NT_MACHINE_UID_NAME = &GSS_C_NT_MACHINE_UID_NAME_static;
/*
@@ -68,6 +70,7 @@ gss_OID GSS_C_NT_MACHINE_UID_NAME =
&GSS_C_NT_MACHINE_UID_NAME_static;
gss_OID_desc GSS_C_NT_STRING_UID_NAME_static = {
10, (void *) "\x2a\x86\x48\x86\xf7\x12\x01\x02\x01\x03"
};
+
gss_OID GSS_C_NT_STRING_UID_NAME = &GSS_C_NT_STRING_UID_NAME_static;
/*
@@ -90,6 +93,7 @@ gss_OID GSS_C_NT_STRING_UID_NAME =
&GSS_C_NT_STRING_UID_NAME_static;
gss_OID_desc GSS_C_NT_HOSTBASED_SERVICE_X_static = {
6, (void *) "\x2b\x06\x01\x05\x06\x02"
};
+
gss_OID GSS_C_NT_HOSTBASED_SERVICE_X = &GSS_C_NT_HOSTBASED_SERVICE_X_static;
/*
@@ -106,6 +110,7 @@ gss_OID GSS_C_NT_HOSTBASED_SERVICE_X =
&GSS_C_NT_HOSTBASED_SERVICE_X_static;
gss_OID_desc GSS_C_NT_HOSTBASED_SERVICE_static = {
10, (void *) "\x2a\x86\x48\x86\xf7\x12\x01\x02\x01\x04"
};
+
gss_OID GSS_C_NT_HOSTBASED_SERVICE = &GSS_C_NT_HOSTBASED_SERVICE_static;
/*
@@ -121,6 +126,7 @@ gss_OID GSS_C_NT_HOSTBASED_SERVICE =
&GSS_C_NT_HOSTBASED_SERVICE_static;
gss_OID_desc GSS_C_NT_ANONYMOUS_static = {
6, (void *) "\x2b\x06\01\x05\x06\x03"
};
+
gss_OID GSS_C_NT_ANONYMOUS = &GSS_C_NT_ANONYMOUS_static;
@@ -137,4 +143,5 @@ gss_OID GSS_C_NT_ANONYMOUS = &GSS_C_NT_ANONYMOUS_static;
gss_OID_desc GSS_C_NT_EXPORT_NAME_static = {
6, (void *) "\x2b\x06\x01\x05\x06\x04"
};
+
gss_OID GSS_C_NT_EXPORT_NAME = &GSS_C_NT_EXPORT_NAME_static;
diff --git a/lib/saslname.c b/lib/saslname.c
index 6dabce3..5affd4c 100644
--- a/lib/saslname.c
+++ b/lib/saslname.c
@@ -26,10 +26,8 @@
#include "meta.h"
static OM_uint32
-dup_data (OM_uint32 *minor_status,
- gss_buffer_t out,
- const char *str,
- int translate)
+dup_data (OM_uint32 * minor_status,
+ gss_buffer_t out, const char *str, int translate)
{
if (!out)
return GSS_S_COMPLETE;
@@ -77,7 +75,7 @@ dup_data (OM_uint32 *minor_status,
* `GSS_S_BAD_MECH`: The @desired_mech OID is unsupported.
**/
OM_uint32
-gss_inquire_saslname_for_mech (OM_uint32 *minor_status,
+gss_inquire_saslname_for_mech (OM_uint32 * minor_status,
const gss_OID desired_mech,
gss_buffer_t sasl_mech_name,
gss_buffer_t mech_name,
@@ -105,8 +103,7 @@ gss_inquire_saslname_for_mech (OM_uint32 *minor_status,
if (dup_data (minor_status, sasl_mech_name,
m->sasl_name, 0) != GSS_S_COMPLETE)
return GSS_S_FAILURE;
- if (dup_data (minor_status, mech_name,
- m->mech_name, 0) != GSS_S_COMPLETE)
+ if (dup_data (minor_status, mech_name, m->mech_name, 0) != GSS_S_COMPLETE)
{
if (sasl_mech_name)
free (sasl_mech_name->value);
@@ -146,9 +143,9 @@ gss_inquire_saslname_for_mech (OM_uint32 *minor_status,
* `GSS_S_BAD_MECH`: There is no GSS-API mechanism known as @sasl_mech_name.
**/
OM_uint32
-gss_inquire_mech_for_saslname (OM_uint32 *minor_status,
+gss_inquire_mech_for_saslname (OM_uint32 * minor_status,
const gss_buffer_t sasl_mech_name,
- gss_OID *mech_type)
+ gss_OID * mech_type)
{
_gss_mech_api_t m;
diff --git a/lib/version.c b/lib/version.c
index 8d810c4..c071182 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -22,7 +22,7 @@
#include "internal.h"
-#include <string.h> /* for strverscmp */
+#include <string.h> /* for strverscmp */
/**
* gss_check_version:
diff --git a/src/gss.c b/src/gss.c
index 8904d25..c5df7d1 100644
--- a/src/gss.c
+++ b/src/gss.c
@@ -55,10 +55,10 @@ const char version_etc_copyright[] =
#endif
static void
-usage (int status) GSS_ATTR_NO_RETRUN;
-
-static void
usage (int status)
+ GSS_ATTR_NO_RETRUN;
+
+ static void usage (int status)
{
if (status != EXIT_SUCCESS)
fprintf (stderr, _("Try `%s --help' for more information.\n"),
@@ -147,10 +147,10 @@ main (int argc, char *argv[])
"into %ld (0x%lx):\n"),
GSS_ROUTINE_ERROR (args.major_arg),
GSS_ROUTINE_ERROR (args.major_arg),
- GSS_ROUTINE_ERROR (args.
- major_arg) >> GSS_C_ROUTINE_ERROR_OFFSET,
- GSS_ROUTINE_ERROR (args.
- major_arg) >> GSS_C_ROUTINE_ERROR_OFFSET);
+ GSS_ROUTINE_ERROR (args.major_arg) >>
+ GSS_C_ROUTINE_ERROR_OFFSET,
+ GSS_ROUTINE_ERROR (args.major_arg) >>
+ GSS_C_ROUTINE_ERROR_OFFSET);
message_context = 0;
do
diff --git a/tests/basic.c b/tests/basic.c
index 6953da5..7085145 100644
--- a/tests/basic.c
+++ b/tests/basic.c
@@ -262,7 +262,7 @@ main (int argc, char *argv[])
/* Check name */
service = NULL;
- bufdesc.value = (char*) "address@hidden@FOO";
+ bufdesc.value = (char *) "address@hidden@FOO";
bufdesc.length = strlen (bufdesc.value);
maj_stat = gss_import_name (&min_stat, &bufdesc, GSS_C_NT_HOSTBASED_SERVICE,
diff --git a/tests/krb5context.c b/tests/krb5context.c
index 4617bbd..1218933 100644
--- a/tests/krb5context.c
+++ b/tests/krb5context.c
@@ -85,7 +85,7 @@ main (int argc, char *argv[])
memset (&cb, 0, sizeof (cb));
cb.application_data.length = 3;
- cb.application_data.value = (char*) "hej";
+ cb.application_data.value = (char *) "hej";
do
if (strcmp (argv[argc - 1], "-v") == 0 ||
@@ -108,7 +108,7 @@ main (int argc, char *argv[])
/* Name of service. */
- bufdesc.value = (char*) "address@hidden";
+ bufdesc.value = (char *) "address@hidden";
bufdesc.length = strlen (bufdesc.value);
maj_stat = gss_import_name (&min_stat, &bufdesc,
@@ -328,9 +328,7 @@ main (int argc, char *argv[])
pt.value = (char *) "foo";
pt.length = strlen (pt.value) + 1;
- maj_stat = gss_wrap (&min_stat,
- cctx,
- 0, 0, &pt, &conf_state, &ct);
+ maj_stat = gss_wrap (&min_stat, cctx, 0, 0, &pt, &conf_state, &ct);
if (GSS_ERROR (maj_stat))
{
fail ("client gss_wrap failure\n");
diff --git a/tests/saslname.c b/tests/saslname.c
index 9a88384..5405760 100644
--- a/tests/saslname.c
+++ b/tests/saslname.c
@@ -99,7 +99,8 @@ main (int argc, char *argv[])
free (bufdesc.value);
#endif
- maj_stat = gss_inquire_saslname_for_mech (&min_stat, NULL, NULL, NULL, NULL);
+ maj_stat =
+ gss_inquire_saslname_for_mech (&min_stat, NULL, NULL, NULL, NULL);
if (maj_stat == GSS_S_CALL_INACCESSIBLE_READ)
success ("gss_inquire_saslname_for_mech (NULL) success\n");
else
hooks/post-receive
--
GNU gss
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gss branch, master, updated. gss-1-0-0-9-gfe4fb4e,
Simon Josefsson <=