Attachment 155069 Details for Bug 239765 – Patch to add an option for installing partial/full schema

[patch] Patch to add an option for installing partial/full schema

install-full-schema.patch (text/plain), 4.69 KB, created by Andrew Bartlett on 2007-05-21 04:13:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Bartlett

Created: 2007-05-21 04:13:43 UTC

Size: 4.69 KB

patch

obsolete

>? ldap/admin/lib/.deps
>? ldap/admin/lib/.dirstamp
>? ldap/admin/lib/.libs
>? ldap/admin/lib/libds_admin_la-dsalib_conf.lo
>? ldap/admin/lib/libds_admin_la-dsalib_confs.lo
>? ldap/admin/lib/libds_admin_la-dsalib_db.lo
>? ldap/admin/lib/libds_admin_la-dsalib_debug.lo
>? ldap/admin/lib/libds_admin_la-dsalib_dn.lo
>? ldap/admin/lib/libds_admin_la-dsalib_filename.lo
>? ldap/admin/lib/libds_admin_la-dsalib_html.lo
>? ldap/admin/lib/libds_admin_la-dsalib_ldif.lo
>? ldap/admin/lib/libds_admin_la-dsalib_location.lo
>? ldap/admin/lib/libds_admin_la-dsalib_pw.lo
>? ldap/admin/lib/libds_admin_la-dsalib_tailf.lo
>? ldap/admin/lib/libds_admin_la-dsalib_updown.lo
>? ldap/admin/lib/libds_admin_la-dsalib_util.lo
>? ldap/admin/src/.deps
>? ldap/admin/src/.dirstamp
>? ldap/admin/src/ds_newinst.pl
>? ldap/admin/src/migrateTo11
>? ldap/admin/src/scripts/template-bak2db
>? ldap/admin/src/scripts/template-bak2db.pl
>? ldap/admin/src/scripts/template-cl-dump.pl
>? ldap/admin/src/scripts/template-db2bak
>? ldap/admin/src/scripts/template-db2bak.pl
>? ldap/admin/src/scripts/template-db2index
>? ldap/admin/src/scripts/template-db2index.pl
>? ldap/admin/src/scripts/template-db2ldif
>? ldap/admin/src/scripts/template-db2ldif.pl
>? ldap/admin/src/scripts/template-ldif2db
>? ldap/admin/src/scripts/template-ldif2db.pl
>? ldap/admin/src/scripts/template-ldif2ldap
>? ldap/admin/src/scripts/template-monitor
>? ldap/admin/src/scripts/template-ns-accountstatus.pl
>? ldap/admin/src/scripts/template-ns-activate.pl
>? ldap/admin/src/scripts/template-ns-inactivate.pl
>? ldap/admin/src/scripts/template-ns-newpwpolicy.pl
>? ldap/admin/src/scripts/template-repl-monitor.pl
>? ldap/admin/src/scripts/template-restoreconfig
>? ldap/admin/src/scripts/template-saveconfig
>? ldap/admin/src/scripts/template-start-slapd
>? ldap/admin/src/scripts/template-stop-slapd
>? ldap/admin/src/scripts/template-suffix2instance
>? ldap/admin/src/scripts/template-verify-db.pl
>? ldap/admin/src/scripts/template-vlvindex
>Index: ldap/admin/src/create_instance.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
>retrieving revision 1.56
>diff -u -r1.56 create_instance.c
>--- ldap/admin/src/create_instance.c	16 May 2007 19:45:26 -0000	1.56
>+++ ldap/admin/src/create_instance.c	21 May 2007 04:11:36 -0000
>@@ -300,6 +300,7 @@
>     conf->upgradingServer = 0;
>     
>     conf->start_server = "1";
>+    conf->install_full_schema = "1";
>     conf->admin_domain = NULL;
>     conf->config_ldap_url = NULL;
>     conf->user_ldap_url = NULL;
>@@ -3530,14 +3531,27 @@
>     fclose(srcf);
>     fclose(f);
> 
>-    /*
>-     * <sysconfdir>/PACKAGE_NAME/schema to schema_dir
>-     */
>-    PR_snprintf(src, sizeof(src), "%s%c%s%cschema", 
>-        cf->sysconfdir, FILE_PATHSEP, cf->package_name, FILE_PATHSEP);
>-    if (NULL != (t = ds_copy_group_files_using_mode_owner(src, cf->schema_dir, 0, NEWFILE_MODE, pw)))
>-        return t;
>-        
>+    if (cf->install_full_schema) {
>+	/*
>+         * <sysconfdir>/PACKAGE_NAME/schema to schema_dir
>+         */
>+        PR_snprintf(src, sizeof(src), "%s%c%s%cschema", 
>+            cf->sysconfdir, FILE_PATHSEP, cf->package_name, FILE_PATHSEP);
>+        if (NULL != (t = ds_copy_group_files_using_mode_owner(src, cf->schema_dir, 0, NEWFILE_MODE, pw)))
>+            return t;
>+    } else {
>+        PR_snprintf(src, sizeof(src),  "%s%c%s%cschema%c00core.ldif", 
>+		    cf->sysconfdir, FILE_PATHSEP, cf->package_name, FILE_PATHSEP, FILE_PATHSEP);
>+        PR_snprintf(dest, sizeof(dest), "%s%c00core.ldif", 
>+		    cf->schema_dir, FILE_PATHSEP);
>+	if( (t = create_instance_copy(src, dest, NEWFILE_MODE, 0 )) ) {
>+            return t;
>+	} else {
>+	    if (pw) {
>+		chownfile(pw, dest);
>+	    }
>+        }
>+    }
> #if defined (BUILD_PRESENCE)
>     PR_snprintf(src, sizeof(src), "%s%c%s%c/config/presence",
>                 cf->sysconfdir, FILE_PATHSEP, cf->package_name, FILE_PATHSEP);
>@@ -4490,6 +4504,7 @@
>         return 1;
>     }
>     cf->start_server = ds_a_get_cgi_var("start_server", NULL, NULL);
>+    cf->install_full_schema = ds_a_get_cgi_var("install_full_schema", NULL, NULL);
>     cf->secserv = ds_a_get_cgi_var("secserv", NULL, NULL);
>     if (cf->secserv && strcmp(cf->secserv, "off"))
>         cf->secservport = ds_a_get_cgi_var("secservport", NULL, NULL);
>Index: ldap/admin/src/create_instance.h
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.h,v
>retrieving revision 1.16
>diff -u -r1.16 create_instance.h
>--- ldap/admin/src/create_instance.h	1 Mar 2007 03:34:23 -0000	1.16
>+++ ldap/admin/src/create_instance.h	21 May 2007 04:11:36 -0000
>@@ -185,6 +185,7 @@
> #if defined(ENABLE_LDAPI)
>     char *ldapifilepath;
> #endif
>+    char *install_full_schema;
> } server_config_s;
> 
>

Actions: View | Diff

Attachments on bug 239765: 155069 | 155526 | 156515