- (dtucker) [contrib/aix/buildbff.sh] Only try to rename ssh_prng_cmds if it

   exists (it's not created if OpenSSL's PRNG is self-seeded, eg if the OS
   has a /dev/random).

2 files changed, 14 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 8c18430a..6964dcff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20090307
+ - (dtucker) [contrib/aix/buildbff.sh] Only try to rename ssh_prng_cmds if it
+   exists (it's not created if OpenSSL's PRNG is self-seeded, eg if the OS
+   has a /dev/random).
+
 20090306
  - (djm) OpenBSD CVS Sync
    - djm@cvs.openbsd.org 2009/03/05 07:18:19
diff --git a/contrib/aix/buildbff.sh b/contrib/aix/buildbff.sh
index 97a7cbbb..6648e8e6 100755
--- a/contrib/aix/buildbff.sh
+++ b/contrib/aix/buildbff.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # buildbff.sh: Create AIX SMIT-installable OpenSSH packages
-# $Id: buildbff.sh,v 1.10 2006/09/10 03:24:19 dtucker Exp $
+# $Id: buildbff.sh,v 1.11 2009/03/06 23:22:10 dtucker Exp $
 #
 # Author: Darren Tucker (dtucker at zip dot com dot au)
 # This file is placed in the public domain and comes with absolutely
@@ -151,11 +151,18 @@ fi
 
 
 # Rename config files; postinstall script will copy them if necessary
-for cfgfile in ssh_config sshd_config ssh_prng_cmds
+for cfgfile in ssh_config sshd_config
 do
 	mv $FAKE_ROOT/$sysconfdir/$cfgfile $FAKE_ROOT/$sysconfdir/$cfgfile.default
 done
 
+# AIX 5.3 and newer have /dev/random and don't create ssh_prng_cmds
+if [ -f $FAKE_ROOT/$sysconfdir/ssh_prng_cmds ]
+then
+	mv FAKE_ROOT/$sysconfdir/ssh_prng_cmds \
+		$FAKE_ROOT/$sysconfdir/ssh_prng_cmds.default
+fi
+
 #
 # Generate lpp control files.
 #	working dir is $FAKE_ROOT but files are generated in dir above