[Fedora-directory-commits] ldapserver/ldap/admin/src ds_newinst.pl.in, 1.9, 1.10

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22246/ldapserver/ldap/admin/src

Modified Files:
	ds_newinst.pl.in 
Log Message:
Resolves: bug 237356
Description: Move DS Admin Code into Admin Server - Inf, ds_newinst.pl
Fix Description: Some minor cleanup:
1) Setup must not write to the user supplied inf file.  Setup uses the user supplied inf to initialize its cache, but creates a tempfile for writing.
2) When writing an Inf, preserve the continuation lines.
3) Added Noriko's fix for suffix generation to ds_newinst.pl
Platforms tested: RHEL4
Flag Day: No.
Doc impact: No.



Index: ds_newinst.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_newinst.pl.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ds_newinst.pl.in	19 Jun 2007 23:24:58 -0000	1.9
+++ ds_newinst.pl.in	20 Jun 2007 14:40:23 -0000	1.10
@@ -217,6 +217,7 @@
 if (!$table{slapd}->{Suffix}) {
     my $suffix = $table{General}->{FullMachineName};
     # convert fqdn to dc= domain components
+    $suffix =~ s/^[^\.]*\.//; # just the domain part
     $suffix = "dc=$suffix";
     $suffix =~ s/\./, dc=/g;
     $table{slapd}->{Suffix} = $suffix;