summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-08-25 15:01:04 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-08-25 15:01:04 +1000
commit36ca53a5a025114d7c55b881027294a28b7d465a (patch)
tree0865a5774c282e1fdb42ab3eb386fc9d8e29a2cb
parent3c8e1e1bbf5810c00554d476534908ba9370fe87 (diff)
- (dtucker) [README buildbff.sh inventory.sh] (all in contrib/aix)
Update package builder: correctly handle config variables, use lsuser rather than /etc/passwd, fix typos, add Id's.
-rw-r--r--ChangeLog5
-rw-r--r--contrib/aix/README3
-rwxr-xr-xcontrib/aix/buildbff.sh13
-rwxr-xr-xcontrib/aix/inventory.sh1
4 files changed, 15 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index fa13b037..550e443d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
UsePAM=yes; ok dtucker
- (dtucker) [configure.ac] Bug #533, #551: define BROKEN_GETADDRINFO on
Tru64, solves getnameinfo and "bad addr or host" errors. ok djm@
+ - (dtucker) [README buildbff.sh inventory.sh] (all in contrib/aix)
+ Update package builder: correctly handle config variables, use lsuser
+ rather than /etc/passwd, fix typos, add Id's.
20030822
- (djm) s/get_progname/ssh_get_progname/g to avoid conflict with Heimdal
@@ -866,4 +869,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.2904 2003/08/25 03:27:40 dtucker Exp $
+$Id: ChangeLog,v 1.2905 2003/08/25 05:01:04 dtucker Exp $
diff --git a/contrib/aix/README b/contrib/aix/README
index 82fd8be1..2a299350 100644
--- a/contrib/aix/README
+++ b/contrib/aix/README
@@ -26,6 +26,7 @@ and for comparison with the output from this script, however no code
from lppbuild is included and it is not required for operation.
SRC support based on examples provided by Sandor Sklar and Maarten Kreuger.
+PrivSep account handling fixes contributed by W. Earl Allen.
Other notes:
@@ -45,3 +46,5 @@ you get to keep both pieces.
- Darren Tucker (dtucker at zip dot com dot au)
2002/03/01
+
+$Id: README,v 1.4 2003/08/25 05:01:04 dtucker Exp $
diff --git a/contrib/aix/buildbff.sh b/contrib/aix/buildbff.sh
index 3b369966..727ac446 100755
--- a/contrib/aix/buildbff.sh
+++ b/contrib/aix/buildbff.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# buildbff.sh: Create AIX SMIT-installable OpenSSH packages
+# $Id: buildbff.sh,v 1.6 2003/08/25 05:01:04 dtucker Exp $
#
# Author: Darren Tucker (dtucker at zip dot com dot au)
# This file is placed in the public domain and comes with absolutely
@@ -14,9 +15,9 @@
# create a "config.local" in your build directory or set
# environment variables to override these.
#
-[ -z "$PERMIT_ROOT_LOGIN" ] || PERMIT_ROOT_LOGIN=no
-[ -z "$X11_FORWARDING" ] || X11_FORWARDING=no
-[ -z "$AIX_SRC" ] || AIX_SRC=no
+[ -z "$PERMIT_ROOT_LOGIN" ] && PERMIT_ROOT_LOGIN=no
+[ -z "$X11_FORWARDING" ] && X11_FORWARDING=no
+[ -z "$AIX_SRC" ] && AIX_SRC=no
umask 022
@@ -31,7 +32,7 @@ else
fi
#
-# We still support running from contrib/aix, but this is depreciated
+# We still support running from contrib/aix, but this is deprecated
#
if pwd | egrep 'contrib/aix$'
then
@@ -121,7 +122,7 @@ cp $srcdir/README* $objdir/$PKGDIR/
# Extract common info requires for the 'info' part of the package.
# AIX requires 4-part version numbers
#
-VERSION=`./ssh -V 2>&1 | sed -e 's/,.*//' | cut -f 2 -d _`
+VERSION=`./ssh -V 2>&1 | cut -f 1 -d , | cut -f 2 -d _`
MAJOR=`echo $VERSION | cut -f 1 -d p | cut -f 1 -d .`
MINOR=`echo $VERSION | cut -f 1 -d p | cut -f 2 -d .`
PATCH=`echo $VERSION | cut -f 1 -d p | cut -f 3 -d .`
@@ -218,7 +219,7 @@ else
fi
# Create user if required
- if cut -f1 -d: /etc/passwd | egrep '^'$SSH_PRIVSEP_USER'\$' >/dev/null
+ if lsuser ALL | cut -f1 -d: | egrep '^'$SSH_PRIVSEP_USER'\$' >/dev/null
then
echo "PrivSep user $SSH_PRIVSEP_USER already exists."
else
diff --git a/contrib/aix/inventory.sh b/contrib/aix/inventory.sh
index 619493ae..6b0eaaf4 100755
--- a/contrib/aix/inventory.sh
+++ b/contrib/aix/inventory.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# inventory.sh
+# $Id: inventory.sh,v 1.4 2003/08/25 05:01:04 dtucker Exp $
#
# Originally written by Ben Lindstrom, modified by Darren Tucker to use perl
#