Attachment 147682 Details for Bug 227771 – diffs

[patch] diffs

cvsdiffs (text/plain), 5.17 KB, created by Rich Megginson on 2007-02-08 18:07:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-02-08 18:07:00 UTC

Size: 5.17 KB

patch

obsolete

>Index: ldapserver/Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
>retrieving revision 1.21
>diff -u -8 -r1.21 Makefile.am
>--- ldapserver/Makefile.am	7 Feb 2007 23:57:34 -0000	1.21
>+++ ldapserver/Makefile.am	8 Feb 2007 18:02:17 -0000
>@@ -161,17 +161,16 @@
> 	ldap/admin/src/scripts/template-db2bak.pl \
> 	ldap/admin/src/scripts/template-db2index.pl \
> 	ldap/admin/src/scripts/template-db2ldif.pl \
> 	ldap/admin/src/scripts/template-ldif2db.pl \
> 	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-cgi.pl \
> 	ldap/admin/src/scripts/template-repl-monitor.pl \
> 	ldap/admin/src/scripts/template-verify-db.pl \
> 	$(srcdir)/ldap/admin/src/scripts/template-migrate5to7 \
> 	$(srcdir)/ldap/admin/src/scripts/template-migrate6to7 \
> 	$(srcdir)/ldap/admin/src/scripts/template-migrateInstance7 \
> 	$(srcdir)/ldap/admin/src/scripts/template-migrateTo7
> 
> #////////////////////////////////////////////////////////////////
>Index: ldapserver/ldap/admin/src/create_instance.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
>retrieving revision 1.42
>diff -u -8 -r1.42 create_instance.c
>--- ldapserver/ldap/admin/src/create_instance.c	7 Feb 2007 23:57:39 -0000	1.42
>+++ ldapserver/ldap/admin/src/create_instance.c	8 Feb 2007 18:02:21 -0000
>@@ -1281,18 +1281,19 @@
>         t = strchr(t, FILE_PATHSEP);
> 
>         if(t) *t = '\0';
>         if(stat(dir, &fi) == -1) {
>             if(create_instance_mkdir(dir, mode) == -1) {
>                 PR_snprintf(errmsg, sizeof(errmsg), "mkdir %s for \"%s\" failed (%s)", dir, str, ds_system_errmsg());
>                 return errmsg;
>             }
>-            if (pw)
>-                chownfile(pw, dir);
>+        }
>+        if (pw) {
>+            chownfile(pw, dir);
>         }
>         if(t)
>         {
>             *t = FILE_PATHSEP;
>             LDAP_UTF8INC(t);
>         }
>         else break;
>     }
>@@ -1732,18 +1733,20 @@
> 
> #define CREATE_BAK2DB() \
>     gen_script_auto(mysroot, mycs_path, "bak2db.pl", cf)
> 
> #define CREATE_VERIFYDB() \
>     gen_script_auto(mysroot, mycs_path, "verify-db.pl", cf)
> 
> /* tentatively moved to mycs_path */
>+#ifdef MOVE_TO_ADMIN_SERVER
> #define CREATE_REPL_MONITOR_CGI() \
>     gen_script_auto(mysroot, mycs_path, "repl-monitor-cgi.pl", cf)
>+#endif
> 
> #define CREATE_ACCOUNT_INACT(_commandName) \
>     gen_script_auto(mysroot, cs_path, _commandName, cf)
> 
> #define CREATE_MIGRATE5TO7() \
>     gen_script_auto(mysroot, mycs_path, "migrate5to7", cf)
> 
> #define CREATE_MIGRATE6TO7() \
>@@ -1892,18 +1895,20 @@
>     if(t) return t;
> 
>     t = CREATE_BAK2DB();
>     if(t) return t;
> 
>     t = CREATE_VERIFYDB();
>     if(t) return t;
> 
>+#ifdef MOVE_TO_ADMIN_SERVER
>     t = CREATE_REPL_MONITOR_CGI();
>     if(t) return t;
>+#endif
> 
>     t = CREATE_ACCOUNT_INACT("ns-inactivate.pl");
>     if(t) return t;
> 
>     t = CREATE_ACCOUNT_INACT("ns-activate.pl");
>     if(t) return t;
> 
>     t = CREATE_ACCOUNT_INACT("ns-accountstatus.pl");
>@@ -2405,18 +2410,20 @@
>     if(t) return t;
> 
>     t = CREATE_BAK2DB();
>     if(t) return t;
> 
>     t = CREATE_VERIFYDB();
>     if(t) return t;
> 
>+#ifdef MOVE_TO_ADMIN_SERVER
>     t = CREATE_REPL_MONITOR_CGI();
>     if(t) return t;
>+#endif
> 
>     t = gen_script(cs_path, "suffix2instance.bat",
>            "@if not \"%%echo%%\" == \"on\" echo off\n\n"
>            "setlocal\n"
>            "set rc=0\n"
>            "PATH=\"%s\";%%PATH%%\n\n"
>            "if [%%2] == [] goto err\n\n"
>            "set arg=\n\n"
>@@ -4474,31 +4481,31 @@
>         cf->inst_dir = PR_smprintf("%s%c%s-%s",
>                             cf->sroot, FILE_PATHSEP, PRODUCT_NAME, cf->servid);
>     } else {
>         cf->inst_dir = PL_strdup(temp);
>     }
> 
>     temp = ds_a_get_cgi_var("config_dir", NULL, NULL);
>     if (NULL == temp) {
>-        cf->config_dir = PR_smprintf("%s%clib%c%s%c%s-%s",
>-                            cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
>+        cf->config_dir = PR_smprintf("%s%c%s%c%s-%s",
>+                            cf->sysconfdir, FILE_PATHSEP,
>                             cf->brand_ds, FILE_PATHSEP,
>                             PRODUCT_NAME, cf->servid);
>     } else {
>         cf->config_dir = PL_strdup(temp);
>     }
>     /* set config dir to the environment variable DS_CONFIG_DIR */
>     ds_set_config_dir(cf->config_dir);
> 
>     cf->schema_dir = ds_a_get_cgi_var("schema_dir", NULL, NULL);
>     temp = ds_a_get_cgi_var("schema_dir", NULL, NULL);
>     if (NULL == temp) {
>-        cf->schema_dir = PR_smprintf("%s%clib%c%s%c%s-%s%cschema",
>-                            cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
>+        cf->schema_dir = PR_smprintf("%s%c%s%c%s-%s%cschema",
>+                            cf->sysconfdir, FILE_PATHSEP,
>                             cf->brand_ds, FILE_PATHSEP,
>                             PRODUCT_NAME, cf->servid, FILE_PATHSEP);
>     } else {
>         cf->schema_dir = PL_strdup(temp);
>     }
> 
>     temp = ds_a_get_cgi_var("lock_dir", NULL, NULL);
>     if (NULL == temp) {

Actions: View | Diff

Attachments on bug 227771: 147682 | 147685 | 147690 | 147916 | 147933