[Fedora-directory-commits] adminserver/include/libdsa dsalib.h, 1.2, 1.3

[Nathan Kinder (nkinder)]

Author: nkinder

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

Modified Files:
	dsalib.h 
Log Message:
Resolves: 245665
Summary: Removed server root logic from dsalib.



Index: dsalib.h
===================================================================
RCS file: /cvs/dirsec/adminserver/include/libdsa/dsalib.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dsalib.h	25 Jun 2007 23:23:12 -0000	1.2
+++ dsalib.h	26 Jun 2007 18:34:47 -0000	1.3
@@ -178,7 +178,7 @@
  * Other return values
  */
 #define DS_UNKNOWN_ERROR            -1
-#define DS_NO_SERVER_ROOT          -10
+#define DS_NO_INSTANCE_DIR         -10
 #define DS_CANNOT_EXEC             -11
 #define DS_CANNOT_OPEN_STAT_FILE   -12
 #define DS_NULL_PARAMETER          -13
@@ -279,9 +279,8 @@
 #define DS_SUFFIX       	13
 #define DS_LOCALUSER		14
 #define DS_BAKDIR		15
-#define DS_RUNDIR		16
-#define DS_TMPDIR		17
-#define DS_CFG_MAX		18 /* MUST be one greater than the last option */
+#define DS_TMPDIR		16
+#define DS_CFG_MAX		17 /* 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 */
@@ -292,8 +291,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
-extern DS_EXPORT_SYMBOL char *ds_get_server_root();
-extern DS_EXPORT_SYMBOL char *ds_get_install_root();
+extern DS_EXPORT_SYMBOL char *ds_get_instance_dir();
 extern DS_EXPORT_SYMBOL char *ds_get_admserv_based_root();
 extern DS_EXPORT_SYMBOL void ds_log_debug_message(char *msg);
 extern DS_EXPORT_SYMBOL void ds_log_env(char **envp);