Attachment 158876 Details for Bug 247215 – cvs diff (ldapserver)

[patch] cvs diff (ldapserver)

ds.diffs (text/plain), 3.22 KB, created by Noriko Hosoi on 2007-07-10 18:29:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2007-07-10 18:29:03 UTC

Size: 3.22 KB

patch

obsolete

>Index: admin/src/create_instance.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
>retrieving revision 1.62
>diff -t -w -U4 -r1.62 create_instance.c
>--- admin/src/create_instance.c	29 Jun 2007 21:12:22 -0000	1.62
>+++ admin/src/create_instance.c	10 Jul 2007 18:13:33 -0000
>@@ -2686,8 +2686,9 @@
>     fprintf(f, "nsslapd-lockdir: %s\n", cf->lock_dir);
>     fprintf(f, "nsslapd-tmpdir: %s\n", cf->tmp_dir);
>     fprintf(f, "nsslapd-certdir: %s\n", cf->cert_dir);
>     fprintf(f, "nsslapd-ldifdir: %s\n", cf->ldif_dir);
>+    fprintf(f, "nsslapd-instancedir: %s\n", cf->inst_dir);
>     fprintf(f, "nsslapd-bakdir: %s\n", cf->bak_dir);
> /* We use the system SASL by default on Linux, so we don't need to set sasl path */
>     if (NULL != cf->sasl_path) {
>         fprintf(f, "nsslapd-saslpath: %s\n", cf->sasl_path);
>Index: servers/slapd/libglobs.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/libglobs.c,v
>retrieving revision 1.17
>diff -t -w -U4 -r1.17 libglobs.c
>--- servers/slapd/libglobs.c	22 Jun 2007 21:54:58 -0000	1.17
>+++ servers/slapd/libglobs.c	10 Jul 2007 18:13:33 -0000
>@@ -541,8 +541,12 @@
>         {CONFIG_CONFIG_ATTRIBUTE, 0, NULL, 0, (void**)SLAPD_CONFIG_DN,
>                 CONFIG_CONSTANT_STRING, NULL},
>         {CONFIG_HASH_FILTERS_ATTRIBUTE, config_set_hash_filters,
>                 NULL, 0, NULL, CONFIG_ON_OFF, (ConfigGetFunc)config_get_hash_filters},
>+        /* instance dir; used by admin tasks */
>+        {CONFIG_INSTDIR_ATTRIBUTE, NULL,
>+                NULL, 0,
>+                (void**)&global_slapdFrontendConfig.instancedir, CONFIG_STRING, NULL},
>         /* parameterizing schema dir */
>         {CONFIG_SCHEMADIR_ATTRIBUTE, config_set_schemadir,
>                 NULL, 0,
>                 (void**)&global_slapdFrontendConfig.schemadir, CONFIG_STRING, NULL},
>Index: servers/slapd/slap.h
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slap.h,v
>retrieving revision 1.22
>diff -t -w -U4 -r1.22 slap.h
>--- servers/slapd/slap.h	22 Jun 2007 21:54:58 -0000	1.22
>+++ servers/slapd/slap.h	10 Jul 2007 18:13:33 -0000
>@@ -1723,8 +1723,9 @@
> #define CONFIG_AUDITLOG_LIST_ATTRIBUTE "nsslapd-auditlog-list"
> #define CONFIG_REWRITE_RFC1274_ATTRIBUTE "nsslapd-rewrite-rfc1274"
> 
> #define CONFIG_CONFIG_ATTRIBUTE "nsslapd-config"
>+#define CONFIG_INSTDIR_ATTRIBUTE "nsslapd-instancedir"
> #define CONFIG_SCHEMADIR_ATTRIBUTE "nsslapd-schemadir"
> #define CONFIG_LOCKDIR_ATTRIBUTE "nsslapd-lockdir"
> #define CONFIG_TMPDIR_ATTRIBUTE "nsslapd-tmpdir"
> #define CONFIG_CERTDIR_ATTRIBUTE "nsslapd-certdir"
>@@ -1902,8 +1903,9 @@
> 
>   char *certmap_basedn;     /* Default Base DN for certmap */
> 
>   char *workingdir;     /* full path of directory before detach */
>+  char *instancedir;  /* full path name of directory containing inst files */
>   char *configdir;  /* full path name of directory containing configuration files */
>   char *schemadir;  /* full path name of directory containing schema files */
>   char *lockdir;    /* full path name of directory containing lock files */
>   char *tmpdir;     /* full path name of directory containing tmp files */

Actions: View | Diff

Attachments on bug 247215: 158634 | 158635 | 158676 | 158876 | 158879 | 158913 | 158917 | 158918 | 158919 | 159392 | 159393 | 159487 | 160087