|
Check-in Number:
|
5658 | |
| Date: |
2006-Sep-29 08:36:31 (local)
2006-Sep-29 06:36:31 (UTC) |
| User: | rse |
| Branch: | |
| Comment: |
add NIS+ support, too |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/shtool/ChangeLog 1.229 -> 1.230
--- ChangeLog 2006/09/29 06:13:16 1.229
+++ ChangeLog 2006/09/29 06:36:31 1.230
@@ -12,7 +12,8 @@
Changes between 2.0.6 and 2.0.7 (19-Apr-2006 to xx-Sep-2006):
*) Fix and enhance "shtool echo -e" command by adding a missing
- line-continuation and adding support for MacOS X via nidump(8).
+ line-continuation and adding support for MacOS X via nidump(8)
+ and NIS+ support via niscat(8) and nismatch(8).
[Ralf S. Engelschall]
Changes between 2.0.5 and 2.0.6 (07-Feb-2006 to 19-Apr-2006):
|
|
ossp-pkg/shtool/sh.echo 1.41 -> 1.42
--- sh.echo 2006/09/29 06:13:17 1.41
+++ sh.echo 2006/09/29 06:36:31 1.42
@@ -146,8 +146,8 @@
userid=`grep "^${username}:" /etc/passwd 2>/dev/null | \
sed -e 's/[^:]*:[^:]*://' -e 's/:.*$//'`
if [ ".$userid" = . ]; then
- userid=`(ypmatch "${username}" passwd) 2>/dev/null | \
- sed -e 's/[^:]*:[^:]*://' -e 's/:.*$//'`
+ userid=`(ypmatch "${username}" passwd; nismatch "${username}" passwd) 2>/dev/null | \
+ sed -e 'q' | sed -e 's/[^:]*:[^:]*://' -e 's/:.*$//'`
if [ ".$userid" = . ]; then
userid=`(nidump passwd . | grep "^${username}:") 2>/dev/null | \
sed -e 's/[^:]*:[^:]*://' -e 's/:.*$//'`
@@ -178,8 +178,8 @@
groupid=`grep "^${username}:" /etc/passwd 2>/dev/null | \
sed -e 's/[^:]*:[^:]*:[^:]*://' -e 's/:.*$//'`
if [ ".$groupid" = . ]; then
- groupid=`(ypmatch "${username}" passwd) 2>/dev/null | \
- sed -e 's/[^:]*:[^:]*:[^:]*://' -e 's/:.*$//'`
+ groupid=`(ypmatch "${username}" passwd; nismatch "${username}" passwd) 2>/dev/null | \
+ sed -e 'q' | sed -e 's/[^:]*:[^:]*:[^:]*://' -e 's/:.*$//'`
if [ ".$groupid" = . ]; then
groupid=`(nidump passwd . | grep "^${username}:") 2>/dev/null | \
sed -e 's/[^:]*:[^:]*:[^:]*://' -e 's/:.*$//'`
@@ -210,8 +210,8 @@
groupname=`grep "^[^:]*:[^:]*:${groupid}:" /etc/group 2>/dev/null | \
sed -e 's/:.*$//'`
if [ ".$groupname" = . ]; then
- groupname=`(ypcat group) 2>/dev/null | \
- grep "^[^:]*:[^:]*:${groupid}:" | \
+ groupname=`(ypcat group; niscat group) 2>/dev/null | \
+ sed -e 'q' | grep "^[^:]*:[^:]*:${groupid}:" | \
sed -e 's/:.*$//'`
if [ ".$groupname" = . ]; then
groupname=`(nidump group .) 2>/dev/null | \
|
|
