From 92ff7f21ad0b167f8d742a9d7b5f93704a57619c Mon Sep 17 00:00:00 2001
From: Russ Allbery <rra@stanford.edu>
Date: Thu, 24 Apr 2008 02:02:49 +0000
Subject: Major coding style cleanup.  Updated all shared code from my other
 projects.

The configure option requesting AFS kaserver support (and thus
building kasetkey) is now --with-kaserver instead of --with-afs.

If KRB5_CONFIG was explicitly set in the environment, don't use a
different krb5-config based on --with-krb4 or --with-krb5.  If
krb5-config isn't executable, don't use it.  This allows one to
force library probing by setting KRB5_CONFIG to point to a
nonexistent file.

Sanity-check the results of krb5-config before proceeding and error
out in configure if they don't work.

Stop setting Stanford-specific compile-time defaults for the wallet
server and port.
---
 client/keytab.c | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'client/keytab.c')

diff --git a/client/keytab.c b/client/keytab.c
index 872cd48..eb37ec1 100644
--- a/client/keytab.c
+++ b/client/keytab.c
@@ -1,15 +1,15 @@
-/*  $Id$
-**
-**  Implementation of keytab handling for the wallet client.
-**
-**  Written by Russ Allbery <rra@stanford.edu>
-**  Copyright 2007, 2008 Board of Trustees, Leland Stanford Jr. University
-**
-**  See LICENSE for licensing terms.
-*/
+/* $Id$
+ *
+ * Implementation of keytab handling for the wallet client.
+ *
+ * Written by Russ Allbery <rra@stanford.edu>
+ * Copyright 2007, 2008 Board of Trustees, Leland Stanford Jr. University
+ *
+ * See LICENSE for licensing terms.
+ */
 
 #include <config.h>
-#include <system.h>
+#include <portable/system.h>
 
 #include <remctl.h>
 
@@ -18,11 +18,11 @@
 
 
 /*
-**  Given keytab data as a pointer to memory and a length and the path of a
-**  second keytab, merge the keys in the memory keytab into the file keytab.
-**  Currently, this doesn't do any cleanup of old kvnos and doesn't handle
-**  duplicate kvnos correctly.  Dies on any error.
-*/
+ * Given keytab data as a pointer to memory and a length and the path of a
+ * second keytab, merge the keys in the memory keytab into the file keytab.
+ * Currently, this doesn't do any cleanup of old kvnos and doesn't handle
+ * duplicate kvnos correctly.  Dies on any error.
+ */
 static void
 merge_keytab(krb5_context ctx, const char *newfile, const char *file)
 {
@@ -61,9 +61,9 @@ merge_keytab(krb5_context ctx, const char *newfile, const char *file)
 
 
 /*
-**  Configure a given keytab to be synchronized with an AFS kaserver if it
-**  isn't already.  Returns true on success, false on failure.
-*/
+ * Configure a given keytab to be synchronized with an AFS kaserver if it
+ * isn't already.  Returns true on success, false on failure.
+ */
 static int
 set_sync(struct remctl *r, const char *type, const char *name)
 {
@@ -94,10 +94,10 @@ set_sync(struct remctl *r, const char *type, const char *name)
 
 
 /*
-**  Given a remctl object, the Kerberos context, the name of a keytab object,
-**  and a file name, call the correct wallet commands to download a keytab and
-**  write it to that file.  Returns the setatus or 255 on an internal error.
-*/
+ * Given a remctl object, the Kerberos context, the name of a keytab object,
+ * and a file name, call the correct wallet commands to download a keytab and
+ * write it to that file.  Returns the setatus or 255 on an internal error.
+ */
 int
 get_keytab(struct remctl *r, krb5_context ctx, const char *type,
            const char *name, const char *file, const char *srvtab)
-- 
cgit v1.2.3