summaryrefslogtreecommitdiff
path: root/lib-src
diff options
context:
space:
mode:
authorPaul Eggert <eggert@twinsun.com>1996-01-15 01:17:56 +0000
committerPaul Eggert <eggert@twinsun.com>1996-01-15 01:17:56 +0000
commita2e9c527d0356bfa8a68ea68fd56ea992a730c07 (patch)
tree6515d72e4811aa7ba050e97c589217c929e4fe86 /lib-src
parent1977d1137070a235c00796025c83650868e0335c (diff)
downloademacs-a2e9c527d0356bfa8a68ea68fd56ea992a730c07.tar.gz
(initialize_fullname): Add support for NIS+.
(hostname): Fully qualify the default hostname with the domainname if the hostname lacks a `.'.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/=rcs2log21
-rwxr-xr-xlib-src/rcs2log21
2 files changed, 36 insertions, 6 deletions
diff --git a/lib-src/=rcs2log b/lib-src/=rcs2log
index d1782194e4c..8de10c2e1f0 100644
--- a/lib-src/=rcs2log
+++ b/lib-src/=rcs2log
@@ -12,9 +12,9 @@
# Author: Paul Eggert <eggert@twinsun.com>
-# $Id: rcs2log,v 1.25 1995/07/07 22:47:57 eggert Exp eggert $
+# $Id: rcs2log,v 1.27 1996/01/15 01:17:03 eggert Exp $
-# Copyright 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+# Copyright 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -364,7 +364,13 @@ EOF
'
initialize_fullname=`
- (cat /etc/passwd; ypmatch $authors passwd) 2>/dev/null |
+ (
+ cat /etc/passwd
+ for author in $authors
+ do nismatch $author passwd.org_dir
+ done
+ ypmatch $authors passwd
+ ) 2>/dev/null |
$AWK -F: "$awkscript"
`$initialize_fullname
esac
@@ -414,6 +420,15 @@ case $hostname in
echo >&2 "$0: cannot deduce hostname"
exit 1
}
+
+ case $hostname in
+ *.*) ;;
+ *)
+ domainname=`(domainname) 2>/dev/null` &&
+ case $domainname in
+ *.*) hostname=$hostname.$domainname
+ esac
+ esac
esac
diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index d1782194e4c..8de10c2e1f0 100755
--- a/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@ -12,9 +12,9 @@
# Author: Paul Eggert <eggert@twinsun.com>
-# $Id: rcs2log,v 1.25 1995/07/07 22:47:57 eggert Exp eggert $
+# $Id: rcs2log,v 1.27 1996/01/15 01:17:03 eggert Exp $
-# Copyright 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+# Copyright 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -364,7 +364,13 @@ EOF
'
initialize_fullname=`
- (cat /etc/passwd; ypmatch $authors passwd) 2>/dev/null |
+ (
+ cat /etc/passwd
+ for author in $authors
+ do nismatch $author passwd.org_dir
+ done
+ ypmatch $authors passwd
+ ) 2>/dev/null |
$AWK -F: "$awkscript"
`$initialize_fullname
esac
@@ -414,6 +420,15 @@ case $hostname in
echo >&2 "$0: cannot deduce hostname"
exit 1
}
+
+ case $hostname in
+ *.*) ;;
+ *)
+ domainname=`(domainname) 2>/dev/null` &&
+ case $domainname in
+ *.*) hostname=$hostname.$domainname
+ esac
+ esac
esac