[Fedora-directory-commits] ldapserver/ldap/admin/src configure_instance.cpp, 1.8, 1.9 updatedsgw, 1.7, 1.8

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/ldap/admin/src

Modified Files:
	configure_instance.cpp updatedsgw 
Log Message:
Bug(s) fixed: 172005
Bug Description: Change ldapserver version to 1.0
Reviewed by: Noriko (Thanks!)
Fix Description: This also fixes some lingering build issues involving 
perldap, which is no longer a separate setup package, but just gets 
included into DS in a similar manner to nspr, nss, etc.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none



Index: configure_instance.cpp
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/configure_instance.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- configure_instance.cpp	21 Oct 2005 19:21:10 -0000	1.8
+++ configure_instance.cpp	29 Oct 2005 02:26:06 -0000	1.9
@@ -133,7 +133,7 @@
 // name of script file to generate relative to slapd instance directory
 #define SCRIPT_FILE_NAME "start-console"
 
-#define DS_JAR_FILE_NAME "ds71.jar"
+#define DS_JAR_FILE_NAME "ds10.jar"
 #define DS_CONSOLE_CLASS_NAME "com.netscape.admin.dirserv.DSAdmin"
 
 #ifdef XP_WIN32


Index: updatedsgw
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/updatedsgw,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- updatedsgw	21 Oct 2005 19:21:10 -0000	1.7
+++ updatedsgw	29 Oct 2005 02:26:06 -0000	1.8
@@ -50,7 +50,7 @@
     if (!getopts('h:i:d:e:s:t:n:') || !$opt_n || !$opt_h ) {
 	print "usage: " . $0 . " -n nshome -h current_slapd_host:current_slapd_port [options]\n";
 	print "\nrequired:\n";
-	print "    -n directory\tthe directory where 7.1 is installed (NS-HOME)\n";
+	print "    -n directory\tthe directory where 1.0 is installed (NS-HOME)\n";
 	print "    -h host[:port]\tthe current host and port of the directory server\n";
 	print "                  \tto which the gateway connects.\n";
 	print "\noptions:\n";
@@ -59,7 +59,7 @@
 	print "    -t suffix\t\tthe new ESCAPED suffix of the directory server\n";
 	print "    -d dirmgrdn\t\tthe old manager dn of the directory server\n";
 	print "    -e dirmgrdn\t\tthe new manager dn of the directory server\n";
-	print "\nexample:\n " . $0 . "  -n /home/servers/ds71/ -h gargoyle:1974 -i brooklyn -s \"dc=example,dc=com\" -t \"o%3Dredhat.com\" -d \"cn=directory manager\" -e \"cn=directory guru\"\n";
+	print "\nexample:\n " . $0 . "  -n /home/servers/ds10/ -h gargoyle:1974 -i brooklyn -s \"dc=example,dc=com\" -t \"o%3Ddirectory.fedora.redhat.com\" -d \"cn=directory manager\" -e \"cn=directory guru\"\n";
 	
 	exit;
     }