summaryrefslogtreecommitdiffstats
path: root/src/clients
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2010-09-15 20:07:39 +0000
committerGreg Hudson <ghudson@mit.edu>2010-09-15 20:07:39 +0000
commite5df86bd6e1bb1ee5b14ddde8c0cbf14c47753e8 (patch)
tree15795be3809890010633983edc62eff9452e9c14 /src/clients
parent43b3f9cd4671c87c7ebf415987c94a04053a295d (diff)
downloadkrb5-e5df86bd6e1bb1ee5b14ddde8c0cbf14c47753e8.tar.gz
krb5-e5df86bd6e1bb1ee5b14ddde8c0cbf14c47753e8.tar.xz
krb5-e5df86bd6e1bb1ee5b14ddde8c0cbf14c47753e8.zip
Whitespace
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24322 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/clients')
-rw-r--r--src/clients/kinit/kinit.M6
-rw-r--r--src/clients/kinit/kinit.c5
-rw-r--r--src/clients/kinit/kinit_kdb.c43
3 files changed, 29 insertions, 25 deletions
diff --git a/src/clients/kinit/kinit.M b/src/clients/kinit/kinit.M
index 80af95bbd1..3d95a62b36 100644
--- a/src/clients/kinit/kinit.M
+++ b/src/clients/kinit/kinit.M
@@ -137,10 +137,12 @@ file. The name and location of the keytab file may be specified with
the
.B \-t
.I keytab_file
-option; otherwise the default name and location will be used. By default a host ticket is requested but any principal may be specified. On a KDC, the special keytab location
+option; otherwise the default name and location will be used. By
+default a host ticket is requested but any principal may be
+specified. On a KDC, the special keytab location
.B KDB:
can be used to indicate that kinit should open the KDC database and
-look up the key directly. This permits an administrator to obtain
+look up the key directly. This permits an administrator to obtain
tickets as any principal that supports password-based authentication.
.TP
\fB-n\fP
diff --git a/src/clients/kinit/kinit.c b/src/clients/kinit/kinit.c
index dca911aaa7..26641e8d1f 100644
--- a/src/clients/kinit/kinit.c
+++ b/src/clients/kinit/kinit.c
@@ -448,7 +448,7 @@ k5_begin(opts, k5)
com_err(progname, code, "while initializing Kerberos 5 library");
return 0;
}
-errctx = k5->ctx;
+ errctx = k5->ctx;
if (opts->k5_cache_name)
{
code = krb5_cc_resolve(k5->ctx, opts->k5_cache_name, &k5->cc);
@@ -654,7 +654,8 @@ k5_kinit(opts, k5)
code = kinit_kdb_init(&k5->ctx,
krb5_princ_realm(k5->ctx, k5->me)->data);
if (code != 0) {
- com_err(progname, code, "while setting up KDB keytab for realm %s",
+ com_err(progname, code,
+ "while setting up KDB keytab for realm %s",
krb5_princ_realm(k5->ctx, k5->me)->data);
goto cleanup;
}
diff --git a/src/clients/kinit/kinit_kdb.c b/src/clients/kinit/kinit_kdb.c
index 972983a161..f2011a6bf6 100644
--- a/src/clients/kinit/kinit_kdb.c
+++ b/src/clients/kinit/kinit_kdb.c
@@ -38,33 +38,34 @@
#include <kdb_kt.h>
#include "extern.h"
-/**Server handle*/
-static void * server_handle;
+/** Server handle */
+static void *server_handle;
/**
- *@internal Initialize KDB for given realm
+ * @internal Initialize KDB for given realm
* @param context pointer to context that will be re-initialized
* @@param realm name of realm to initialize
*/
krb5_error_code
-kinit_kdb_init (krb5_context *pcontext, char *realm)
+kinit_kdb_init(krb5_context *pcontext, char *realm)
{
- kadm5_config_params config;
- krb5_error_code retval = 0;
- if (*pcontext)
- krb5_free_context(*pcontext);
- memset(&config, 0, sizeof config);
- retval = kadm5_init_krb5_context(pcontext);
- if (retval)
+ kadm5_config_params config;
+ krb5_error_code retval = 0;
+
+ if (*pcontext)
+ krb5_free_context(*pcontext);
+ memset(&config, 0, sizeof config);
+ retval = kadm5_init_krb5_context(pcontext);
+ if (retval)
+ return retval;
+ config.mask = KADM5_CONFIG_REALM;
+ config.realm = realm;
+ retval = kadm5_init(*pcontext, "kinit", NULL /*pass*/,
+ "kinit", &config,
+ KADM5_STRUCT_VERSION, KADM5_API_VERSION_3, NULL,
+ &server_handle);
+ if (retval)
+ return retval;
+ retval = krb5_kt_register(*pcontext, &krb5_kt_kdb_ops);
return retval;
- config.mask = KADM5_CONFIG_REALM;
- config.realm = realm;
- retval = kadm5_init(*pcontext, "kinit", NULL /*pass*/,
- "kinit", &config,
- KADM5_STRUCT_VERSION, KADM5_API_VERSION_3, NULL,
- &server_handle);
- if (retval)
- return retval;
- retval = krb5_kt_register(*pcontext, &krb5_kt_kdb_ops);
- return retval;
}