[Fedora-directory-commits] adminserver/admserv/newinst/src migrate-ds-admin.pl.in, 1.6, 1.7 register-ds-admin.pl.in, 1.1, 1.2 register_server.pl.in, 1.5, 1.6 setup-ds-admin.pl.in, 1.10, 1.11

[Doctor Conrad]

Author: rmeggins

Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9517/adminserver/admserv/newinst/src

Modified Files:
	migrate-ds-admin.pl.in register-ds-admin.pl.in 
	register_server.pl.in setup-ds-admin.pl.in 
Log Message:
Resolves: bug 250535
Bug Description: improve perldap script execution ability on bundled platforms
Reviewed by: nkinder (Thanks!)
Fix Description: Most platforms will just use perl from PATH.  However, on Solaris and
HP-UX, we have to use special 64 bit versions to execute perldap, since perldap is 64 bit
on those platforms.  Also, if bundling all of the dependent components into the single
package, we need to make sure the perl library path is set correctly to find perldap.
The last step will be to build our version of perldap on the bundled platforms to use
rpath to point to the correct runtime library location.
Platforms tested: RHEL4, HP-UX 11.23 IPF 64 bit
Flag Day: no
Doc impact: no



Index: migrate-ds-admin.pl.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/migrate-ds-admin.pl.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- migrate-ds-admin.pl.in	24 Jul 2007 20:10:16 -0000	1.6
+++ migrate-ds-admin.pl.in	2 Aug 2007 14:44:10 -0000	1.7
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!@perlexec@
 # BEGIN COPYRIGHT BLOCK
 # 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 the Free Software
@@ -17,7 +17,7 @@
 # END COPYRIGHT BLOCK
 #
 
-use lib '@perldir@';
+use lib qw(@perlpath@);
 
 use strict;
 


Index: register-ds-admin.pl.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/register-ds-admin.pl.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- register-ds-admin.pl.in	27 Jul 2007 01:42:46 -0000	1.1
+++ register-ds-admin.pl.in	2 Aug 2007 14:44:10 -0000	1.2
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!@perlexec@
 # BEGIN COPYRIGHT BLOCK
 # 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 the Free Software
@@ -37,7 +37,7 @@
 # END COPYRIGHT BLOCK
 #
 
-use lib "@perldir@";
+use lib qw(@perlpath@);
 
 use File::Basename;
 use Net::Domain qw(hostfqdn);


Index: register_server.pl.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/register_server.pl.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- register_server.pl.in	24 Jul 2007 20:10:16 -0000	1.5
+++ register_server.pl.in	2 Aug 2007 14:44:10 -0000	1.6
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!@perlexec@
 # BEGIN COPYRIGHT BLOCK
 # 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 the Free Software
@@ -35,7 +35,7 @@
 # <ldiffile> ...: ldif file(s) or template ldif file(s) to be stored in 
 #                 the Configuration Directory Server
 
-use lib "@perldir@";
+use lib qw(@perlpath@);
 
 use Getopt::Std;
 use Net::Domain qw(hostname hostfqdn);


Index: setup-ds-admin.pl.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/setup-ds-admin.pl.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- setup-ds-admin.pl.in	24 Jul 2007 20:10:16 -0000	1.10
+++ setup-ds-admin.pl.in	2 Aug 2007 14:44:10 -0000	1.11
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!@perlexec@
 # BEGIN COPYRIGHT BLOCK
 # 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 the Free Software
@@ -17,7 +17,7 @@
 # END COPYRIGHT BLOCK
 #
 
-use lib '@perldir@';
+use lib qw(@perlpath@);
 
 use strict;