projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
send use m_getfld2
[mmh]
/
uip
/
mhsign.sh
diff --git
a/uip/mhsign.sh
b/uip/mhsign.sh
index
39a3f69
..
44b3870
100755
(executable)
--- a/
uip/mhsign.sh
+++ b/
uip/mhsign.sh
@@
-101,6
+101,12
@@
lookupkeyring() {
return 0
}
return 0
}
+### Do a best guess at FQDN
+mh_hostname()
+{
+ hostname -f 2>/dev/null || uname -n
+}
+
### lookupkeys file -- set $KL to list of recipient keys
lookupkeys() {
KL=
### lookupkeys file -- set $KL to list of recipient keys
lookupkeys() {
KL=
@@
-120,7
+126,7
@@
lookupkeys() {
'|'*) echo "Ignoring pipe address" >&2
continue ;;
*@*) ;;
'|'*) echo "Ignoring pipe address" >&2
continue ;;
*@*) ;;
- *) i="$i@`hostname -f`" ;;
+ *) i="$i@`mh_hostname`" ;;
esac
if k=`lookupkeyfile "$i"` ; then
KL="$KL $k"
esac
if k=`lookupkeyfile "$i"` ; then
KL="$KL $k"
@@
-176,7
+182,7
@@
fixheaders() {
### newboundary -- output a suitable boundary marker
newboundary() {
### newboundary -- output a suitable boundary marker
newboundary() {
- b=$$_`date|sed 's/[ : ]/_/g'`
+ b=$$_`LC_ALL=C date|sed 's/[ : ]/_/g'`
for i in 0 x '=' _ + , Z 9 4 ; do
if grep "^--$b" $TEMP/body >/dev/null 2>&1 ; then
## oops, bad boundary -- try again
for i in 0 x '=' _ + , Z 9 4 ; do
if grep "^--$b" $TEMP/body >/dev/null 2>&1 ; then
## oops, bad boundary -- try again