Author: rmeggins
Update of /cvs/dirsec/setuputil/installer/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv592/setuputil/installer/include
Modified Files:
global.h nsutils.h setupapi.h setupdefs.h
Log Message:
Resolves: bug 239494
Description: setuputil: use adm.conf instead of dbswitch.conf, ldap.conf, etc.
Fix Description: We only really need one config file - adm.conf - so just add extra fields
as necessary.
Reviewed by: nhosoi (Thanks!)
Index: global.h
===================================================================
RCS file: /cvs/dirsec/setuputil/installer/include/global.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- global.h 29 Jul 2005 22:16:28 -0000 1.1.1.1
+++ global.h 9 May 2007 00:27:47 -0000 1.2
@@ -28,6 +28,12 @@
** HISTORY
**
** $Log$
+** Revision 1.2 2007/05/09 00:27:47 rmeggins
+** Resolves: bug 239494
+** Description: setuputil: use adm.conf instead of dbswitch.conf, ldap.conf, etc.
+** Fix Description: We only really need one config file - adm.conf - so just add extra
fields as necessary.
+** Reviewed by: nhosoi (Thanks!)
+**
** Revision 1.1.1.1 2005/07/29 22:16:28 foxworth
** Importing new setup sdk for open source project
**
@@ -261,11 +267,9 @@
***********************************************************************
*/
#ifndef XP_WIN32
-extern const char *DEFAULT_LDAPSWITCH; /* dbswitch.conf */
extern const char *DEFAULT_ADMINUSER; /* Local Admin */
extern const char *DEFAULT_ADMINPWD; /* Local Admin Password */
-extern const char *DEFAULT_SSUSERCONF; /* ssusers.conf */
-extern const char *DEFAULT_ADMINCONF; /* ns-admin.conf */
+extern const char *DEFAULT_ADMINCONF; /* adm.conf */
extern const char *DEFAULT_SSUSER; /* nobody */
extern const char *DEFAULT_SSGROUP; /* nobody */
extern const char *DEFAULT_SROOT; /* /usr/netscape/suitespot4 */
Index: nsutils.h
===================================================================
RCS file: /cvs/dirsec/setuputil/installer/include/nsutils.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- nsutils.h 29 Jul 2005 22:16:28 -0000 1.1.1.1
+++ nsutils.h 9 May 2007 00:27:47 -0000 1.2
@@ -29,6 +29,12 @@
**
** HISTORY
** $Log$
+** Revision 1.2 2007/05/09 00:27:47 rmeggins
+** Resolves: bug 239494
+** Description: setuputil: use adm.conf instead of dbswitch.conf, ldap.conf, etc.
+** Fix Description: We only really need one config file - adm.conf - so just add extra
fields as necessary.
+** Reviewed by: nhosoi (Thanks!)
+**
** Revision 1.1.1.1 2005/07/29 22:16:28 foxworth
** Importing new setup sdk for open source project
**
@@ -76,7 +82,7 @@
NSAPI_EXTERN char * formAdminDomainDN(const char *domain);
NSAPI_EXTERN char * stripAdminDomainDN(const char *domainDN);
-NSAPI_EXTERN void getDefaultLdapInfo (const char *sroot,char **ldapURL,char
**ldapUser,char **adminDomain);
+NSAPI_EXTERN void getDefaultLdapInfo (const char *configdir,char **ldapURL,char
**ldapUser,char **adminDomain);
NSAPI_EXTERN char *formConfigLdapURL(const char *ldapURL);
NSAPI_EXTERN char * stripConfigLdapURL(const char *configURL);
NSAPI_EXTERN int IsValidLdapServer(const char* pszHost, int nPort, const char*
pszSuffix,
Index: setupapi.h
===================================================================
RCS file: /cvs/dirsec/setuputil/installer/include/setupapi.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- setupapi.h 29 Jul 2005 22:16:28 -0000 1.1.1.1
+++ setupapi.h 9 May 2007 00:27:47 -0000 1.2
@@ -29,6 +29,12 @@
**
** HISTORY
** $Log$
+** Revision 1.2 2007/05/09 00:27:47 rmeggins
+** Resolves: bug 239494
+** Description: setuputil: use adm.conf instead of dbswitch.conf, ldap.conf, etc.
+** Fix Description: We only really need one config file - adm.conf - so just add extra
fields as necessary.
+** Reviewed by: nhosoi (Thanks!)
+**
** Revision 1.1.1.1 2005/07/29 22:16:28 foxworth
** Importing new setup sdk for open source project
**
@@ -148,7 +154,7 @@
/* Memory allocation and free */
NSAPI_EXTERN void * setupMalloc(unsigned int size);
-NSAPI_EXTERN char * setupStrdup(char *src);
+NSAPI_EXTERN char * setupStrdup(const char *src);
NSAPI_EXTERN void setupFree(char *src);
/* Directory server access */
@@ -234,7 +240,6 @@
NSAPI_EXTERN void setupGetGmtime(char *buf, int buflen);
NSAPI_EXTERN unsigned long setupGetDiskFreeSpace(const char *path);
-NSAPI_EXTERN int setupFileUpdateLines(char *oldLines[], char *newLines[], char
*filename);
#ifdef __cplusplus
Index: setupdefs.h
===================================================================
RCS file: /cvs/dirsec/setuputil/installer/include/setupdefs.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- setupdefs.h 27 Mar 2006 21:18:34 -0000 1.3
+++ setupdefs.h 9 May 2007 00:27:47 -0000 1.4
@@ -24,6 +24,12 @@
** Platforms: UNIX and WIN32 **
** Revision History: **
** $Log$
+** Revision 1.4 2007/05/09 00:27:47 rmeggins
+** Resolves: bug 239494
+** Description: setuputil: use adm.conf instead of dbswitch.conf, ldap.conf, etc.
+** Fix Description: We only really need one config file - adm.conf - so just add extra
fields as necessary.
+** Reviewed by: nhosoi (Thanks!)
+**
** Revision 1.3 2006/03/27 21:18:34 nhosoi
** [186642] Directory Server Makefile updates for Internal build
** Changed the createSIE so that caller (Admin Server and Directory Server) passes
@@ -181,11 +187,7 @@
#define SETUP_WIZBACK 1
#define SETUP_WIZNEXT 2
/* Setup common files */
-#define SETUP_DEFAULT_LDAPSWITCH "shared/config/dbswitch.conf"
-#define SETUP_DS_CONF "shared/config/ds.conf"
-#define SETUP_ADM_CONF "admin-serv/config/adm.conf"
-#define SETUP_LDAP_CONF "shared/config/ldap.conf"
-#define SETUP_LDAP_INFO "ldap.info"
+#define SETUP_ADM_CONF "adm.conf"
/* Setup sie define */
#define SETUP_ADMIN_DOMAIN "ou=%s, o=NetscapeRoot"
#define SETUP_DEFAULT_ROOT "NetscapeRoot"