[Fedora-directory-commits] console/src/com/netscape/management/client AboutDialog.java, 1.6, 1.7 Framework.java, 1.2, 1.3 FrameworkInitializer.java, 1.1.1.1, 1.2 default.properties, 1.6, 1.7 defaultLicense.properties, 1.6, 1.7
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1397/src/com/netscape/management/client
Modified Files:
AboutDialog.java Framework.java FrameworkInitializer.java
default.properties defaultLicense.properties
Log Message:
Resolves: 246270
Summary: Remove server root concept from Console.
Index: AboutDialog.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/AboutDialog.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AboutDialog.java 29 Sep 2006 17:17:20 -0000 1.6
+++ AboutDialog.java 29 Jun 2007 20:32:27 -0000 1.7
@@ -165,24 +165,4 @@
super.show();
}
-
-
- //testing program
- /*public static void main(String arg[]) {
-
- JFrame f = new JFrame();
- f.setSize(432,400);
-
- try {
- UIManager.setLookAndFeel("com.netscape.management.nmclf.SuiLookAndFeel");
- } catch (Exception e) {}
-
-
- AboutDialog dialog = new AboutDialog(f, "Fedora Management Console");
- dialog.setProduct(UIManager.getIcon("OptionPane.warningIcon"), "Fedora Management Console\056 Console 1.0.3\nCopyright (C) Red Hat, Inc.", "\n\nThis software is subject to the terms of a license agreement. Please do not use the software unless you agree to all the license terms");
- dialog.addVendor(UIManager.getIcon("OptionPane.informationIcon"), "Contains Phaos SSL encryption software from Phaos Technology Corporation. Copyright © 1998 Phaos Technology Corporation. All Rights Reserved");
- dialog.addVendor(UIManager.getIcon("OptionPane.informationIcon"), "Contains encryption software from RSA Data Security, Inc. Copyright © 1994 RSA Data Security, Inc. All rights reserved.");
-
- dialog.show();
-}*/
}
Index: Framework.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/Framework.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Framework.java 24 Mar 2006 01:04:07 -0000 1.2
+++ Framework.java 29 Jun 2007 20:32:27 -0000 1.3
@@ -82,6 +82,8 @@
public static String _imageSource = "com/netscape/management/client/images/";
public static ResourceSet _resource = new ResourceSet("com.netscape.management.client.default");
+ public static ResourceSet _resource_theme = new
+ ResourceSet("com.netscape.management.client.theme.theme");
public static Help _help = new Help("com.netscape.management.client.default");
protected boolean _isPageInitialized[];
@@ -208,7 +210,8 @@
2, HORIZ_WINDOW_INSET));
_bannerPanel = new JPanel(new BorderLayout());
- _bannerPanel.getAccessibleContext().setAccessibleDescription(i18n("banner","console"));
+ _bannerPanel.getAccessibleContext().setAccessibleDescription(
+ _resource_theme.getString("banner","console"));
_bannerPanel.setBorder(
BorderFactory.createEmptyBorder(0, 0, 0, 0));
Index: FrameworkInitializer.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/FrameworkInitializer.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- FrameworkInitializer.java 18 Jul 2005 00:34:07 -0000 1.1.1.1
+++ FrameworkInitializer.java 29 Jun 2007 20:32:27 -0000 1.2
@@ -261,15 +261,16 @@
new Cursor(Cursor.WAIT_CURSOR));
if (aboutDialog == null) {
ResourceSet aboutDialogResource = new ResourceSet("com.netscape.management.client.defaultLicense");
+ ResourceSet themeResource = new ResourceSet("com.netscape.management.client.theme.theme");
aboutDialog = new AboutDialog(parent,
- aboutDialogResource.getString("defaultAbout",
+ themeResource.getString("defaultAbout",
"dialogTitle"));
aboutDialog.setProduct( new RemoteImage(
- aboutDialogResource.getString("defaultAbout",
+ themeResource.getString("defaultAbout",
"productLogo")),
aboutDialogResource.getString("defaultAbout",
"productCopyright"),
- aboutDialogResource.getString("defaultAbout",
+ themeResource.getString("defaultAbout",
"productLicense"));
StringTokenizer st = new StringTokenizer(
Index: default.properties
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/default.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- default.properties 13 Jun 2007 20:33:08 -0000 1.6
+++ default.properties 29 Jun 2007 20:32:27 -0000 1.7
@@ -123,5 +123,3 @@
fontTab-fontProfile=Font Profile
fontTab-table_tt=Font table of screen elements and corresponding sample font
-#banner-console=Fedora Management Console 1.0.3
-
Index: defaultLicense.properties
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/defaultLicense.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- defaultLicense.properties 13 Jun 2007 20:33:08 -0000 1.6
+++ defaultLicense.properties 29 Jun 2007 20:32:27 -0000 1.7
@@ -17,9 +17,6 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# END COPYRIGHT BLOCK
#
-#defaultAbout-dialogTitle=Fedora Management Console 1.0.3
-#defaultAbout-productLogo=com/netscape/management/client/images/logo32.gif
-defaultAbout-productCopyright=Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.\nCopyright (C) 2005 Red Hat, Inc.\nAll rights reserved.
-#defaultAbout-productLicense=Fedora is a trademark of Red Hat, Inc. in the United States and other countries and is used by permission.
+defaultAbout-productCopyright=Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.\nCopyright (C) 2007 Red Hat, Inc.\nAll rights reserved.
defaultAbout-vendorsList=sun
defaultAbout-vendor-sun-license=Java is a trademark or registered trademark of Sun Microsystems, Inc in the United States and other countries.\n\nJavaScript is a trademark of Sun Microsystems, Inc. used under license for technology invented and implemented by Netscape.
16 years, 9 months
[Fedora-directory-commits] console/src/com/netscape/management/client/theme theme.properties, 1.1, 1.2
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/theme
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1397/src/com/netscape/management/client/theme
Modified Files:
theme.properties
Log Message:
Resolves: 246270
Summary: Remove server root concept from Console.
Index: theme.properties
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/theme/theme.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- theme.properties 13 Jun 2007 20:33:09 -0000 1.1
+++ theme.properties 29 Jun 2007 20:32:28 -0000 1.2
@@ -21,10 +21,10 @@
console-title=Fedora Management Console
console-useragent=Fedora-Management-Console
login-title=Fedora Management Console Login
-banner-console=Fedora Management Console 1.0.3
+banner-console=Fedora Management Console 1.1
-defaultAbout-dialogTitle=Fedora Management Console 1.0.3
-defaultAbout-productLogo=com/netscape/management/client/themed/images/logo32.gif
+defaultAbout-dialogTitle=Fedora Management Console 1.1
+defaultAbout-productLogo=com/netscape/management/client/theme/images/logo32.gif
defaultAbout-productLicense=Fedora is a trademark of Red Hat, Inc. in the United States and other countries and is used by permission.
CertInstallTypePage-defaultServerName=Fedora Server
16 years, 9 months
[Fedora-directory-commits] console/src/com/netscape/management/client/console Console.java, 1.8, 1.9 LoginDialog.java, 1.1.1.1, 1.2 console.properties, 1.6, 1.7
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1397/src/com/netscape/management/client/console
Modified Files:
Console.java LoginDialog.java console.properties
Log Message:
Resolves: 246270
Summary: Remove server root concept from Console.
Index: Console.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/Console.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Console.java 13 Jun 2007 20:33:09 -0000 1.8
+++ Console.java 29 Jun 2007 20:32:28 -0000 1.9
@@ -56,8 +56,8 @@
// preference information
//
public static final String IDENTIFIER = "Console";
- public static final String VERSION = "1.0.3";
- public static final String MAJOR_VERSION = "1.0";
+ public static final String VERSION = "1.1.0";
+ public static final String MAJOR_VERSION = "1.1";
public static final String PREFERENCES_LOGIN =
IDENTIFIER + "." + VERSION + ".Login.preferences";
@@ -85,7 +85,7 @@
public static ConsoleInfo _info;
public static String _consoleAdminURL;
public static ResourceSet _resource = new ResourceSet("com.netscape.management.client.console.console");
- public static ResourceSet _resource_theme = new ResourceSet("com.netscape.management.client.theme.console");
+ public static ResourceSet _resource_theme = new ResourceSet("com.netscape.management.client.theme.theme");
//
// private values
Index: LoginDialog.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/LoginDialog.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- LoginDialog.java 18 Jul 2005 00:34:15 -0000 1.1.1.1
+++ LoginDialog.java 29 Jun 2007 20:32:28 -0000 1.2
@@ -57,7 +57,7 @@
*/
public LoginDialog(Frame parentFrame, String userid, String initialURL, Vector recentURLs) {
this(parentFrame, userid, initialURL, recentURLs,
- Console._resource.getString(_resourcePrefix, "title"),
+ Console._resource_theme.getString(_resourcePrefix, "title"),
"login");
}
Index: console.properties
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/console.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- console.properties 13 Jun 2007 20:33:09 -0000 1.6
+++ console.properties 29 Jun 2007 20:32:28 -0000 1.7
@@ -19,7 +19,7 @@
#
#console-title=Fedora Management Console
#console-useragent=Fedora-Management-Console
-console-displayVersion=1.0.3
+console-displayVersion=1.1
login-username=User ID:
login-password=Password:
16 years, 9 months
[Fedora-directory-commits] console build.properties, 1.10, 1.11 build.xml, 1.13, 1.14 fedora-console.spec, 1.1, 1.2 startconsole, 1.6, 1.7
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1397
Modified Files:
build.properties build.xml fedora-console.spec startconsole
Log Message:
Resolves: 246270
Summary: Remove server root concept from Console.
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/console/build.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.properties 13 Jun 2007 20:33:08 -0000 1.10
+++ build.properties 29 Jun 2007 20:32:26 -0000 1.11
@@ -24,9 +24,9 @@
console.brand=fedora
console.root=.
-console.version=10
-console.dotversion=1.0.3
-console.dotgenversion=1.0
+console.version=11
+console.dotversion=1.1.0
+console.dotgenversion=1.1
mcc.core=${console.brand}-mcc
mcc.name=${mcc.core}-${console.dotversion}
@@ -43,3 +43,6 @@
theme.core=${console.brand}-theme
theme.name=${theme.core}-${console.dotversion}
theme.gen.name=${theme.core}-${console.dotgenversion}
+
+jss.jar.name=jss4.jar
+ldapjdk.jar.name=ldapjdk.jar
Index: build.xml
===================================================================
RCS file: /cvs/dirsec/console/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 13 Jun 2007 20:33:08 -0000 1.13
+++ build.xml 29 Jun 2007 20:32:26 -0000 1.14
@@ -42,17 +42,20 @@
<!-- Create directories -->
<mkdir dir="${built.classdir}"/>
+ <!-- Classdest is the location you intend to install the Console jars -->
+ <property name="classdest" value="/usr/share/java"/>
+
<!-- Override these properties to use components from other system locations -->
<property name="ldapjdk.local.location" value="/usr/share/java"/>
- <property name="jss.local.location" value="/usr/share/java"/>
+ <property name="jss.local.location" value="/usr/lib/java"/>
<property name="jsslib.local.location" value="/usr/lib"/>
<property name="nss.local.location" value="/usr/lib"/>
<property name="nspr.local.location" value="/usr/lib"/>
<!-- Construct classpath -->
<path id="console.classpath">
- <pathelement location="${ldapjdk.local.location}/ldapjdk.jar"/>
- <pathelement location="${jss.local.location}/jss3.jar"/>
+ <pathelement location="${ldapjdk.local.location}/${ldapjdk.jar.name}"/>
+ <pathelement location="${jss.local.location}/${jss.jar.name}"/>
</path>
<!-- Generate version property file -->
@@ -124,7 +127,7 @@
<mkdir dir="${imports.dir}/jss"/>
<get src="${jss.jar.location}/${jss.jar.import}"
dest="${imports.dir}/jss/${jss.jar.import}"/>
- <copy file="${imports.dir}/jss/${jss.jar.import}" tofile="${imports.dir}/jss/jss3.jar"/>
+ <copy file="${imports.dir}/jss/${jss.jar.import}" tofile="${imports.dir}/jss/${jss.jar.name}"/>
</target>
<target name="import_jss_lib" depends="prepare_imports" if="imports.file" unless="jss.lib.import.exists">
@@ -151,19 +154,19 @@
<!-- Build -->
<target name="build" depends="prepare_build, import_ldapjdk, import_jss_jar">
<!-- Verify that the required jars exist -->
- <fail message="LDAP JDK (ldapjdk.jar) does not exist in ${ldapjdk.local.location}">
+ <fail message="LDAP JDK (${ldapjdk.jar.name}) does not exist in ${ldapjdk.local.location}">
Please set the correct location with -Dldapjdk.local.location=[path]
<condition>
<not>
- <available file="${ldapjdk.local.location}/ldapjdk.jar"/>
+ <available file="${ldapjdk.local.location}/${ldapjdk.jar.name}"/>
</not>
</condition>
</fail>
- <fail message="JSS (jss3.jar) does not exist in ${jss.local.location}">
+ <fail message="JSS (${jss.jar.name}) does not exist in ${jss.local.location}">
Please set the correct location with -Djss.local.location=[path]
<condition>
<not>
- <available file="${jss.local.location}/jss3.jar"/>
+ <available file="${jss.local.location}/${jss.jar.name}"/>
</not>
</condition>
</fail>
@@ -180,6 +183,21 @@
excludes="**/CVS/**">
<classpath refid="console.classpath" />
</javac>
+
+ <!-- create startconsole script -->
+ <copy file="startconsole" todir="${release.dir}"/>
+ <replace file="${release.dir}/startconsole">
+ <replacefilter token="@classdest@" value="${classdest}"/>
+ <replacefilter token="@jssjar@" value="${jss.local.location}/${jss.jar.name}"/>
+ <replacefilter token="@ldapjdkjar@" value="${ldapjdk.local.location}/${ldapjdk.jar.name}"/>
+ <replacefilter token="@basejar@" value="${base.name}.jar"/>
+ <replacefilter token="@mccjar@" value="${mcc.name}.jar"/>
+ <replacefilter token="@mcclangjar@" value="${mcc.name}_${lang}.jar"/>
+ <replacefilter token="@nmclfjar@" value="${nmclf.name}.jar"/>
+ <replacefilter token="@nmclflangjar@" value="${nmclf.name}_${lang}.jar"/>
+ <replacefilter token="@themejar@" value="${theme.name}_${lang}.jar"/>
+ <replacefilter token="@libdir@" value="${lib.dir}"/>
+ </replace>
</target>
<!-- Package -->
@@ -286,8 +304,8 @@
</exec>
<!-- Copy components into packaging area -->
- <copy file="${ldapjdk.local.location}/ldapjdk.jar" todir="${java.dir}"/>
- <copy file="${jss.local.location}/jss3.jar" todir="${java.dir}"/>
+ <copy file="${ldapjdk.local.location}/${ldapjdk.jar.name}" todir="${java.dir}"/>
+ <copy file="${jss.local.location}/${jss.jar.name}" todir="${java.dir}"/>
<copy todir="${lib.dir}">
<fileset dir="${jsslib.local.location}">
<include name="libjss*"/>
Index: fedora-console.spec
===================================================================
RCS file: /cvs/dirsec/console/fedora-console.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-console.spec 29 Nov 2005 18:36:50 -0000 1.1
+++ fedora-console.spec 29 Jun 2007 20:32:26 -0000 1.2
@@ -1,5 +1,8 @@
+%define major_version 1.1
+%define minor_version 0
+
Name: fedora-console
-Version: 1.0
+Version: %{major_version}.%{minor_version}
Release: 1
Group: Applications
Vendor: Fedora Project
@@ -8,11 +11,12 @@
Packager: Red Hat, Inc. <http://bugzilla.redhat.com/bugzilla>
Summary: Fedora Management Console
BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildArch: noarch
Source: %{name}-%{version}.tar.gz
Autoreq: 0
AutoReqProv: no
-Requires: ldapjdk >= 4.17, jss >= 3.6
-BuildPreReq: ldapjdk >= 4.17, jss >= 3.6
+Requires: fedora-console-framework >= %{version}
+BuildPreReq: ant >= 1.6.2, ldapjdk >= 4.18, jss >= 4.2
%description
A Java based remote management console used for Managing Fedora
@@ -21,47 +25,77 @@
# prep and setup expect there to be a Source file
# in the /usr/src/redhat/SOURCES directory - it will be unpacked
# in the _builddir (not BuildRoot)
+
+%package framework
+Summary: Fedora Management Console Framework
+Requires: ldapjdk >= 4.18, jss >= 4.2
+Group: System Environment/Libraries
+
+%description framework
+A Java Management Console framework used for remote server management.
+
%prep
%setup -q
%build
cd console
-ant
+ant -Dlib.dir=%{_libdir}
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/usr/share/java
install -m777 built/release/jars/fedora-* $RPM_BUILD_ROOT/usr/share/java
install -d $RPM_BUILD_ROOT/usr/bin
-install -m777 console/startconsole $RPM_BUILD_ROOT/usr/bin
+install -m777 built/release/startconsole $RPM_BUILD_ROOT/usr/bin
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
+/usr/share/java/fedora-theme-%{version}_en.jar
+/usr/bin/startconsole
+
+%files framework
+%defattr(-,root,root)
/usr/share/java/fedora-base-%{version}.jar
/usr/share/java/fedora-mcc-%{version}.jar
/usr/share/java/fedora-mcc-%{version}_en.jar
/usr/share/java/fedora-nmclf-%{version}.jar
/usr/share/java/fedora-nmclf-%{version}_en.jar
-/usr/bin/startconsole
%post
cd /usr/share/java
+ln -s fedora-base-%{version}.jar fedora-base-%{major_version}.jar
ln -s fedora-base-%{version}.jar fedora-base.jar
+ln -s fedora-mcc-%{version}.jar fedora-mcc-%{major_version}.jar
ln -s fedora-mcc-%{version}.jar fedora-mcc.jar
+ln -s fedora-mcc-%{version}_en.jar fedora-mcc-%{major_version}_en.jar
ln -s fedora-mcc-%{version}_en.jar fedora-mcc_en.jar
+ln -s fedora-nmclf-%{version}.jar fedora-nmclf-%{major_version}.jar
ln -s fedora-nmclf-%{version}.jar fedora-nmclf.jar
+ln -s fedora-nmclf-%{version}_en.jar fedora-nmclf-%{major_version}_en.jar
ln -s fedora-nmclf-%{version}_en.jar fedora-nmclf_en.jar
+ln -s fedora-theme-%{version}_en.jar fedora-theme-%{major_version}_en.jar
+ln -s fedora-theme-%{version}_en.jar fedora-theme_en.jar
%preun
+rm -rf /usr/share/java/fedora-base-%{major_version}.jar
rm -rf /usr/share/java/fedora-base.jar
+rm -rf /usr/share/java/fedora-mcc-%{major_version}.jar
rm -rf /usr/share/java/fedora-mcc.jar
+rm -rf /usr/share/java/fedora-mcc-%{major_version}_en.jar
rm -rf /usr/share/java/fedora-mcc_en.jar
+rm -rf /usr/share/java/fedora-nmclf-%{major_version}.jar
rm -rf /usr/share/java/fedora-nmclf.jar
+rm -rf /usr/share/java/fedora-nmclf-%{major_version}_en.jar
rm -rf /usr/share/java/fedora-nmclf_en.jar
+rm -rf /usr/share/java/fedora-theme-%{major_version}_en.jar
+rm -rf /usr/share/java/fedora-theme_en.jar
%changelog
+* Fri Jun 29 2007 Nathan Kinder <nkinder(a)redhat.com 1.1.0-1
+- Updated for 1.1.0 release
+
* Mon Nov 14 2005 Nathan Kinder <nkinder(a)redhat.com> 1.0-1
- Initial creation
Index: startconsole
===================================================================
RCS file: /cvs/dirsec/console/startconsole,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- startconsole 13 Jun 2007 20:33:08 -0000 1.6
+++ startconsole 29 Jun 2007 20:32:26 -0000 1.7
@@ -26,8 +26,9 @@
exit 1
fi
-THEME_JAR=/usr/share/java/fedora-theme-1.0.3_en.jar
+CLASSDEST=@classdest@
+
#
# Launch the Console
#
-java -ms8m -mx64m -cp /usr/share/java/jss3.jar:/usr/share/java/ldapjdk.jar:/usr/share/java/fedora-base-1.0.3.jar:/usr/share/java/fedora-mcc-1.0.3.jar:/usr/share/java/fedora-mcc-1.0.3_en.jar:/usr/share/java/fedora-nmclf-1.0.3.jar:/usr/share/java/fedora-nmclf-1.0.3_en.jar:$THEME_JAR -Djava.library.path=/usr/lib -Djava.util.prefs.systemRoot="$HOME/.fedora-console" -Djava.util.prefs.userRoot="$HOME/.fedora-console" com.netscape.management.client.console.Console $*
+java -ms8m -mx64m -cp @jssjar@:@ldapjdkjar@:$CLASSDEST/@basejar@:$CLASSDEST/@mccjar@:$CLASSDEST/@mcclangjar@:$CLASSDEST/@nmclfjar@:$CLASSDEST/@nmclflangjar@:$CLASSDEST/@themejar@ -Djava.library.path=@libdir@ -Djava.util.prefs.systemRoot="$HOME/.fedora-console" -Djava.util.prefs.userRoot="$HOME/.fedora-console" com.netscape.management.client.console.Console $*
16 years, 9 months
[Fedora-directory-commits] coolkey Makefile.am,1.5,1.6
by Doctor Conrad
Author: rrelyea
Update of /cvs/dirsec/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20657
Modified Files:
Makefile.am
Log Message:
Correct spelling error. so dist will work.
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/coolkey/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.am 16 Feb 2007 23:04:50 -0000 1.5
+++ Makefile.am 28 Jun 2007 20:54:21 -0000 1.6
@@ -27,7 +27,7 @@
ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = cookey.spec LICENSE
+EXTRA_DIST = coolkey.spec LICENSE
DISTCLEANFILES =
16 years, 9 months
[Fedora-directory-commits] adminutil/lib/libadmsslutil srvutilssl.c, 1.5, 1.6
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/adminutil/lib/libadmsslutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20389/lib/libadmsslutil
Modified Files:
srvutilssl.c
Log Message:
Resolves: 246124
Summary: Made findSIEDNByIDSSL() use the credentials from the password pipe.
Index: srvutilssl.c
===================================================================
RCS file: /cvs/dirsec/adminutil/lib/libadmsslutil/srvutilssl.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- srvutilssl.c 8 May 2007 19:13:26 -0000 1.5
+++ srvutilssl.c 28 Jun 2007 20:47:56 -0000 1.6
@@ -151,8 +151,28 @@
findSIEDNByIDSSL(AdmldapInfo info, const char *serverID)
{
char *retval = NULL;
+ char *siedn = NULL;
+ char *userdn = NULL;
+ char *passwd = NULL;
+ int rval = 0;
+
+ siedn = admldapGetSIEDN(info);
+ ADM_GetUserDNString(&rval, &userdn);
+ ADM_GetCurrentPassword(&rval, &passwd);
+
+ /* HACK HACK HACK */
+ /* getServerDNListSSL uses the siedn as the binddn - so we temporarily
+ replace the siedn with the userdn - fortunately it doesn't use the
+ siedn as the SIE DN */
+ admldapSetSIEDN(info, userdn);
+ admSetCachedSIEPWD(passwd);
+
AttrNameList nl = getServerDNListSSL(info);
+ /* HACK HACK HACK - reset after getServerDNListSSL */
+ admldapSetSIEDN(info, siedn);
+ PL_strfree(siedn);
+
if (nl) {
size_t len = strlen(serverID);
AttrNameList nlptr = nl;
16 years, 9 months
[Fedora-directory-commits] adminserver/admserv/schema/ldif 15dspta.ldif.tmpl.in, NONE, 1.1
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/schema/ldif
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16857
Added Files:
15dspta.ldif.tmpl.in
Log Message:
Resolves: #244749
Summary: Configure Pass Thru Auth (comment #27)
Adding "cn=pass through authentication" to the subordinative DS instances
(createSubDS in AdminUtil.pm) as well as the calling point to setup-ds-admin.pl.in in case the new server is non-configuration DS.
--- NEW FILE 15dspta.ldif.tmpl.in ---
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# END COPYRIGHT BLOCK
dn: cn=Pass Through Authentication,cn=plugins,cn=config
objectClass: top
objectClass: nsSlapdPlugin
objectClass: extensibleObject
cn: Pass Through Authentication
nsslapd-pluginPath: @dslibdir(a)/plugins/libpassthru-plugin.so
nsslapd-pluginInitfunc: passthruauth_init
nsslapd-pluginType: preoperation
nsslapd-pluginEnabled: on
nsslapd-pluginarg0: %config_ds_url%/o%3DNetscapeRoot
nsslapd-plugin-depends-on-type: database
nsslapd-pluginId: passthruauth
nsslapd-pluginVersion: %ds_version%
nsslapd-pluginVendor: %vendor%
nsslapd-pluginDescription: pass through authentication plugin
16 years, 9 months
[Fedora-directory-commits] adminserver/admserv/cgi-src40 security.c, 1.10, 1.11
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12471
Modified Files:
security.c
Log Message:
Summary: Fixed an annoying typo in a comment.
Index: security.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/security.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- security.c 11 May 2007 19:44:05 -0000 1.10
+++ security.c 28 Jun 2007 18:07:01 -0000 1.11
@@ -518,7 +518,7 @@
flags = 0;
}
- /* determain what type of certificate this is */
+ /* determine what type of certificate this is */
if (flags & CERTDB_INVISIBLE_CA) {
/* since it is invisible, should not allow user to see it. */
goto looser;
16 years, 9 months