[Fedora-directory-commits] adminserver/admserv/newinst/src AdminUtil.pm.in, 1.18, 1.19

[Doctor Conrad]

Author: rmeggins

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

Modified Files:
	AdminUtil.pm.in 
Log Message:
Resolves: bug 431103
Bug Description: Cannot setup ds with remote config DS
Reviewed by: nhosoi (Thanks!)
Branch: HEAD
Fix Description: If using a non-standard config dir for the directory server, creating
additional instances with setup-ds-admin.pl fails, because it doesn't take into
consideration the location.  DS_CONFIG_DIR is set in DSCreate.pm to the real location of
the new directory server instance config directory.
Platforms tested: Fedora 8
Flag Day: no
Doc impact: no



Index: AdminUtil.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminUtil.pm.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- AdminUtil.pm.in	17 Dec 2007 20:10:04 -0000	1.18
+++ AdminUtil.pm.in	24 Jul 2008 16:00:20 -0000	1.19
@@ -357,8 +357,11 @@
 sub createSubDSNoConn {
     my $inf = shift;
     my $errs = shift;
+    # $ENV{DS_CONFIG_DIR} is set in ds instance creation
+    my $dsconfdir = $ENV{DS_CONFIG_DIR} ||
+        "@instconfigdir@/slapd-" . $inf->{slapd}->{ServerIdentifier};
 
-    my $dseldif = "@instconfigdir@/slapd-" .
$inf->{slapd}->{ServerIdentifier} . "/dse.ldif";
+    my $dseldif = "$dsconfdir/dse.ldif";
     my $conn = new FileConn($dseldif);
 
     return internalCreateSubDS($conn, $inf, $errs);