[Fedora-directory-commits] ldapserver/ldap/clients/dsgw dsgwutil.c, 1.7, 1.8

[Doctor Conrad]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/clients/dsgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10493/ldap/clients/dsgw

Modified Files:
	dsgwutil.c 
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro NS_DS (Comment #2, #3)



Index: dsgwutil.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/dsgwutil.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dsgwutil.c	22 May 2006 17:28:36 -0000	1.7
+++ dsgwutil.c	10 Nov 2006 01:05:03 -0000	1.8
@@ -42,11 +42,7 @@
 #include <limits.h> /* PATH_MAX */
 #include "dsgw.h"
 #include "dbtdsgw.h"
-#ifdef NS_DS
 #include "../lib/libsi18n/gsslapd.h"
-#else /* Admin Server */
-#include "../lib/libsi18n/gsadmserv.h"
-#endif
 
 #ifdef DSGW_DEBUG
 #include <time.h>
@@ -96,11 +92,7 @@
 
     /* initialize the string database */
     XP_InitStringDatabase(
-#ifdef NS_DS
 	  SERVER_ROOT_PATH "/bin/slapd/property" /* Directory Server Gateway */
-#else
-	  SERVER_ROOT_PATH "/admin" /* Admin Server */
-#endif
 	  , DATABASE_NAME);
     /* set default default languages for string database */
     SetLanguage(CLIENT_LANGUAGE, "");