[Fedora-directory-commits] ldapserver/ldap/servers/slapd libglobs.c, 1.17, 1.18 proto-slap.h, 1.27, 1.28 slap.h, 1.22, 1.23

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8017/servers/slapd

Modified Files:
	libglobs.c proto-slap.h slap.h 
Log Message:
Resolves: #247215
Summary: Reimplement ds_remove without setuputil code (comment #6)
Description: adding nsslapd-instancedir to dse.ldif for ds_remove to find out
the instance dir path.



Index: libglobs.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/libglobs.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libglobs.c	22 Jun 2007 21:54:58 -0000	1.17
+++ libglobs.c	11 Jul 2007 01:14:05 -0000	1.18
@@ -542,6 +542,9 @@
 		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, config_set_instancedir,
+		NULL, 0, NULL, CONFIG_STRING, NULL},
 	/* parameterizing schema dir */
 	{CONFIG_SCHEMADIR_ATTRIBUTE, config_set_schemadir,
 		NULL, 0,
@@ -4462,6 +4465,13 @@
 	return retVal;
 }
 
+/* W/o the setter, "config_set: the attribute nsslapd-instancedir is read only" is printed out. */
+int
+config_set_instancedir(const char *attrname, char *value, char *errorbuf, int apply)
+{
+	return LDAP_SUCCESS;
+}
+
 char *
 config_get_schemadir()
 {


Index: proto-slap.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/proto-slap.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- proto-slap.h	22 Jun 2007 21:54:58 -0000	1.27
+++ proto-slap.h	11 Jul 2007 01:14:05 -0000	1.28
@@ -316,6 +316,7 @@
 int config_set_enquote_sup_oc(const char *attrname,  char *value, char *errorbuf, int apply );
 int config_set_basedn( const char *attrname, char *value, char *errorbuf, int apply );
 int config_set_configdir( const char *attrname, char *value, char *errorbuf, int apply );
+int config_set_instancedir( const char *attrname, char *value, char *errorbuf, int apply );
 int config_set_schemadir( const char *attrname, char *value, char *errorbuf, int apply );
 int config_set_lockdir( const char *attrname, char *value, char *errorbuf, int apply );
 int config_set_tmpdir( const char *attrname, char *value, char *errorbuf, int apply );


Index: slap.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slap.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- slap.h	22 Jun 2007 21:54:58 -0000	1.22
+++ slap.h	11 Jul 2007 01:14:05 -0000	1.23
@@ -1724,6 +1724,7 @@
 #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"