[Fedora-directory-commits] console/src/com/netscape/management/client/theme theme.properties, 1.3, 1.4
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-serv27292/src/com/netscape/management/client/theme
Modified Files:
theme.properties
Log Message:
Resolves: 249777
Summary: Moved preference dir name into theme. Did some cleanup to the specfile around post and preun steps. Renamed start script.
Index: theme.properties
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/theme/theme.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- theme.properties 2 Jul 2007 18:49:25 -0000 1.3
+++ theme.properties 26 Jul 2007 23:08:49 -0000 1.4
@@ -20,6 +20,7 @@
console-title=Fedora Management Console
console-useragent=Fedora-Management-Console
+console-prefsdir=.fedora-console
login-title=Fedora Management Console Login
banner-console=Fedora Management Console
16 years, 8 months
[Fedora-directory-commits] console/src/com/netscape/management/client/console Console.java, 1.10, 1.11
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-serv27292/src/com/netscape/management/client/console
Modified Files:
Console.java
Log Message:
Resolves: 249777
Summary: Moved preference dir name into theme. Did some cleanup to the specfile around post and preun steps. Renamed start script.
Index: Console.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/Console.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Console.java 2 Jul 2007 18:49:24 -0000 1.10
+++ Console.java 26 Jul 2007 23:08:48 -0000 1.11
@@ -53,6 +53,15 @@
static long _t0 = System.currentTimeMillis();
//
+ // global values
+ //
+ public static Preferences _preferences;
+ 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.theme");
+
+ //
// preference information
//
public static final String IDENTIFIER = "Console";
@@ -70,22 +79,13 @@
public static final String PREFERENCE_Y = "Y";
public static final String PREFERENCE_DIR = System.getProperty("user.home") + File.separator +
- ".fedora-console" + File.separator;
+ _resource_theme.getString("console","prefsdir") + File.separator;
public static final String OPTION_NOWINPOS = "nowinpos";
public static final String OPTION_NOLOGO = "nologo";
public static final String OPTION_JAVALAF = "javalaf";
- public static final int MAX_RECENT_URLS = 5;
-
- //
- // global values
- //
- public static Preferences _preferences;
- 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.theme");
+ public static final int MAX_RECENT_URLS = 5;
//
// private values
16 years, 8 months
[Fedora-directory-commits] console fedora-console, NONE, 1.1 build.properties, 1.11, 1.12 build.xml, 1.14, 1.15 fedora-console.spec, 1.2, 1.3 startconsole, 1.7, NONE
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27292
Modified Files:
build.properties build.xml fedora-console.spec
Added Files:
fedora-console
Removed Files:
startconsole
Log Message:
Resolves: 249777
Summary: Moved preference dir name into theme. Did some cleanup to the specfile around post and preun steps. Renamed start script.
--- NEW FILE fedora-console ---
#!/bin/sh
#
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation version
# 2.1 of the License.
#
# This library 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
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# END COPYRIGHT BLOCK
JAVA=`which java`
if [ -z "$JAVA" -o ! -x "$JAVA" ]
then
echo "$0: The java program is not in your path, or is not executable.";
exit 1
fi
CLASSDEST=@classdest@
#
# Launch the 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/.@prefsdir@" -Djava.util.prefs.userRoot="$HOME/.@prefsdir@" com.netscape.management.client.console.Console $*
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/console/build.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.properties 29 Jun 2007 20:32:26 -0000 1.11
+++ build.properties 26 Jul 2007 23:08:46 -0000 1.12
@@ -40,7 +40,7 @@
base.name=${base.core}-${console.dotversion}
base.gen.name=${base.core}-${console.dotgenversion}
-theme.core=${console.brand}-theme
+theme.core=${console.brand}-console
theme.name=${theme.core}-${console.dotversion}
theme.gen.name=${theme.core}-${console.dotgenversion}
Index: build.xml
===================================================================
RCS file: /cvs/dirsec/console/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 29 Jun 2007 20:32:26 -0000 1.14
+++ build.xml 26 Jul 2007 23:08:46 -0000 1.15
@@ -184,9 +184,9 @@
<classpath refid="console.classpath" />
</javac>
- <!-- create startconsole script -->
- <copy file="startconsole" todir="${release.dir}"/>
- <replace file="${release.dir}/startconsole">
+ <!-- create fedora-console script -->
+ <copy file="fedora-console" todir="${release.dir}"/>
+ <replace file="${release.dir}/fedora-console">
<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}"/>
@@ -196,6 +196,7 @@
<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="@prefsdir@" value="${theme.core}"/>
<replacefilter token="@libdir@" value="${lib.dir}"/>
</replace>
</target>
Index: fedora-console.spec
===================================================================
RCS file: /cvs/dirsec/console/fedora-console.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-console.spec 29 Jun 2007 20:32:26 -0000 1.2
+++ fedora-console.spec 26 Jul 2007 23:08:46 -0000 1.3
@@ -3,7 +3,7 @@
Name: fedora-console
Version: %{major_version}.%{minor_version}
-Release: 1
+Release: 2
Group: Applications
Vendor: Fedora Project
URL: http://directory.fedora.redhat.com
@@ -46,15 +46,15 @@
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 built/release/startconsole $RPM_BUILD_ROOT/usr/bin
+install -m777 built/release/%{name} $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
+/usr/share/java/%{name}-%{version}_en.jar
+/usr/bin/%{name}
%files framework
%defattr(-,root,root)
@@ -63,9 +63,14 @@
/usr/share/java/fedora-mcc-%{version}_en.jar
/usr/share/java/fedora-nmclf-%{version}.jar
/usr/share/java/fedora-nmclf-%{version}_en.jar
-
+
%post
cd /usr/share/java
+ln -s %{name}-%{version}_en.jar %{name}-%{major_version}_en.jar
+ln -s %{name}-%{version}_en.jar %{name}_en.jar
+
+%post framework
+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
@@ -76,10 +81,12 @@
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/%{name}-%{major_version}_en.jar
+rm -rf /usr/share/java/%{name}_en.jar
+
+%preun framework
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
@@ -90,11 +97,13 @@
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
+* Thu Jul 26 2007 Nathan Kinder <nkinder(a)redhat.com> 1.1.0-2
+- Updated start script and theme jar names. Fixed post and
+ preun steps for framework subpackage.
+
+* 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
--- startconsole DELETED ---
16 years, 8 months
[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts DSCreate.pm.in, 1.2, 1.3
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22130
Modified Files:
DSCreate.pm.in
Log Message:
Resolves: #249722
Summary: restart-slapd has an unreplaced token {{INST-DIR}}
Description: hash key, value: INST-DIR => $inf->{slapd}->{inst_dir} is added
Index: DSCreate.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSCreate.pm.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DSCreate.pm.in 13 Jul 2007 19:51:48 -0000 1.2
+++ DSCreate.pm.in 26 Jul 2007 20:40:11 -0000 1.3
@@ -216,6 +216,7 @@
"BAK-DIR" => $inf->{slapd}->{bak_dir},
"SERVER-DIR" => $inf->{General}->{ServerRoot},
"CONFIG-DIR" => $inf->{slapd}->{config_dir},
+ "INST-DIR" => $inf->{slapd}->{inst_dir},
"RUN-DIR" => $inf->{slapd}->{run_dir},
"PRODUCT-NAME" => "slapd",
"SERVERBIN-DIR" => $inf->{slapd}->{sbindir},
16 years, 8 months
[Fedora-directory-commits] console/src/com/netscape/management/client AboutDialog.java, 1.7, 1.8 FrameworkInitializer.java, 1.3, 1.4 default.properties, 1.7, 1.8
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20155/src/com/netscape/management/client
Modified Files:
AboutDialog.java FrameworkInitializer.java default.properties
Log Message:
Resolves: 249642
Summary: Don't combine theme name with framework version.
Index: AboutDialog.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/AboutDialog.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AboutDialog.java 29 Jun 2007 20:32:27 -0000 1.7
+++ AboutDialog.java 26 Jul 2007 15:53:02 -0000 1.8
@@ -25,6 +25,7 @@
import java.awt.*;
import com.netscape.management.client.util.*;
+import com.netscape.management.client.console.*;
/**
* AboutDialog is a class to display a standard "about box",
@@ -103,7 +104,10 @@
}
- GridBagUtil.constrain(content, new MultilineLabel(copyright),
+ GridBagUtil.constrain(content, new MultilineLabel(copyright + "\n\n" +
+ (new ResourceSet("com.netscape.management.client.default")).
+ getString("aboutDialog", "dialogFrameworkPrefix") + " " +
+ VersionInfo.getVersionNumber()),
1, 0, 1, 1, 1, 0, GridBagConstraints.NORTH,
GridBagConstraints.HORIZONTAL, 0, 0,
SEPARATED_COMPONENT_SPACE, 0);
Index: FrameworkInitializer.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/FrameworkInitializer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FrameworkInitializer.java 2 Jul 2007 18:49:18 -0000 1.3
+++ FrameworkInitializer.java 26 Jul 2007 15:53:02 -0000 1.4
@@ -264,7 +264,7 @@
ResourceSet themeResource = new ResourceSet("com.netscape.management.client.theme.theme");
aboutDialog = new AboutDialog(parent,
themeResource.getString("defaultAbout",
- "dialogTitle") + " " + VersionInfo.getVersionNumber());
+ "dialogTitle"));
aboutDialog.setProduct( new RemoteImage(
themeResource.getString("defaultAbout",
"productLogo")),
Index: default.properties
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/default.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- default.properties 29 Jun 2007 20:32:27 -0000 1.7
+++ default.properties 26 Jul 2007 15:53:02 -0000 1.8
@@ -90,6 +90,7 @@
dialog-closetext=There are unsaved changes. Would you like to close?
aboutDialog-dialogTitlePrefix=About
+aboutDialog-dialogFrameworkPrefix=Using Console Framework
permTab-title=UI Permissions
permTab-accessButton=&Permissions...
16 years, 8 months
[Fedora-directory-commits] coolkey/src/coolkey slot.cpp,1.7,1.8
by Doctor Conrad
Author: rrelyea
Update of /cvs/dirsec/coolkey/src/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21854
Modified Files:
slot.cpp
Log Message:
Don't filter based on ATR at all. Let the application deal with which cards
it wants to work with
Index: slot.cpp
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/slot.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- slot.cpp 16 Feb 2007 21:16:11 -0000 1.7
+++ slot.cpp 25 Jul 2007 23:49:56 -0000 1.8
@@ -564,15 +564,10 @@
state = CARD_PRESENT;
}
- if ( CKYBuffer_DataIsEqual(&cardATR, ATR, sizeof (ATR)) ||
- CKYBuffer_DataIsEqual(&cardATR, ATR1, sizeof(ATR1)) ||
- CKYBuffer_DataIsEqual(&cardATR, ATR2, sizeof(ATR2)) ) {
-
- if (Params::hasParam("noAppletOK"))
- {
- state |= APPLET_SELECTABLE;
- mCoolkey = 1;
- }
+ if (Params::hasParam("noAppletOK"))
+ {
+ state |= APPLET_SELECTABLE;
+ mCoolkey = 1;
}
/* support CAC card. identify the card based on applets, not the ATRS */
16 years, 8 months
[Fedora-directory-commits] esc/win32 build.sh,1.1,1.2
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/win32
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18494
Modified Files:
build.sh
Log Message:
Cleanup.
Index: build.sh
===================================================================
RCS file: /cvs/dirsec/esc/win32/build.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.sh 25 Jul 2007 20:13:02 -0000 1.1
+++ build.sh 25 Jul 2007 23:12:15 -0000 1.2
@@ -274,12 +274,12 @@
return 0
fi
-# if [ -d esc ];
-# then
-# cvs -d $FEDORA_CVS_ROOT update esc
-# else
-# cvs -d $FEDORA_CVS_ROOT co esc
-# fi
+ if [ -d esc ];
+ then
+ cvs -d $FEDORA_CVS_ROOT update esc
+ else
+ cvs -d $FEDORA_CVS_ROOT co esc
+ fi
if [ $? != 0 ];
then
16 years, 8 months
[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts DSDialogs.pm, 1.3, 1.4
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6014
Modified Files:
DSDialogs.pm
Log Message:
Resolves: bug 249633
Description: setup-ds.pl should create default org entries
Fix Description: Make the default in interactive mode to be to add those entries.
Index: DSDialogs.pm
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSDialogs.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DSDialogs.pm 12 Jul 2007 13:52:42 -0000 1.3
+++ DSDialogs.pm 25 Jul 2007 22:05:26 -0000 1.4
@@ -220,7 +220,8 @@
my $self = shift;
my $val = $self->{manager}->{inf}->{slapd}->{InstallLdifFile};
if (!defined($val)) {
- $val = 'none';
+ $val = 'suggest';
+ $self->{manager}->{inf}->{slapd}->{AddOrgEntries} = 'Yes';
}
return $val;
},
16 years, 8 months
[Fedora-directory-commits] esc/src/lib/coolkey CoolKey.cpp, 1.7, 1.8 CoolKey.h, 1.6, 1.7 NSSManager.cpp, 1.4, 1.5 NSSManager.h, 1.3, 1.4
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/lib/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18328
Modified Files:
CoolKey.cpp CoolKey.h NSSManager.cpp NSSManager.h
Log Message:
Minor fix to diagnostics logging.
Index: CoolKey.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/CoolKey.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CoolKey.cpp 7 Jun 2007 21:21:17 -0000 1.7
+++ CoolKey.cpp 25 Jul 2007 20:43:22 -0000 1.8
@@ -1325,7 +1325,10 @@
return E_FAIL;
if(g_Log->IsInitialized())
+ {
+ CoolKeyLogNSSStatus();
return S_OK;
+ }
else
return E_FAIL;
}
@@ -1348,6 +1351,35 @@
return S_OK;
}
+COOLKEY_API HRESULT CoolKeyLogNSSStatus()
+{
+
+ char tBuff[56];
+ if (g_NSSManager)
+ {
+ unsigned int error = g_NSSManager->GetLastInitError();
+
+ if(error == NSS_NO_ERROR)
+ {
+ CoolKeyLogMsg( PR_LOG_ALWAYS, "%s NSS system intialized successfully!\n",GetTStamp(tBuff,56));
+ return S_OK;
+ }
+
+ if(error == NSS_ERROR_LOAD_COOLKEY)
+ {
+ CoolKeyLogMsg( PR_LOG_ERROR, "%s Failed to load CoolKey module! Keys will not be recognized!\n",GetTStamp(tBuff,56));
+ }
+
+ if(error == NSS_ERROR_SMART_CARD_THREAD)
+ {
+ CoolKeyLogMsg( PR_LOG_ERROR, "%s Problem initializing the Smart Card thread! Keys will not be recognized!\n",GetTStamp(tBuff,56));
+ }
+ }
+
+ return S_OK;
+
+}
+
//Utility function to get Time Stamp
char *GetTStamp(char *aTime,int aSize)
{
Index: CoolKey.h
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/CoolKey.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CoolKey.h 7 Jun 2007 21:21:17 -0000 1.6
+++ CoolKey.h 25 Jul 2007 20:43:22 -0000 1.7
@@ -180,6 +180,7 @@
COOLKEY_API HRESULT CoolKeyLogMsg(int logLevel, const char *fmt, ...);
+COOLKEY_API HRESULT CoolKeyLogNSSStatus();
//Utility time function
char *GetTStamp(char *aTime,int aSize);
Index: NSSManager.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/NSSManager.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NSSManager.cpp 7 May 2007 23:51:46 -0000 1.4
+++ NSSManager.cpp 25 Jul 2007 20:43:22 -0000 1.5
@@ -46,11 +46,13 @@
static PRLogModuleInfo *coolKeyLogNSS = PR_NewLogModule("coolKeyNSS");
+unsigned int NSSManager::lastError;
NSSManager::NSSManager()
{
char tBuff[56];
PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::NSSManager:\n",GetTStamp(tBuff,56)));
mpSCMonitoringThread = NULL;
+ NSSManager::lastError = NSS_NO_ERROR;
#ifdef LINUX
systemCertDB = NULL;
#endif
@@ -111,6 +113,8 @@
if(!userModule || !userModule->loaded)
{
PR_LOG( coolKeyLogNSS, PR_LOG_ALWAYS, ("%s NSSManager::InitNSS problem loading PKCS11 module. No keys will be recognized!\n",GetTStamp(tBuff,56)));
+
+ NSSManager::lastError = NSS_ERROR_LOAD_COOLKEY;
return E_FAIL;
}
@@ -132,6 +136,7 @@
mpSCMonitoringThread = new SmartCardMonitoringThread(userModule);
if (!mpSCMonitoringThread) {
SECMOD_UnloadUserModule(userModule);
+ NSSManager::lastError = NSS_ERROR_SMART_CARD_THREAD;
return E_FAIL;
}
mpSCMonitoringThread->Start();
Index: NSSManager.h
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/NSSManager.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NSSManager.h 7 May 2007 23:51:46 -0000 1.3
+++ NSSManager.h 25 Jul 2007 20:43:22 -0000 1.4
@@ -26,6 +26,10 @@
#define PROMISCUOUS_PARAMETER "noAppletOK=yes"
#define NSS_PUBLIC_CERTS "slotFlags=PublicCerts"
+#define NSS_NO_ERROR 0
+#define NSS_ERROR_LOAD_COOLKEY 1
+#define NSS_ERROR_SMART_CARD_THREAD 2
+
#ifndef NSSMANAGER_H
#define NSSMANAGER_H
@@ -70,11 +74,14 @@
static HRESULT GetKeyIssuer(const CoolKey *aKey, char *aBuf, int aBufLength);
+ static unsigned int GetLastInitError() { return lastError;}
private:
static bool IsCACert(CERTCertificate *cert);
+ static unsigned int lastError;
+
#ifdef LINUX
PK11SlotInfo *systemCertDB;
#endif
16 years, 8 months
[Fedora-directory-commits] esc/src Makefile,1.3,1.4
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15693
Modified Files:
Makefile
Log Message:
Build "eginstall" on Windows.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/esc/src/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile 27 Sep 2006 17:50:24 -0000 1.3
+++ Makefile 25 Jul 2007 20:16:01 -0000 1.4
@@ -23,11 +23,11 @@
ifeq ($(OS_ARCH), WINNT)
-DIRS += xulrunner app/xpcom/tray app/xpcom win32
+DIRS += xulrunner app/eginstall app/xpcom/tray app/xpcom
endif
ifeq ($(OS_ARCH), Darwin)
-DIRS += xulrunner app/xpcom/tray app/xpcom mac
+DIRS += xulrunner app/xpcom/tray app/xpcom
endif
ifeq ($(OS_ARCH), Linux)
16 years, 8 months