[Fedora-directory-commits] ldapserver/ldap/admin/src create_instance.c, 1.58, 1.59 ds_newinst.pl.in, 1.7, 1.8

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

Modified Files:
	create_instance.c ds_newinst.pl.in 
Log Message:
Resolves: bug 237356
Description: Move DS Admin Code into Admin Server
Reviewed by: nhosoi (Thanks!)
Fix Description: 1) Since we moved the o=NetscapeRoot code out of cfg_sspt.c, we no longer need to create the suffix and backend in create_instance.c
2) Added code to enable/disable dialogs e.g. for dialogs that can change the flow conditionally
3) Added code to allow the user to backup to the first prompt on a dialog, for dialogs with many prompts
4) Allow continuation lines in Resource files, instead of having to have embedded \n chars.  This allows easier editing and layout.
5) Added an addSuffix function
6) Moved the register_servers.pl code from admin server into DS Util.pm and made it a little more general purpose.
Platforms tested: RHEL4



Index: create_instance.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- create_instance.c	7 Jun 2007 22:40:14 -0000	1.58
+++ create_instance.c	15 Jun 2007 22:11:15 -0000	1.59
@@ -3404,12 +3404,6 @@
     fprintf(f, "cn: tasks\n");
     fprintf(f, "\n");
 
-    /* Entries for the ldbm instances and mapping tree */
-    if ( cf->netscaperoot && !cf->use_existing_config_ds)
-    {
-        suffix_gen_conf(f, cf->netscaperoot, "NetscapeRoot");
-    }
-
     if (!cf->use_existing_user_ds)
     {
         suffix_gen_conf(f, cf->suffix, "userRoot");


Index: ds_newinst.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_newinst.pl.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ds_newinst.pl.in	7 Jun 2007 22:40:14 -0000	1.7
+++ ds_newinst.pl.in	15 Jun 2007 22:11:15 -0000	1.8
@@ -189,7 +189,7 @@
 
 # process command line arguments
 for (@ARGV) {
-    if (/^(\w+).(\w+)=(.*)$/) { # e.g. section.param=value
+    if (/^(\w+)\.(\w+)=(.*)$/) { # e.g. section.param=value
         $table{$1}->{$2} = $3;
     } else { # file?
         readInfFile($_);