aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhanna Tsitkov <tsitkova@mit.edu>2009-12-15 16:37:00 +0000
committerZhanna Tsitkov <tsitkova@mit.edu>2009-12-15 16:37:00 +0000
commit847d02eb0f440c47374a2fa5f26854907877fc3f (patch)
tree557f973630557a0f5da2bd7b03abe7bf43c34e2b
parentacd672680307a3f1bad828e6573fa34bd7779203 (diff)
downloadkrb5-847d02eb0f440c47374a2fa5f26854907877fc3f.zip
krb5-847d02eb0f440c47374a2fa5f26854907877fc3f.tar.gz
krb5-847d02eb0f440c47374a2fa5f26854907877fc3f.tar.bz2
Formatining enhancement
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23467 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/lib/krb5/krb/vfy_increds.c24
-rw-r--r--src/lib/krb5/os/read_pwd.c15
2 files changed, 21 insertions, 18 deletions
diff --git a/src/lib/krb5/krb/vfy_increds.c b/src/lib/krb5/krb/vfy_increds.c
index 2b9beeb..f71e7a9 100644
--- a/src/lib/krb5/krb/vfy_increds.c
+++ b/src/lib/krb5/krb/vfy_increds.c
@@ -3,7 +3,8 @@
#include "int-proto.h"
static krb5_error_code
-krb5_cc_copy_creds_except(krb5_context context, krb5_ccache incc, krb5_ccache outcc, krb5_principal princ)
+copy_creds_except(krb5_context context, krb5_ccache incc,
+ krb5_ccache outcc, krb5_principal princ)
{
krb5_error_code code;
krb5_flags flags;
@@ -117,8 +118,7 @@ krb5_verify_init_creds(krb5_context context,
} else if (krb5_libdefault_boolean(context,
&creds->client->realm,
KRB5_CONF_VERIFY_AP_REQ_NOFAIL,
- &nofail)
- == 0) {
+ &nofail) == 0) {
if (nofail)
goto cleanup;
}
@@ -129,8 +129,9 @@ krb5_verify_init_creds(krb5_context context,
krb5_kt_free_entry(context, &kte);
- /* If the creds are for the server principal, we're set, just do
- a mk_req. Otherwise, do a get_credentials first. */
+ /* If the creds are for the server principal, we're set, just do a mk_req.
+ * Otherwise, do a get_credentials first.
+ */
if (krb5_principal_compare(context, server, creds->server)) {
/* make an ap_req */
@@ -199,21 +200,22 @@ krb5_verify_init_creds(krb5_context context,
if ((ret = krb5_cc_resolve(context, "MEMORY:rd_req2", &retcc)) ||
(ret = krb5_cc_initialize(context, retcc, creds->client)) ||
- (ret = krb5_cc_copy_creds_except(context, ccache, retcc,
- creds->server))) {
+ (ret = copy_creds_except(context, ccache, retcc,
+ creds->server))) {
if (retcc)
krb5_cc_destroy(context, retcc);
} else {
*ccache_arg = retcc;
}
} else {
- ret = krb5_cc_copy_creds_except(context, ccache, *ccache_arg,
- server);
+ ret = copy_creds_except(context, ccache, *ccache_arg,
+ server);
}
}
- /* if any of the above paths returned an errors, then ret is set
- accordingly. either that, or it's zero, which is fine, too */
+ /* if any of the above paths returned an errors, then ret is set accordingly.
+ * Either that, or it's zero, which is fine, too
+ */
cleanup:
if ( server)
diff --git a/src/lib/krb5/os/read_pwd.c b/src/lib/krb5/os/read_pwd.c
index 192c873..df93c65 100644
--- a/src/lib/krb5/os/read_pwd.c
+++ b/src/lib/krb5/os/read_pwd.c
@@ -42,7 +42,9 @@
#endif /* ECHO_PASSWORD */
krb5_error_code
-krb5_read_password(krb5_context context, const char *prompt, const char *prompt2, char *return_pwd, unsigned int *size_return)
+krb5_read_password(krb5_context context,
+ const char *prompt, const char *prompt2,
+ char *return_pwd, unsigned int *size_return)
{
krb5_data reply_data;
krb5_prompt k5prompt;
@@ -117,12 +119,11 @@ center_dialog(HWND hwnd)
#ifdef _WIN32
static krb5_error_code
-read_console_password(
- krb5_context context,
- const char * prompt,
- const char * prompt2,
- char * password,
- int * pwsize)
+read_console_password(krb5_context context,
+ const char * prompt,
+ const char * prompt2,
+ char * password,
+ int * pwsize)
{
HANDLE handle;
DWORD old_mode, new_mode;