diff options
author | Damien Miller <djm@mindrot.org> | 2011-05-05 13:48:37 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2011-05-05 13:48:37 +1000 |
commit | f22019bdbfb986daf24428a9d37f9fe9bb3ff7ad (patch) | |
tree | e23aa2864fccb6f4097d962aa14f9d78ca02a929 /contrib/aix | |
parent | 68790fedef210e03e36534b111e2f27b858170b4 (diff) |
- (djm) [Makefile.in WARNING.RNG aclocal.m4 buildpkg.sh.in configure.ac]
[entropy.c ssh-add.c ssh-agent.c ssh-keygen.c ssh-keyscan.c]
[ssh-keysign.c ssh-pkcs11-helper.c ssh-rand-helper.8 ssh-rand-helper.c]
[ssh.c ssh_prng_cmds.in sshd.c contrib/aix/buildbff.sh]
[regress/README.regress] Remove ssh-rand-helper and all its
tentacles. PRNGd seeding has been rolled into entropy.c directly.
Thanks to tim@ for testing on affected platforms.
Diffstat (limited to 'contrib/aix')
-rwxr-xr-x | contrib/aix/buildbff.sh | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/contrib/aix/buildbff.sh b/contrib/aix/buildbff.sh index ca4bf0210..81d8cc301 100755 --- a/contrib/aix/buildbff.sh +++ b/contrib/aix/buildbff.sh | |||
@@ -1,7 +1,7 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | # | 2 | # |
3 | # buildbff.sh: Create AIX SMIT-installable OpenSSH packages | 3 | # buildbff.sh: Create AIX SMIT-installable OpenSSH packages |
4 | # $Id: buildbff.sh,v 1.12 2010/04/18 03:35:00 dtucker Exp $ | 4 | # $Id: buildbff.sh,v 1.13 2011/05/05 03:48:41 djm Exp $ |
5 | # | 5 | # |
6 | # Author: Darren Tucker (dtucker at zip dot com dot au) | 6 | # Author: Darren Tucker (dtucker at zip dot com dot au) |
7 | # This file is placed in the public domain and comes with absolutely | 7 | # This file is placed in the public domain and comes with absolutely |
@@ -156,13 +156,6 @@ do | |||
156 | mv $FAKE_ROOT/$sysconfdir/$cfgfile $FAKE_ROOT/$sysconfdir/$cfgfile.default | 156 | mv $FAKE_ROOT/$sysconfdir/$cfgfile $FAKE_ROOT/$sysconfdir/$cfgfile.default |
157 | done | 157 | done |
158 | 158 | ||
159 | # AIX 5.3 and newer have /dev/random and don't create ssh_prng_cmds | ||
160 | if [ -f $FAKE_ROOT/$sysconfdir/ssh_prng_cmds ] | ||
161 | then | ||
162 | mv $FAKE_ROOT/$sysconfdir/ssh_prng_cmds \ | ||
163 | $FAKE_ROOT/$sysconfdir/ssh_prng_cmds.default | ||
164 | fi | ||
165 | |||
166 | # | 159 | # |
167 | # Generate lpp control files. | 160 | # Generate lpp control files. |
168 | # working dir is $FAKE_ROOT but files are generated in dir above | 161 | # working dir is $FAKE_ROOT but files are generated in dir above |
@@ -197,7 +190,7 @@ cat <<EOF >>../openssh.post_i | |||
197 | #!/bin/sh | 190 | #!/bin/sh |
198 | 191 | ||
199 | echo Creating configs from defaults if necessary. | 192 | echo Creating configs from defaults if necessary. |
200 | for cfgfile in ssh_config sshd_config ssh_prng_cmds | 193 | for cfgfile in ssh_config sshd_config |
201 | do | 194 | do |
202 | if [ ! -f $sysconfdir/\$cfgfile ] | 195 | if [ ! -f $sysconfdir/\$cfgfile ] |
203 | then | 196 | then |