[Fedora-directory-commits] adminserver/include/libdsa dsalib.h, 1.4, 1.5

[Nathan Kinder (nkinder)]

Author: nkinder

Update of /cvs/dirsec/adminserver/include/libdsa
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17962/include/libdsa

Modified Files:
	dsalib.h 
Log Message:
Resolves: 258341
Summary: Fix rundir and instancedir location functions in dsalib.



Index: dsalib.h
===================================================================
RCS file: /cvs/dirsec/adminserver/include/libdsa/dsalib.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dsalib.h	24 Jul 2007 20:10:18 -0000	1.4
+++ dsalib.h	31 Aug 2007 17:01:38 -0000	1.5
@@ -260,7 +260,8 @@
 #define DS_LOCALUSER		14
 #define DS_BAKDIR		15
 #define DS_TMPDIR		16
-#define DS_CFG_MAX		17 /* MUST be one greater than the last option */
+#define DS_INSTDIR		17
+#define DS_CFG_MAX		18 /* MUST be one greater than the last option */
 
 /* These control how long we wait for the server to start up or shutdown */
 #define SERVER_START_TIMEOUT 600 /* seconds */
@@ -446,11 +447,6 @@
 
 extern DS_EXPORT_SYMBOL int ds_exec_and_report(char *cmd);
 
-/* remove a directory hierarchy - if the error function is given, it will be called upon
-   error (e.g. directory not readable, cannot remove file, etc.) - if the callback function
-   returns 0, this means to abort the removal, otherwise, continue
-*/
-extern DS_EXPORT_SYMBOL int ds_rm_rf(const char *dir, DS_RM_RF_ERR_FUNC ds_rm_rf_err_func, void *arg);
 /*
   remove a registry key and report an error message if unsuccessful
 */