X-Git-Url: http://git.sthu.org/?a=blobdiff_plain;f=caff%2Fcaff;h=8c6e7e6a663186e481de4c4bb8402d4491de55fa;hb=ec1689f1364895809f761ffb21ec6af7e9a445f8;hp=3dd62f10d8e280e01199ae4b715d6f6eda01e973;hpb=17fff4a5e66af8ce769b02eb94a4a06423adb322;p=pgp-tools.git

diff --git a/caff/caff b/caff/caff
index 3dd62f1..8c6e7e6 100755
--- a/caff/caff
+++ b/caff/caff
@@ -4,7 +4,7 @@
 # $Id$
 #
 # Copyright (c) 2004, 2005 Peter Palfrader <peter@palfrader.org>
-# Copyright (c) 2005 Christoph Berg <cb@df7cb.de>
+# Copyright (c) 2005, 2006 Christoph Berg <cb@df7cb.de>
 #
 # All rights reserved.
 #
@@ -334,9 +334,12 @@ sub generate_config() {
 	my $gecos = defined $ENV{'LOGNAME'} ? (getpwnam($ENV{LOGNAME}))[6] : undef;
 	my $email;
 	my @keys;
-	my $hostname = `hostname -f`;
+	# BSD does not have hostname -f, so we try without -f first
+	my $hostname = `hostname`;
+	$hostname = `hostname -f` unless $hostname =~ /\./;
 	chomp $hostname;
 	my ($Cgecos,$Cemail,$Ckeys) = ('','','');
+
 	if (defined $gecos) {
 		$gecos =~ s/,.*//;
 
@@ -632,7 +635,7 @@ my $KEYEDIT_KEYEDIT_OR_DELSIG_PROMPT = '^\[GNUPG:\] (GET_BOOL keyedit.delsig|GET
 my $KEYEDIT_DELSUBKEY_PROMPT = '^\[GNUPG:\] GET_BOOL keyedit.remove.subkey';
 
 load_config;
-my $USER_AGENT = "caff $VERSION - (c) 2004, 2005 Peter Palfrader et al.";
+my $USER_AGENT = "caff $VERSION - http://pgp-tools.alioth.debian.org/";
 
 my $KEYSBASE =  $CONFIG{'caffhome'}.'/keys';
 my $GNUPGHOME = $CONFIG{'caffhome'}.'/gnupghome';
@@ -647,7 +650,7 @@ my $DATE_STRING = sprintf("%04d-%02d-%02d", $year+1900, $mon+1, $mday);
 
 sub version($) {
 	my ($fd) = @_;
-	print $fd "caff $VERSION - (c) 2004, 2005 Peter Palfrader et al.\n";
+	print $fd "caff $VERSION - (c) 2004, 2005, 2006 Peter Palfrader et al.\n";
 };
 
 sub usage($$) {