[Fedora-directory-commits] adminserver/admserv/newinst/src AdminServer.pm.in, 1.14, 1.15 adminserver.map.in, 1.10, 1.11

[Nathan Kinder]

Author: nkinder

Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19994/admserv/newinst/src

Modified Files:
	AdminServer.pm.in adminserver.map.in 
Log Message:
Resolves: 430364
Summary: Allow listen address to be passed in via installer.



Index: AdminServer.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminServer.pm.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AdminServer.pm.in	14 Jul 2008 20:00:03 -0000	1.14
+++ AdminServer.pm.in	28 Jan 2009 21:25:58 -0000	1.15
@@ -346,7 +346,9 @@
 
     $? = 0; # clear error
     my $output = `$cmd 2>&1`;
-    if ($?) {
+    # Check the output of the config CGI to see if something bad happened.
+    if ($? || $output =~ /NMC_Status: 1/) {
+        debug(0, "Error updating console.conf:\n");
         debug(0, $output);
         $ENV{LD_LIBRARY_PATH} = $savepath;
         $ENV{SHLIB_PATH} = $savepath;


Index: adminserver.map.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/adminserver.map.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- adminserver.map.in	14 Jul 2008 18:43:02 -0000	1.10
+++ adminserver.map.in	28 Jan 2009 21:25:58 -0000	1.11
@@ -48,6 +48,7 @@
 uname_m =        `open(UNAMEM, "uname -m |"); $returnvalue = <UNAMEM>; chomp $returnvalue; close(UNAMEM);`
 asid =			`$returnvalue = $mapper->{fqdn}; $returnvalue =~ s/\..*$//;`
 as_port =		Port
+as_addr = 		ServerIpAddress
 admpw =			"@configdir@/admpw"
 as_error =		"@logdir@/error"
 as_access =		"@logdir@/access"