From 92ff7f21ad0b167f8d742a9d7b5f93704a57619c Mon Sep 17 00:00:00 2001 From: Russ Allbery 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/srvtab.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) (limited to 'client/srvtab.c') diff --git a/client/srvtab.c b/client/srvtab.c index b454720..2e4ea2d 100644 --- a/client/srvtab.c +++ b/client/srvtab.c @@ -1,15 +1,15 @@ -/* $Id$ -** -** Implementation of srvtab handling for the wallet client. -** -** Written by Russ Allbery -** Copyright 2007, 2008 Board of Trustees, Leland Stanford Jr. University -** -** See LICENSE for licensing terms. -*/ +/* $Id$ + * + * Implementation of srvtab handling for the wallet client. + * + * Written by Russ Allbery + * Copyright 2007, 2008 Board of Trustees, Leland Stanford Jr. University + * + * See LICENSE for licensing terms. + */ #include -#include +#include #include @@ -24,16 +24,17 @@ /* -** Given the Kerberos context, srvtab file name, a Kerberos principal (as a -** string), and a keytab file name, extract the des-cbc-crc key from that -** keytab and write it to the newly created srvtab file as a srvtab. Convert -** the principal from Kerberos v5 form to Kerberos v4 form. -** -** We always force the kvno to 0 for the srvtab. This works with how the -** wallet synchronizes keys, even though it's not particularly correct. -** -** On any failure, print an error message to standard error and then exit. -*/ + * Given the Kerberos context, srvtab file name, a Kerberos principal (as a + * string), and a keytab file name, extract the des-cbc-crc key from that + * keytab and write it to the newly created srvtab file as a srvtab. Convert + * the principal from Kerberos v5 form to Kerberos v4 form. + * + * We always force the kvno to 0 for the srvtab. This works with how the + * wallet synchronizes keys with kasetkey, even though it's not particularly + * correct. + * + * On any failure, print an error message to standard error and then exit. + */ void write_srvtab(krb5_context ctx, const char *srvtab, const char *principal, const char *keytab) -- cgit v1.2.3