[Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.65,1.66
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26314
Modified Files:
Makefile
Log Message:
Fixed the HP-UX and Solaris build failure introduced by the previous check-in.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- Makefile 25 Oct 2006 00:04:44 -0000 1.65
+++ Makefile 25 Oct 2006 17:06:07 -0000 1.66
@@ -565,10 +565,10 @@
# if not Linux, we need package sasl library and supported plugins
ifneq ($(ARCH), Linux)
- $(INSTALL) -m 755 $(SASL_LIBPATH)/*.$(DLL_SUFFIX)* $(DS_LIBDIR)
+ $(INSTALL) -m 755 $(SASL_LIBPATH)/*.$(DLL_SUFFIX)* $(RELDIR)/$(DS_LIBDIR)
-mkdir $(DS_LIBDIR)/sasl2
- $(INSTALL) -m 755 $(SASL_LIBPATH)/sasl2/libdigestmd5.$(DLL_SUFFIX)* $(DS_LIBDIR)/sasl2
- $(INSTALL) -m 755 $(SASL_LIBPATH)/sasl2/libgssapiv2.$(DLL_SUFFIX)* $(DS_LIBDIR)/sasl2
+ $(INSTALL) -m 755 $(SASL_LIBPATH)/sasl2/libdigestmd5.$(DLL_SUFFIX)* $(RELDIR)/$(DS_LIBDIR)/sasl2
+ $(INSTALL) -m 755 $(SASL_LIBPATH)/sasl2/libgssapiv2.$(DLL_SUFFIX)* $(RELDIR)/$(DS_LIBDIR)/sasl2
endif
# the plugin API
17 years, 5 months
[Fedora-directory-commits] esc/src/app/xul/esc/chrome/locale/en-US esc.dtd, 1.3, 1.4
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/locale/en-US
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12608
Modified Files:
esc.dtd
Log Message:
Latest text.
Index: esc.dtd
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/locale/en-US/esc.dtd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- esc.dtd 27 Sep 2006 17:45:14 -0000 1.3
+++ esc.dtd 25 Oct 2006 04:04:47 -0000 1.4
@@ -84,3 +84,4 @@
<!ENTITY tpsConfigDesc2 "Second, you must format it from the main Smart Card Manager window.">
<!ENTITY tpsConfigDesc3 "Enter the location of the smart card server (such as https://smartcardserver.example.com:7888)">
<!ENTITY diagnosticsMessage "The information below is diagnostic information that your system generates as you use your smart card. If you are having smart card problems, you may be asked by your support engineer to send this information for analysis.">
+<!ENTITY dontLaunchBrowser "Don't launch the default browser when enrolled card is inserted.">
17 years, 5 months
[Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc ESC.js, 1.3, 1.4 GenericAuth.xul, 1.2, 1.3 TRAY.js, 1.3, 1.4 advancedinfo.xul, 1.1, 1.2 certinfo.xul, 1.2, 1.3 config.xul, 1.3, 1.4 esc.xul, 1.3, 1.4 password.xul, 1.1, 1.2 settings.xul, 1.3, 1.4
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12564
Modified Files:
ESC.js GenericAuth.xul TRAY.js advancedinfo.xul certinfo.xul
config.xul esc.xul password.xul settings.xul
Log Message:
Latest mac/win fixes.
Index: ESC.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/ESC.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ESC.js 27 Sep 2006 17:31:51 -0000 1.3
+++ ESC.js 25 Oct 2006 04:03:34 -0000 1.4
@@ -43,12 +43,25 @@
const SERVICES_TAG = "Services";
const ISSUER_TAG = "IssuerName";
const SERVICE_INFO_TAG = "ServiceInfo";
+const ENROLLED_TOKEN_BROWSER_URL = "EnrolledTokenBrowserURL";
+const RESET_PHONE_HOME = "ResetPhoneHome";
+const ESC_IGNORE_TOKEN_BROWSER_URL = "esc.ignore.token.browser.url";
+const ESC_TOKEN_BROWSER_URL_ESTABLISHED = "esc.token.browser.established";
+const ESC_IGNORE_KEY_ISSUER_INFO = "esc.ignore.key.issuer.info";
const UNINITIALIZED = 1;
const UNINITIALIZED_NOAPPLET = 2;
const ESC_ENROLL_WIDTH = 600;
const ESC_ENROLL_HEIGHT = 570;
+//Enrolled Token Browser constants
+
+const MAC_PROG_OPEN = "/usr/bin/open";
+const LINUX_PROG_OPEN = "/usr/bin/gnome-open";
+const WIN_XP_PROG_OPEN = "C:\\Windows\\system32\\cmd.exe";
+const WIN_2000_PROG_OPEN = "C:\\WINNT\\system32\\cmd.exe";
+
+
//Window names
const ENROLL_WINDOW = "esc.xul";
@@ -224,6 +237,8 @@
{
var callback = function (aResult) {
+ recordMessage("In DoPhoneHome callback");
+
var issuer = "";
if(aResult == true)
{
@@ -232,6 +247,21 @@
issuer = getBundleString("unknownIssuer");
TraySendNotificationMessage(getBundleString("keyInserted"),"\"" + issuer +"\"" + " " + getBundleString("keyInsertedComputer"),3,4000,GetESCNotifyIconPath(keyType,keyID));
UpdateRowWithPhoneHomeData(keyType,keyID);
+
+ recordMessage("cached issuer " + issuer);
+
+ var browserURL = GetCachedEnrolledTokenBrowserURL(keyID);
+
+ recordMessage("Cached browserURL " + browserURL);
+
+ if(browserURL)
+ {
+ DoCoolKeySetConfigValue(ESC_TOKEN_BROWSER_URL_ESTABLISHED,"yes");
+
+ DoHandleEnrolledBrowserLaunch();
+
+ }
+
}
else
{
@@ -245,6 +275,15 @@
{
issuer = GetCachedIssuer(keyID);
TraySendNotificationMessage(getBundleString("keyInserted"),"\"" + issuer +"\"" + " " + getBundleString("keyInsertedComputer"),3,4000,GetESCNotifyIconPath(keyType,keyID));
+
+ var launchBrowserURL = GetCachedEnrolledTokenBrowserURL(keyID);
+
+ if(launchBrowserURL && GetCoolKeyIsEnrolled(keyType, keyID) )
+ {
+ recordMessage("About to attempt to launch Browser URL.");
+ openEnrolledTokenURLBrowser(keyID);
+ }
+
return true;
}
@@ -317,6 +356,7 @@
var name = this.name;
+ recordMessage("DoPhoneHomeConfigClose() name " + name + " opener " + window.opener);
if(window.opener && name)
{
window.opener.UpdateRowWithPhoneHomeData(1,name);
@@ -593,7 +633,7 @@
keyUITable[aKeyID] = aUiData;
keyTypeTable[aKeyID] = aKeyType;
- var child = window.open("chrome://esc/content/GenericAuth.xul", aKeyID, "chrome,width=400,height=250");
+ var child = window.open("chrome://esc/content/GenericAuth.xul", aKeyID, "chrome,centerscreen,width=400,height=250");
curChildWindow = child;
@@ -830,6 +870,7 @@
textDump += arr.length + "\n\n" ;
+ var i = 0;
for(i = 0 ; i < arr.length ; i++)
{
keyID = arr[i][1];
@@ -842,7 +883,7 @@
if(!issuer)
issuer = getBundleString("unknownIssuer");
- textDump += "***" + getBundleString("smartCardU") + " " + i + ":" + "***" + "\n\n";
+ textDump += getBundleString("smartCardU") + " " + i + ":" + "\n\n";
textDump += " " + getBundleString("appletVersion") + " " + appletVerMaj + "." + appletVerMin + "\n";
@@ -881,11 +922,11 @@
if(nicknames)
{
var cert_info = null;
- for (i = 0; i < nicknames.length ; i ++)
+ for (j = 0; j < nicknames.length ; j ++)
{
- textDump += " " + getBundleString("certificateNickname") + " " + nicknames[i] + " \n\n";
+ textDump += " " + getBundleString("certificateNickname") + " " + nicknames[j] + " \n\n";
- cert_info = GetCoolKeyCertInfo(keyType,keyID,nicknames[i]);
+ cert_info = GetCoolKeyCertInfo(keyType,keyID,nicknames[j]);
var cert_split = cert_info.split("\n");
@@ -1919,7 +1960,6 @@
gEnrollmentPage = 1;
UpdateCoolKeyAvailabilityForEnrollment();
UpdateButtonStates();
- //showOrHideEscOnLaunch();
window.setTimeout("showOrHideTabsUI()",2);
}
@@ -1927,7 +1967,6 @@
{
UpdateBindingTableAvailability();
UpdateButtonStates();
- //showOrHideEscOnLaunch();
}
function InitializeAdminBindingList()
@@ -1937,8 +1976,9 @@
UpdateAdminBindingListAvailability();
UpdateButtonStates();
- //showOrHideEscOnLaunch();
- //showOrHideTabsUI();
+
+ DoSetEnrolledBrowserLaunchState();
+ DoHandleEnrolledBrowserLaunch();
}
//Window related functions
@@ -1952,7 +1992,9 @@
// We do want notify events though
var doPreserveNotify = true;
+
SetMenuItemsText();
+ HideWindow();
TrayRemoveWindow(doPreserveNotify);
}
@@ -2267,6 +2309,10 @@
function SelectRow(row)
{
+
+ if(!row)
+ return;
+
var theID = row.getAttribute("id");
if (!row || gCurrentSelectedRow == row)
return;
@@ -3208,16 +3254,14 @@
var uninitialized = 0;
+ recordMessage("Key insterted!");
+
if(gHiddenPage)
{
TrayShowNotificationIcon();
}
- if (GetCoolKeyIsEnrolled(keyType, keyID))
- {
- openEnrolledTokenURLBrowser();
- }
- else
+ if (!GetCoolKeyIsEnrolled(keyType, keyID) )
{
uninitialized = 1;
}
@@ -3627,8 +3671,78 @@
// Special feature to open a default browser to
// a configurable URL.
-function openEnrolledTokenURLBrowser()
+
+function DoSetEnrolledBrowserLaunchState()
+{
+
+ var launch_id = document.getElementById("enrolled_key_browser");
+
+ if(launch_id)
+ {
+
+ var doIgnoreBrowserUrl = DoCoolKeyGetConfigValue(ESC_IGNORE_TOKEN_BROWSER_URL);
+
+ recordMessage("DoSetEnrolledBrowserLaunchState: doIgnore: " + doIgnoreBrowserUrl);
+ var checked= "false";
+
+ if(doIgnoreBrowserUrl == "yes")
+ {
+
+ checked = "true";
+ }
+ else
+ {
+ checked = "false";
+ }
+
+ launch_id.setAttribute("checked",checked);
+ }
+
+}
+
+
+function DoHandleEnrolledBrowserLaunch()
+{
+
+ var launch_id = document.getElementById("enrolled_key_browser");
+
+ var doShow = DoCoolKeyGetConfigValue(ESC_TOKEN_BROWSER_URL_ESTABLISHED);
+
+ if(launch_id)
+ {
+
+ if(doShow == "yes")
+ {
+ ShowItem(launch_id);
+ }
+ else
+ {
+ HideItem(launch_id);
+ }
+
+ var checked = launch_id.getAttribute("checked");
+
+ recordMessage("DoHandleEnrolledBrowserLaunch checked: " + checked );
+ if(checked == "true")
+ {
+ recordMessage("DoHandleEnrolledBrowserLaunch Setting ESC_IGNORE to yes");
+ DoCoolKeySetConfigValue(ESC_IGNORE_TOKEN_BROWSER_URL,"yes");
+ }
+ else
+ {
+ recordMessage("DoHandleEnrolledBrowserLaunch Setting ESC_IGNORE to no");
+ DoCoolKeySetConfigValue(ESC_IGNORE_TOKEN_BROWSER_URL,"no");
+ }
+
+ }
+}
+
+function openEnrolledTokenURLBrowser(aKeyID)
{
+
+ if(!gHiddenPage)
+ return;
+
var agent = navigator.userAgent.toLowerCase();
var doWindows = 0;
@@ -3636,35 +3750,46 @@
var platform = null;
var executable = null;
+ //Check to see if we should ignore this
+
+ var doIgnoreBrowserUrl = DoCoolKeyGetConfigValue(ESC_IGNORE_TOKEN_BROWSER_URL);
+
+ if(doIgnoreBrowserUrl == "yes")
+ {
+ recordMessage("openEnrolledTokenURLBrowser don't open browser because config param is set to ignore!");
+
+ return;
+ }
+
if(agent && agent.indexOf("mac") != -1)
{
platform = "mac";
- executable = "/usr/bin/open" ;
+ executable = MAC_PROG_OPEN ;
}
if(agent && agent.indexOf("linux") != -1)
{
platform = "linux";
- executable = "/usr/bin/firefox";
+ executable = LINUX_PROG_OPEN ;
}
if(agent && agent.indexOf("nt 5.0") != -1)
{
platform = "windows";
- executable = "C:\\WINNT\\system32\\cmd.exe" ;
+ executable = WIN_2000_PROG_OPEN ;
doWindows = 1;
}
if(agent && agent.indexOf("nt 5.1") != -1)
{
platform = "windows";
- executable = "C:\\Windows\\system32\\cmd.exe" ;
+ executable = WIN_XP_PROG_OPEN ;
doWindows = 1;
}
+ recordMessage("openEnrolledTokenURLBrowser platform: " + platform);
if(!platform)
{
- MyAlert(getBundleString("errorFindESCPlatform"));
return;
}
@@ -3672,22 +3797,16 @@
var enrolled_token_uri = null;
- if(netkey)
- {
- try {
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
- enrolled_token_uri = netkey.GetCoolKeyConfigValue("esc.enrolled.token.url");
+ if(netkey)
+ {
+ enrolled_token_uri = GetCachedEnrolledTokenBrowserURL(aKeyID);
- } catch(e) {
- MyAlert(getBundleString("errorConfigValue") + e);
-
- }
+ recordMessage("openEnrolledTokenURLBrowser uri: " + enrolled_token_uri);
if(!enrolled_token_uri)
{
return;
}
-
}
// create an nsILocalFile for the executable
@@ -3712,7 +3831,6 @@
if(doWindows)
{
-
args = ["/c","start",enrolled_token_uri];
}
else
@@ -3905,6 +4023,18 @@
{
var url = null;
+ //Back door for testing, ignore the value if so configured
+
+ var ignoreIssuer = DoCoolKeyGetConfigValue(ESC_IGNORE_KEY_ISSUER_INFO);
+
+ recordMessage("DoCoolKeyGetIssuerUrl ignoreIssuer: " + ignoreIssuer);
+
+ if(ignoreIssuer == "yes")
+ {
+ recordMessage("Ignoring issuer url returning null!");
+ return url;
+ }
+
try {
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
url = netkey.GetCoolKeyIssuerInfo(keyType, keyID);
@@ -3954,7 +4084,30 @@
function launchCONFIG(keyType,keyID)
{
- var wind = window.openDialog("chrome://esc/content/config.xul",keyID,"chrome,centerscreen,resizable,modal=yes");
+
+ var agent = navigator.userAgent.toLowerCase();
+
+ var platform = "";
+
+ if(agent && agent.indexOf("mac") != -1)
+ {
+ platform = "mac";
+ }
+
+ var wind = null;
+
+
+ if(platform == "mac")
+ {
+
+ wind = window.openDialog("chrome://esc/content/config.xul",keyID,"chrome,centerscreen,resizable,modal=no");
+ }
+ else
+ {
+ wind = window.openDialog("chrome://esc/content/config.xul",keyID,"chrome,centerscreen,resizable,modal=yes");
+
+
+ }
}
function launchCertViewer()
@@ -4119,6 +4272,30 @@
return true;
}
+function GetCachedPhoneHomeValue(aKeyID,aValue)
+{
+ var retValue = null;
+
+ if(!aKeyID || ! aValue)
+ return null;
+
+ var theValue = ConfigValueWithKeyID(aKeyID,aValue);
+
+
+ if(!theValue)
+ return null;
+
+ retValue = DoCoolKeyGetConfigValue(theValue);
+
+ return retValue;
+}
+
+function GetCachedEnrolledTokenBrowserURL(aKeyID)
+{
+
+ return GetCachedPhoneHomeValue(aKeyID,ENROLLED_TOKEN_BROWSER_URL);
+}
+
function GetCachedPhoneHomeURL(aKeyID)
{
var url = null;
@@ -4289,14 +4466,29 @@
if(cValue)
{
+ recordMessage("Writing out config : " +cValue + " value: " + value);
DoCoolKeySetConfigValue(cValue,value);
}
}
}
+ recordMessage("Done writing out phone home config cache.");
+
+ var browserURL = GetCachedEnrolledTokenBrowserURL(aKeyID);
+
+ recordMessage("Cached browserURL " + browserURL);
+
+ if(browserURL)
+ {
+ DoCoolKeySetConfigValue(ESC_TOKEN_BROWSER_URL_ESTABLISHED,"yes");
+ DoHandleEnrolledBrowserLaunch();
+
+ }
+
if(resultCB)
{
+ recordMessage("About to write out KEY_ISSUER_URL value.");
//Manually write out entry for phone home url
var issuer_config_value = ConfigValueWithKeyID(aKeyID,KEY_ISSUER_URL);
@@ -4483,3 +4675,14 @@
MyAlert(getBundleString("dataCopiedToClipboard") );
}
+
+
+function recordMessage( message ) {
+
+ var consoleService = Components
+ .classes['@mozilla.org/consoleservice;1']
+ .getService( Components.interfaces.nsIConsoleService );
+
+ if(consoleService)
+ consoleService.logStringMessage("esc: " + message + "\n");
+}
Index: GenericAuth.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/GenericAuth.xul,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GenericAuth.xul 27 Sep 2006 17:31:51 -0000 1.2
+++ GenericAuth.xul 25 Oct 2006 04:03:35 -0000 1.3
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<?xml-stylesheet href="esc.css" type="text/css"?>
<!-- ***** BEGIN COPYRIGHT BLOCK *****
* This Program is free software; you can redistribute it and/or modify it under
Index: TRAY.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/TRAY.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TRAY.js 27 Sep 2006 17:31:51 -0000 1.3
+++ TRAY.js 25 Oct 2006 04:03:35 -0000 1.4
@@ -88,6 +88,8 @@
TrayAddWindow();
+TrayShowTooltip(getBundleString("escTitle"));
+
function getBaseWindow( ) {
var rv;
try
@@ -278,6 +280,7 @@
gTray.add(gBaseWindow);
+
} catch(e) {
// no need to bother the user if the tray fails
@@ -357,7 +360,7 @@
try {
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect")
+ netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
gTray.settooltipmsg(getBundleString("escTitle"));
gTray.showicon();
@@ -369,6 +372,29 @@
}
+function TrayShowTooltip(aMessage)
+{
+ if(!aMessage)
+ return;
+
+ if(gTray && gBaseWindow)
+ {
+
+ try {
+
+ netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect")
+;
+ gTray.settooltipmsg(aMessage);
+
+ } catch(e) {
+ return;
+ }
+
+ }
+
+}
+
+
function SetMenuItemsText()
{
Index: advancedinfo.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/advancedinfo.xul,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- advancedinfo.xul 27 Sep 2006 17:24:32 -0000 1.1
+++ advancedinfo.xul 25 Oct 2006 04:03:35 -0000 1.2
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<?xml-stylesheet href="esc.css" type="text/css"?>
<!-- ***** BEGIN COPYRIGHT BLOCK *****
* This Program is free software; you can redistribute it and/or modify it under
Index: certinfo.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/certinfo.xul,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- certinfo.xul 13 Sep 2006 17:56:49 -0000 1.2
+++ certinfo.xul 25 Oct 2006 04:03:35 -0000 1.3
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<?xml-stylesheet href="esc.css" type="text/css"?>
<!-- ***** BEGIN COPYRIGHT BLOCK *****
* This Program is free software; you can redistribute it and/or modify it under
Index: config.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/config.xul,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config.xul 27 Sep 2006 17:31:51 -0000 1.3
+++ config.xul 25 Oct 2006 04:03:35 -0000 1.4
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<?xml-stylesheet href="esc.css" type="text/css"?>
<!-- ***** BEGIN COPYRIGHT BLOCK *****
* This Program is free software; you can redistribute it and/or modify it under
Index: esc.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/esc.xul,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- esc.xul 27 Sep 2006 17:31:51 -0000 1.3
+++ esc.xul 25 Oct 2006 04:03:35 -0000 1.4
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<?xml-stylesheet href="esc.css" type="text/css"?>
<!-- ***** BEGIN COPYRIGHT BLOCK *****
* This Program is free software; you can redistribute it and/or modify it under
Index: password.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/password.xul,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- password.xul 27 Sep 2006 17:31:18 -0000 1.1
+++ password.xul 25 Oct 2006 04:03:35 -0000 1.2
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<?xml-stylesheet href="esc.css" type="text/css"?>
<!-- ***** BEGIN COPYRIGHT BLOCK *****
* This Program is free software; you can redistribute it and/or modify it under
Index: settings.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/settings.xul,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- settings.xul 27 Sep 2006 17:31:51 -0000 1.3
+++ settings.xul 25 Oct 2006 04:03:35 -0000 1.4
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<?xml-stylesheet href="esc.css" type="text/css"?>
<!-- ***** BEGIN COPYRIGHT BLOCK *****
* This Program is free software; you can redistribute it and/or modify it under
@@ -150,8 +151,12 @@
<button class="buttonText" id="advancedbtn" label="&advancedInfo;" disabled="true" hidden="false" oncommand="DoShowAdvancedInfo();"/>
<spacer flex = "1"/>
+
+ <checkbox id="enrolled_key_browser" label="&dontLaunchBrowser;" checked="false" oncommand="DoHandleEnrolledBrowserLaunch(); " hidden="true" disabled="false" />
+ <spacer flex = "1"/>
<button class="buttonText" id="closebtn" label ="&closeAdminLater;" oncommand="HideAdminPage();"/>
<spacer class="horSpacerShort"/>
+
</hbox>
<!-- </groupbox> -->
</window>
17 years, 5 months
[Fedora-directory-commits] esc/src/app/xul/esc/defaults/preferences esc-prefs.js, 1.2, 1.3
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc/defaults/preferences
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12522
Modified Files:
esc-prefs.js
Log Message:
Latest fixes.
Index: esc-prefs.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/defaults/preferences/esc-prefs.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- esc-prefs.js 13 Sep 2006 17:53:40 -0000 1.2
+++ esc-prefs.js 25 Oct 2006 04:01:59 -0000 1.3
@@ -18,15 +18,6 @@
#pref("toolkit.defaultChromeURI", "chrome://esc/content/settings.xul");
-pref("esc.tps.url","http://test.host.com:7888/nk_service");
-
-#pref("esc.enroll.ui.url","http://test.host.com:7888/cgi-bin/esc.cgi?action=autoenroll");
-
-#pref("esc.enrolled.token.url","http://www.test.com");
-pref("esc.hide.on.startup","no");
-
-
-
pref("signed.applets.codebase_principal_support",true);
pref("capability.principal.codebase.p0.granted", "UniversalXPConnect");
@@ -37,7 +28,4 @@
pref("esc.factory.mode","no");
pref("esc.show.tabs.ui","no");
-pref("browser.dom.window.dump.enabled",true);
-pref("javascript.options.showInConsole",true);
-pref("nglayout.debug.disable_xul_cache",true);
-pref("nglayour.debug.disable_xul_fastload",true);
+pref("esc.windows.do.capi","yes");
17 years, 5 months
[Fedora-directory-commits] esc/src/app/xul/esc application.ini, 1.2, 1.3
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9589
Modified Files:
application.ini
Log Message:
Latest fixes.
Index: application.ini
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/application.ini,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- application.ini 27 Sep 2006 17:44:31 -0000 1.2
+++ application.ini 25 Oct 2006 04:00:14 -0000 1.3
@@ -29,7 +29,7 @@
;
; This field specifies your application's build ID (timestamp). This field is
; required.
-BuildID=00000000016
+BuildID=00000000018
;
; This ID is just an example. Every XUL app ought to have it's own unique ID.
; You can use the microsoft "guidgen" or "uuidgen" tools, or go on
17 years, 5 months
[Fedora-directory-commits] esc/src/app/xpcom/tray Makefile.moz, 1.2, 1.3 cool.rc, 1.1.1.1, 1.2 rhMacTray.cpp, 1.3, 1.4 rhTray.cpp, 1.3, 1.4 rhTray.h, 1.2, 1.3
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xpcom/tray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9535
Modified Files:
Makefile.moz cool.rc rhMacTray.cpp rhTray.cpp rhTray.h
Log Message:
Latest mac/win fixes.
Index: Makefile.moz
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/Makefile.moz,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.moz 13 Sep 2006 17:50:07 -0000 1.2
+++ Makefile.moz 25 Oct 2006 03:59:03 -0000 1.3
@@ -39,6 +39,12 @@
-include $(MOZ_OBJDIR)/config/autoconf.mk
+DEPLOY_OFFSET=/esc
+ifeq ($(OS_ARCH),Linux)
+DEPLOY_OFFSET=/src
+endif
+
+
OS_CXXFLAGS += $(HOST_CXXFLAGS)
#MODULE = rhTray
@@ -133,8 +139,8 @@
deploy::
echo "Deploying"
echo $(IMPORT_LIBRARY)
- $(NSINSTALL) ./$(LIB_PREFIX)rhTray$(DLL_SUFFIX) $(CORE_DEPTH)/src/app/xul/esc/components
- $(NSINSTALL) ./_xpidlgen/*.xpt $(INSTALL_STUFF) $(CORE_DEPTH)/src/app/xul/esc/components
+ $(NSINSTALL) ./$(LIB_PREFIX)rhTray$(DLL_SUFFIX) $(CORE_DEPTH)$(DEPLOY_OFFSET)/app/xul/esc/components
+ $(NSINSTALL) ./_xpidlgen/*.xpt $(INSTALL_STUFF) $(CORE_DEPTH)$(DEPLOY_OFFSET)/app/xul/esc/components
# separate libraries linked in.
Index: cool.rc
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/cool.rc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- cool.rc 12 Jun 2006 23:39:50 -0000 1.1.1.1
+++ cool.rc 25 Oct 2006 03:59:03 -0000 1.2
@@ -58,8 +58,8 @@
BEGIN
POPUP "System Tray Menu"
BEGIN
- MENUITEM "Show...", ID_SHOW
- //MENUITEM "Hide...", ID_HIDE
+ MENUITEM "Show Manage Smart Cards", ID_SHOW
+ //MENUITEM "Hide", ID_HIDE
MENUITEM "Exit", IDM_EXIT
END
END
Index: rhMacTray.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/rhMacTray.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rhMacTray.cpp 27 Sep 2006 17:21:58 -0000 1.3
+++ rhMacTray.cpp 25 Oct 2006 03:59:03 -0000 1.4
@@ -25,12 +25,16 @@
int rhTray::mInitialized = 0;
WindowRef rhTray::mWnd = NULL;
+MenuRef rhTray::mDockMenu = NULL;
+MenuRef rhTray::mRootMenu = NULL;
ProcessSerialNumber rhTray::mPSN;
EventHandlerRef rhTray::mEventHandlerRef=NULL;
EventHandlerUPP rhTray::mEventHandlerUPP=NULL;
map< nsIBaseWindow *, rhTrayWindowListener *> rhTray::mWindowMap;
+#define MENU_ITEM_ID_BASE 5
+#define GO_MENU_ID 6
std::list< nsCOMPtr<rhITrayWindNotify> > rhTray::gTrayWindNotifyListeners;
@@ -137,7 +141,6 @@
rhTrayWindowListener *listener = rhTray::mWindowMap[aWindow];
- ShowApp();
if(listener)
{
listener->ShowWindow();
@@ -220,7 +223,7 @@
{
PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Show app! \n"));
-
+
::ShowHideProcess(&rhTray::mPSN,TRUE);
::SetFrontProcess(&rhTray::mPSN);
@@ -259,6 +262,64 @@
return E_FAIL;
}
+ //Take care of the menu stuff
+
+ MenuRef tMenu;
+ CreateNewMenu(1, 0, &tMenu);
+
+ MenuItemIndex item;
+ AppendMenuItemTextWithCFString( tMenu, CFSTR("Show Manage Smart Cards"), 0,MENU_ITEM_ID_BASE , &item );
+
+ if(tMenu)
+ {
+ OSStatus result = SetApplicationDockTileMenu (tMenu);
+
+ if(result == noErr)
+ {
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Initialize result of SetApplicationDockTileMenu %d \n",result));
+ mDockMenu = GetApplicationDockTileMenu();
+
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Initialize result of GetApplicationDockTileMenu: %d . \n",mDockMenu));
+ }
+ }
+
+ MenuRef tGoMenu;
+ ::CreateNewMenu(1,0,&tGoMenu);
+
+ if(tGoMenu)
+ {
+ SetMenuID (tGoMenu,GO_MENU_ID);
+ }
+ else
+ {
+ return S_OK;
+ }
+
+ MenuRef tRootMenu;
+ ::CreateNewMenu(0, 0, &tRootMenu);
+
+ if(!tRootMenu)
+ {
+ return S_OK;
+ }
+
+ MenuItemIndex goItem;
+
+ ::AppendMenuItemTextWithCFString( tGoMenu, CFSTR("Show Manage Smart Cards"), 0,MENU_ITEM_ID_BASE , &goItem );
+
+ ::SetMenuTitleWithCFString( tGoMenu, CFSTR("Go") );
+
+ OSStatus rootResult = ::SetRootMenu(tRootMenu);
+
+ if(rootResult == noErr)
+ {
+ mRootMenu = AcquireRootMenu();
+
+ MenuItemIndex myMenuIndex;
+ AppendMenuItemTextWithCFString( tRootMenu, NULL, 0, 0, &myMenuIndex );
+ SetMenuItemHierarchicalMenu(tRootMenu, myMenuIndex, tGoMenu);
+ }
+
mInitialized = 1;
return S_OK;
@@ -292,6 +353,24 @@
::DisposeEventHandlerUPP(mEventHandlerUPP);
}
+
+ if(mDockMenu)
+ {
+ ::ReleaseMenu(mDockMenu);
+ }
+
+
+ MenuRef goMenu = GetMenuHandle (GO_MENU_ID);
+
+ if(goMenu)
+ {
+ ::ReleaseMenu(goMenu);
+ }
+
+ if(mRootMenu)
+ {
+ ::ReleaseMenu(mRootMenu);
+ }
return S_OK;
}
@@ -323,7 +402,6 @@
void rhTray::ShowAllListeners()
{
- ShowApp();
PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::ShowAllListeners.\n"));
map< nsIBaseWindow *, rhTrayWindowListener *>::iterator i;
@@ -421,7 +499,6 @@
}
-
PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::AddWindowListener top level widget %p \n",hWnd));
rhTrayWindowListener *create = new rhTrayWindowListener(hWnd);
@@ -437,7 +514,7 @@
if(res != S_OK)
return E_FAIL;
-
+
return S_OK;
}
@@ -506,6 +583,95 @@
/* void setmenuitemtext (in unsigned long aIndex, in string aText); */
NS_IMETHODIMP rhTray::Setmenuitemtext(PRUint32 aIndex, const char *aText)
{
+
+ // On the Mac , we support only one menu item
+
+ if(aIndex == 0 && aText)
+ {
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("rhCoolKey::Setmenuitemtext aIndex: %d text %s. \n",aIndex,aText));
+
+ MenuRef outMenu;
+ MenuItemIndex theIndex;
+
+ OSStatus result = GetIndMenuItemWithCommandID (
+ mDockMenu,
+ MENU_ITEM_ID_BASE + aIndex,
+ 1,
+ &outMenu,
+ &theIndex
+ );
+
+
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("rhCoolKey::Setmenuitemtext Result of menu item: %d. \n",result));
+
+ if(result == noErr)
+ {
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("rhCoolKey::Setmenuitemtext changing item index: %d . \n",theIndex));
+ CFStringRef cfStr= CFStringCreateWithCString (
+ NULL,
+ aText,
+ kCFStringEncodingASCII
+ );
+
+ OSStatus result = SetMenuItemTextWithCFString (
+ mDockMenu,
+ theIndex ,
+ cfStr
+ );
+
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("rhCoolKey::Setmenuitemtext Result of setting item text: %d. \n",result));
+
+ }
+
+
+ // Now take care of the root menu, provide exact same item here
+
+ MenuRef tGoMenu = GetMenuHandle (GO_MENU_ID);
+
+
+ if(!tGoMenu)
+ {
+ return S_OK;
+ }
+
+ MenuRef goOutMenu;
+ MenuItemIndex theGoIndex;
+
+ OSStatus resultRoot = GetIndMenuItemWithCommandID (
+ tGoMenu,
+ MENU_ITEM_ID_BASE + aIndex,
+ 1,
+ &goOutMenu,
+ &theGoIndex
+ );
+
+
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("rhCoolKey::Setmenuitemtext Result of menu item for go menu: %d. \n",result));
+
+ if(resultRoot == noErr)
+ {
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("rhCoolKey::Setmenuitemtext changing item index: %d . For go menu. \n",theIndex));
+ CFStringRef cfStr= CFStringCreateWithCString (
+ NULL,
+ aText,
+ kCFStringEncodingASCII
+ );
+
+ OSStatus result = SetMenuItemTextWithCFString (
+ tGoMenu,
+ theGoIndex ,
+ cfStr
+ );
+
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("rhCoolKey::Setmenuitemtext Result of setting item text for root menu: %d. \n",result));
+
+ }
+
+
+
+
+ }
+
return S_OK;
}
@@ -596,6 +762,7 @@
PRBool claimed = 0;
+ PR_LOG(trayLog, PR_LOG_DEBUG, ("rhTray::NotifyTrayWindListener: . \n"));
((rhITrayWindNotify *) (*it))->RhTrayWindEventNotify(aEvent,aEventData, aKeyData, aData1, aData2, &claimed);
@@ -626,6 +793,7 @@
case kEventAppActivated:
PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::ApplicationProc App activated! \n"));
+ result = noErr;
break;
case kEventAppDeactivated:
@@ -668,6 +836,12 @@
PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::ApplicationProc App kHICommandQuit! \n"));
break;
+
+ case MENU_ITEM_ID_BASE:
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::ApplicationProc App Manage Smart Cards! \n"));
+ NotifyTrayWindListeners(MENU_EVT,MENU_SHOW);
+
+ break;
};
@@ -714,6 +888,8 @@
//::InstallStandardEventHandler(target);
::InstallEventHandler(target,mEventHandlerUPP,numTypes,eventTypes, (void *) this,&mEventHandlerRef);
+ ShowWindow();
+
return S_OK;
}
@@ -728,18 +904,18 @@
if(IsWindowCollapsed(mWnd))
{
PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener:: ShowWindow : uncollapsing collapsed window. \n"));
- ::CollapseWindow(mWnd,FALSE);
+ //::CollapseWindow(mWnd,FALSE);
}
if(!IsWindowVisible(mWnd))
{
PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener:: ShowWindow : Window not visible showing... \n"));
- ::ShowWindow(mWnd);
+ //::ShowWindow(mWnd);
}
- //::BringToFront(mWnd);
+ ::BringToFront(mWnd);
PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener:: ShowWindow : \n"));
rhTray::ShowApp();
@@ -753,15 +929,6 @@
{
PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener:: HideWindow \n"));
-
- //OSStatus res = ::CollapseWindow(mWnd,TRUE);
-
- //::HideWindow(mWnd);
-
- rhTray::HideApp();
-
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener:: HideWindow \n"));
-
}
}
@@ -783,9 +950,6 @@
PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener::WindowProc attempting Window close! \n"));
- if(self)
- self->HideWindow();
- //result = noErr;
break;
case kEventWindowHidden:
Index: rhTray.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/rhTray.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rhTray.cpp 27 Sep 2006 17:21:58 -0000 1.3
+++ rhTray.cpp 25 Oct 2006 03:59:03 -0000 1.4
@@ -23,7 +23,7 @@
NS_IMPL_ISUPPORTS1(rhTray, rhITray)
-#include "Winuser.h"
+#include "WinUser.h"
HWND rhTray::mWnd = 0;
int rhTray::mInitialized = 0;
@@ -34,8 +34,11 @@
map< nsIBaseWindow *, rhTrayWindowListener *> rhTray::mWindowMap;
+map<unsigned int,string> rhTray::mMenuItemStringMap;
+
NOTIFYICONDATA rhTray::mIconData;
+
const TCHAR* LISTENER_INSTANCE =
TEXT("_RH_TRAY_WIND_LISTENER_INST");
@@ -192,6 +195,21 @@
/* void settooltipmsg (in string aMessage); */
NS_IMETHODIMP rhTray::Settooltipmsg(const char *aMessage)
{
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Settooltipmsg %s \n",aMessage));
+strcpy(rhTray::mIconData.szTip, aMessage);
+
+ if(!aMessage)
+ return E_FAIL;
+
+ if(strlen(aMessage) >= 64)
+ return E_FAIL;
+
+ strcpy(rhTray::mIconData.szTip, aMessage);
+
+
+ ::Shell_NotifyIcon(NIM_MODIFY,&rhTray::mIconData);
+
+
return NS_OK;
}
@@ -250,6 +268,8 @@
PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Initialize \n"));
+ CreateMutex(NULL, FALSE, "ESCMutex");
+
HRESULT res = CreateEventWindow();
@@ -311,6 +331,8 @@
DestroyEventWindow();
RemoveIcon();
+ rhTray::mMenuItemStringMap.clear();
+
return S_OK;
}
@@ -444,8 +466,10 @@
switch(lParam)
{
case WM_LBUTTONDBLCLK:
+ case WM_LBUTTONDOWN:
PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::WindowProc: WM_LBUTTONDBLCLK \n"));
+ NotifyTrayWindListeners(MENU_EVT,MENU_SHOW);
ShowAllListeners();
break;
@@ -461,14 +485,11 @@
case ID_SHOW:
+ NotifyTrayWindListeners(MENU_EVT,MENU_SHOW);
+
ShowAllListeners();
break;
- case ID_HIDE:
-
- HideAllListeners();
- break;
-
case IDM_EXIT:
PostQuitMessage(0);
@@ -556,6 +577,8 @@
{
HMENU hMenu, hPopup = 0;
+ const int numMenuItems = 2;
+
hMenu = ::LoadMenu (::GetModuleHandle("rhTray.dll"),
MAKEINTRESOURCE (PopupMenuResource));
@@ -567,6 +590,68 @@
hPopup = ::GetSubMenu (hMenu, 0);
+ int numItems = rhTray::mMenuItemStringMap.size();
+
+
+
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::ShowPopupMenu num menu item strings : %d\n",numItems));
+ // Change the menu items text if possible
+
+ MENUITEMINFO mii = {0};
+
+ unsigned int menuItemID = 0;
+
+ int i = 0;
+
+ if(numItems == numMenuItems)
+ {
+ for (i = 0 ;i < numMenuItems; i++)
+ {
+ mii.cbSize = sizeof(MENUITEMINFO);
+ mii.fMask = MIIM_TYPE ;
+
+
+
+ char * itemText = (char *) (rhTray::mMenuItemStringMap[i]).c_str();
+
+
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::ShowPopupMenu menutext: %d text %s \n",i,itemText));
+ if(itemText)
+ {
+
+ if(i == 0)
+ {
+ menuItemID= ID_SHOW;
+ }
+ else
+ {
+ menuItemID= IDM_EXIT;
+
+ }
+
+ if( GetMenuItemInfo(hPopup,menuItemID,FALSE,&mii))
+ {
+ char *tmpBuff = NULL;
+
+ tmpBuff = strdup(itemText);
+
+ mii.cch=strlen(itemText);
+ mii.dwTypeData=tmpBuff;
+ SetMenuItemInfo(hPopup,menuItemID,FALSE,&mii);
+
+ free(tmpBuff);
+ }
+ else
+ {
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::ShowPopupMenu Can't GetMenuItemInfo \n"));
+
+ }
+ }
+
+ }
+
+ }
+
::SetForegroundWindow (rhTray::mWnd);
WORD cmd = ::TrackPopupMenu (hPopup, TPM_RIGHTBUTTON | TPM_RETURNCMD,
@@ -644,6 +729,18 @@
/* void setmenuitemtext (in unsigned long aIndex, in string aText); */
NS_IMETHODIMP rhTray::Setmenuitemtext(PRUint32 aIndex, const char *aText)
{
+
+
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Setmenuitemtext index: %d text: %s\n",aIndex, aText));
+
+ if(aIndex >= 0 && aIndex <= 10 && aText)
+ {
+ rhTray::mMenuItemStringMap[aIndex] = aText;
+
+ }
+
+
+
return S_OK;
}
@@ -794,16 +891,16 @@
if(me)
{
- me->HideWindow();
+ //me->HideWindow();
}
PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener Minimize\n"));
- eventClaimed = 1;
+ //eventClaimed = 1;
break;
case HTMAXBUTTON:
PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener:: Maximize \n"));
- eventClaimed = 1;
+ //eventClaimed = 1;
break;
case HTCLOSE:
@@ -812,10 +909,10 @@
if(me)
{
- me->HideWindow();
+ //me->HideWindow();
}
- eventClaimed = 1;
+ //eventClaimed = 1;
break;
@@ -943,9 +1040,9 @@
if(mWnd)
{
PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener:: ShowWindow \n"));
- ::ShowWindow(mWnd,SW_SHOW);
+ //::ShowWindow(mWnd,SW_SHOW);
- ::ShowWindow(mWnd,SW_RESTORE);
+ //::ShowWindow(mWnd,SW_RESTORE);
}
@@ -958,7 +1055,13 @@
PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener:: Hide Window \n"));
- ::ShowWindow(mWnd,SW_MINIMIZE);
+ ::ShowWindow(mWnd,SW_HIDE);
+
+ //Change style to nix the taskbar button
+
+ ::SetWindowLongPtr(mWnd,GWL_EXSTYLE,GetWindowLongPtr(mWnd,GWL_STYLE) | WS_EX_TOOLWINDOW);
+
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener:: Hide Window , try to hide owner window too. \n"));
::ShowWindow(mWnd,SW_HIDE);
}
Index: rhTray.h
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/rhTray.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rhTray.h 13 Sep 2006 17:50:07 -0000 1.2
+++ rhTray.h 25 Oct 2006 03:59:03 -0000 1.3
@@ -68,6 +68,7 @@
#endif
#include <map>
+#include <string>
using namespace std;
// generate unique ID here with uuidgen
@@ -142,6 +143,8 @@
static map< nsIBaseWindow *, rhTrayWindowListener *> mWindowMap;
+ static map<unsigned int,string> mMenuItemStringMap;
+
static HRESULT ShowPopupMenu (WORD PopupMenuResource);
HRESULT AddListener(nsIBaseWindow *aBaseWindow);
@@ -343,6 +346,8 @@
static EventHandlerRef mEventHandlerRef;
static EventHandlerUPP mEventHandlerUPP;
+ static MenuRef mDockMenu;
+ static MenuRef mRootMenu;
// Icon menu related
17 years, 5 months
[Fedora-directory-commits] esc/src/app/xpcom CoolKeyCSP.cpp, 1.2, 1.3 CoolKeyCSP.h, 1.1.1.1, 1.2 Makefile.moz, 1.3, 1.4 openkey.h, 1.1.1.1, 1.2 rhCoolKey.cpp, 1.3, 1.4
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xpcom
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9499
Modified Files:
CoolKeyCSP.cpp CoolKeyCSP.h Makefile.moz openkey.h
rhCoolKey.cpp
Log Message:
Latest mac/win fixes.
Index: CoolKeyCSP.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/CoolKeyCSP.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CoolKeyCSP.cpp 13 Sep 2006 17:50:07 -0000 1.2
+++ CoolKeyCSP.cpp 25 Oct 2006 03:58:16 -0000 1.3
@@ -24,6 +24,8 @@
#include "openkey.h"
#include "CoolKeyCSP.h"
+
+
#define MAX_CONTAINER_NAME 128
#define MAX_KEY_ID 128
@@ -45,7 +47,7 @@
{
CryptAcquireContext(&CoolKeyCSPKeyListener::mCryptProv, NULL,
- OPENKEY_PROV, PROV_RSA_FULL,CRYPT_VERIFYCONTEXT);
+ OPENKEY_PROV, PROV_RSA_FULL,NULL);
}
@@ -73,6 +75,9 @@
const char *keyID,
HCERTSTORE hCertStore)
{
+
+ PR_LOG( coolKeyCSPLog, PR_LOG_DEBUG, ("CoolKeyCSPListener::AddCert %p \n",(void *) pbCert));
+
BOOL rv = TRUE;
PCCERT_CONTEXT pCertContext = CertCreateCertificateContext(
X509_ASN_ENCODING, pbCert, cbCert);
@@ -93,7 +98,7 @@
blob.cbData = (DWORD) (wcslen(OPENKEY_NAME_W)+1) * sizeof(wchar_t);
blob.pbData = (BYTE *) OPENKEY_NAME_W;
if (!CertSetCertificateContextProperty(pCertContext,
- CERT_FRIENDLY_NAME_PROP_ID, 0, &blob))
+ CERT_FRIENDLY_NAME_PROP_ID, 0, &blob))
{
rv = FALSE;
goto failed;
@@ -108,7 +113,7 @@
// CERT_SET_KEY_PROV_HANDLE_PROP_ID.
keyProvInfo.dwKeySpec = dwKeySpec;
if (!CertSetCertificateContextProperty(pCertContext,
- CERT_KEY_PROV_INFO_PROP_ID, 0, &keyProvInfo))
+ CERT_KEY_PROV_INFO_PROP_ID, 0, &keyProvInfo))
{
rv = FALSE;
goto failed;
@@ -144,12 +149,17 @@
//
// Return TRUE on success, FALSE on failure.
+
static BOOL
GetCert(
HCRYPTKEY hKey,
BYTE **ppbCert,
DWORD *pcbCert)
{
+
+
+ PR_LOG( coolKeyCSPLog, PR_LOG_DEBUG, ("GetCert kKey %d \n",hKey));
+
BYTE *pbCert;
DWORD cbCert;
if (!CryptGetKeyParam(hKey, KP_CERTIFICATE, NULL, &cbCert, 0))
@@ -171,6 +181,92 @@
return TRUE;
}
+// GetISCACert
+//
+// Return whether or not the presented cert is a CA cert.
+//
+// Return TRUE on success, FALSE on failure.
+
+static
+BOOL GetISCACert(const BYTE *cert, DWORD certSize)
+{
+ BOOL rv = false;
+
+ PCCERT_CONTEXT certContext = 0;
+
+
+ PR_LOG( coolKeyCSPLog, PR_LOG_DEBUG, ("GETISCACert cert %p length %d \n.",cert,certSize));
+
+
+
+ PCERT_BASIC_CONSTRAINTS2_INFO pInfo;
+
+
+ DWORD cbInfo = sizeof(CERT_BASIC_CONSTRAINTS2_INFO);
+
+ PR_LOG( coolKeyCSPLog, PR_LOG_DEBUG, ("GETISCACert size of BASIC_CONSTRAINTS structure: %d . \n",cbInfo));
+
+ pInfo = (PCERT_BASIC_CONSTRAINTS2_INFO) LocalAlloc(LPTR,cbInfo);
+
+ if(!pInfo)
+ goto failed;
+
+ certContext =
+ CertCreateCertificateContext(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING ,
+ &cert[0], certSize);
+
+ if (certContext == 0)
+ goto failed;
+
+
+ PCERT_EXTENSION pBC = CertFindExtension(szOID_BASIC_CONSTRAINTS2,
+ certContext->pCertInfo->cExtension, certContext->pCertInfo->rgExtension);
+
+ if(!pBC)
+ {
+ PR_LOG( coolKeyCSPLog, PR_LOG_DEBUG, ("GETISCACert Error in getting BASIC_CONSTRAINTS extension. \n."));
+
+ if (certContext)
+ CertFreeCertificateContext(certContext);
+
+ goto failed;
+
+ }
+
+ DWORD cbDecoded = cbInfo;
+
+
+ BOOL dResult = CryptDecodeObject(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING ,
+ X509_BASIC_CONSTRAINTS2,
+ pBC->Value.pbData, pBC->Value.cbData, 0, (void *) pInfo ,&cbDecoded
+ );
+
+ if(!dResult)
+ {
+ DWORD error = GetLastError();
+
+ PR_LOG( coolKeyCSPLog, PR_LOG_DEBUG, ("GETISCACert Error from CtypDecodeObect error: %d size needed %d \n.",error,cbDecoded));
+ }
+ else
+ {
+
+ PR_LOG( coolKeyCSPLog, PR_LOG_DEBUG, ("GETISCACert found result %d \n.",pInfo->fCA));
+ rv = (BOOL) pInfo->fCA;
+ }
+
+failed:
+
+ if (certContext)
+ CertFreeCertificateContext(certContext);
+
+ if(pInfo)
+ LocalFree(pInfo);
+
+ return rv;
+}
+
+
+
// PropCertsInContainer
//
// Propagate the certs in the key container named szContainer to
@@ -183,8 +279,11 @@
PropCertsInContainer(
const char *keyID,
const char *szContainer,
- HCERTSTORE hCertStore)
+ HCERTSTORE hCertStore,HCERTSTORE hCACertStore = NULL)
{
+
+ PR_LOG( coolKeyCSPLog, PR_LOG_DEBUG, ("PropCertsInContainer %s \n",(char *)szContainer));
+
BOOL rv = TRUE;
HCRYPTPROV hCryptProv = CoolKeyCSPKeyListener::GetCryptHandle();
@@ -211,22 +310,33 @@
// If anything fails, we go on to propagate the next cert.
+ PR_LOG( coolKeyCSPLog, PR_LOG_DEBUG, ("PropCertsInContainer dwNumKeySpec %d \n",dwNumKeySpec));
+
for (i = 0; i < dwNumKeySpec; i++)
{
HCRYPTKEY hUserKey = NULL;
if (!CryptGetUserKey(hCryptProv, dwKeySpec[i], &hUserKey))
{
+ PR_LOG( coolKeyCSPLog, PR_LOG_DEBUG, ("PropCertsInContainer No user key in this cert. Check to see if it is a CA cert. Error %d. \n",GetLastError()));
// NTE_NO_KEY means there is no key of this type and is
// not a real error.
if (GetLastError() != NTE_NO_KEY)
{
rv = FALSE;
}
- continue;
+
+
+ continue;
}
+
PBYTE pbCert = NULL;
DWORD cbCert = 0;
BOOL bOK = GetCert(hUserKey, &pbCert, &cbCert);
+
+
+ PR_LOG( coolKeyCSPLog, PR_LOG_DEBUG, ("PropCertsInContainer Result of GetCert %d \n",bOK));
+
+
if (!CryptDestroyKey(hUserKey))
{
// Should not happen.
@@ -248,13 +358,8 @@
}
failed:
+ PR_LOG( coolKeyCSPLog, PR_LOG_DEBUG, ("PropCertsInContainer We have reached the failed block. \n"));
free(wszContainer);
-/* if (!CryptReleaseContext(hContext, 0))
- {
- rv = FALSE;
- }
-
-*/
return rv;
}
@@ -271,6 +376,11 @@
{
BOOL rv = TRUE;
BOOL hasReader = (BOOL) CoolKeyHasReader(aKey);
+
+
+ PR_LOG( coolKeyCSPLog, PR_LOG_DEBUG, ("CoolKeyCSPListener::PropCerts. \n"));
+
+
if (!hasReader)
{
return FALSE;
@@ -288,6 +398,15 @@
goto failed;
}
+
+ HCERTSTORE hCACertStore = CertOpenSystemStore(NULL,"CA");
+
+ if(!hCACertStore)
+ {
+ rv = FALSE;
+ goto failed;
+ }
+
// Enumerate the key containers in our CSP and acquire
// context for each of them.
@@ -304,8 +423,37 @@
// XXX the container name should be fully qualified:
// \\.\reader\container
// But our CSP only recognizes simple container names.
- PropCertsInContainer(aKey->mKeyID, szContainer, hCertStore);
- dwContainerLen = sizeof szContainer;
+
+ PR_LOG( coolKeyCSPLog, PR_LOG_DEBUG, ("CoolKeyCSPListener::PropCerts container %s \n",(char *) szContainer));
+
+ dwContainerLen = sizeof szContainer;
+
+ if(dwContainerLen)
+ {
+
+ if(CryptAcquireContext(&CoolKeyCSPKeyListener::mCryptProv, szContainer,
+ OPENKEY_PROV, PROV_RSA_FULL,0))
+ {
+ PR_LOG( coolKeyCSPLog, PR_LOG_DEBUG, ("CoolKeyCSPListener::PropCerts: about to call PropCertsInContainer %s \n",szContainer));
+ PropCertsInContainer(aKey->mKeyID, szContainer, hCertStore);
+
+ }
+ else
+ {
+
+ PR_LOG( coolKeyCSPLog, PR_LOG_DEBUG, ("CoolKeyCSPListener::PropCerts: failed to acquire context: %s \n.",szContainer));
+
+ }
+ }
+
+
+ if(CoolKeyCSPKeyListener::mCryptProv)
+ {
+ CryptReleaseContext(CoolKeyCSPKeyListener::mCryptProv, 0);
+ CoolKeyCSPKeyListener::mCryptProv = 0;
+
+ }
+
dwFlags = 0;
}
@@ -314,12 +462,12 @@
{
rv = FALSE;
}
-/* if (!CryptReleaseContext(hCryptProv, 0))
+
+ if (!CertCloseStore(hCACertStore, CERT_CLOSE_STORE_CHECK_FLAG))
{
rv = FALSE;
}
-*/
return rv;
}
@@ -412,4 +560,5 @@
}
+
NS_IMPL_ISUPPORTS1(CoolKeyCSPKeyListener,rhIKeyNotify)
Index: CoolKeyCSP.h
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/CoolKeyCSP.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- CoolKeyCSP.h 12 Jun 2006 23:39:49 -0000 1.1.1.1
+++ CoolKeyCSP.h 25 Oct 2006 03:58:16 -0000 1.2
@@ -32,10 +32,8 @@
static HCRYPTPROV GetCryptHandle();
+ static HCRYPTPROV mCryptProv;
-private:
-
- static HCRYPTPROV mCryptProv ;
};
#endif
Index: Makefile.moz
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/Makefile.moz,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.moz 27 Sep 2006 17:22:20 -0000 1.3
+++ Makefile.moz 25 Oct 2006 03:58:16 -0000 1.4
@@ -26,7 +26,6 @@
CORE_DIST = $(CORE_DEPTH)/dist/$(OBJDIR)
CORE_INC = $(CORE_DEPTH)/dist/public
MDDEPDIR := $(OBJDIR)/.deps
-DESTDIR = $(MOZ_OBJDIR)/install
NO_DIST_INSTALL = 1
@@ -37,6 +36,9 @@
DEPLOY_OBJDIR = $(CORE_DEPTH)/dist/$(OBJDIR)/esc_build
XULRUNNER_ZIP_NAME = xulrunner-1.8.0.1.*.tar.gz
+ifeq ($(OS_ARCH),WINNT)
+XULRUNNER_ZIP_NAME = xulrunner-1.8.0.1.*.win32.zip
+endif
XULRUNNER_BIN_PATH = $(MOZ_OBJDIR)/dist/xulrunner
XULRUNNER_EXEC = xulrunner
ifeq ($(OS_ARCH), Darwin)
@@ -46,6 +48,13 @@
XULRUNNER_FRAME_BASE = ESC.app/Contents/Frameworks
endif
+DEPLOY_OFFSET=/esc
+
+ifeq ($(OS_ARCH),Linux)
+DEPLOY_OFFSET=/src
+DESTDIR=$(MOZ_OBJDIR)/install
+endif
+
ifeq ($(OS_ARCH), WINNT)
OS_LIBS += crypt32.lib
CSPSRCS = CoolKeyCSP.cpp
@@ -74,6 +83,10 @@
DEFINES += -DXPCOM_GLUE $(GECKO_INCLUDES) -I$(CORE_INC)/ckymanager -I$(CORE_INC)/httpchuncked -I./_xpidlgen
+ifdef ESC_VERSION
+DEFINES += -DESC_VERSION=$(ESC_VERSION)
+endif
+
REQUIRES = string \
xpcom \
$(NULL)
@@ -115,7 +128,7 @@
clean::
rm -f Makefile.in
rm -rf $(DEPLOY_OBJDIR)
- rm -rf $(CORE_DEPTH)/src/app/xul/esc/esc
+ rm -rf $(CORE_DEPTH)$(DEPLOY_OFFSET)/app/xul/esc/esc
deploy: $(DEPLOY_OBJDIR)
echo "deploy! on $(OS_ARCH)"
@@ -160,14 +173,14 @@
$(DEPLOY_OBJDIR):
echo "Installing!"
- $(NSINSTALL) ./$(LIB_PREFIX)rhCoolKey$(DLL_SUFFIX) $(CORE_DEPTH)/src/app/xul/esc/components
- $(NSINSTALL) ./_xpidlgen/*.xpt $(CORE_DEPTH)/src/app/xul/esc/components
+ $(NSINSTALL) ./$(LIB_PREFIX)rhCoolKey$(DLL_SUFFIX) $(CORE_DEPTH)$(DEPLOY_OFFSET)/app/xul/esc/components
+ $(NSINSTALL) ./_xpidlgen/*.xpt $(CORE_DEPTH)$(DEPLOY_OFFSET)/app/xul/esc/components
echo "Creating $(DEPLOY_OBJDIR)"
mkdir $(DEPLOY_OBJDIR)
- cd $(CORE_DEPTH)/src/app/xul/esc; zip -r test.zip * -x *\CVS\* \*.fix*; unzip -d esc test.zip ; rm -f test.zip
- $(XULRUNNER_BIN_PATH)/$(XULRUNNER_EXEC) --install-app $(CORE_DEPTH)/src/app/xul/esc/esc $(DEPLOY_OBJDIR)
+ cd $(CORE_DEPTH)/$(DEPLOY_OFFSET)/app/xul/esc; zip -r test.zip * -x *\CVS\* \*.fix*; unzip -d esc test.zip ; rm -f test.zip
+ $(XULRUNNER_BIN_PATH)/$(XULRUNNER_EXEC) --install-app $(CORE_DEPTH)$(DEPLOY_OFFSET)/app/xul/esc/esc $(DEPLOY_OBJDIR)
ifeq ($(OS_ARCH), Darwin)
@@ -178,8 +191,11 @@
endif
#cp -Rf -v $(XULRUNNER_BIN_PATH) $(DEPLOY_OBJDIR)/$(XULRUNNER_FRAME_DEST)
+ifeq ($(OS_ARCH),Linux)
tar -xzvf $(MOZ_OBJDIR)/dist/$(XULRUNNER_ZIP_NAME) -C $(DEPLOY_OBJDIR)/$(XULRUNNER_FRAME_DEST)/esc
+endif
ifeq ($(OS_ARCH),WINNT)
+ unzip $(MOZ_OBJDIR)/dist/$(XULRUNNER_ZIP_NAME) -d $(DEPLOY_OBJDIR)/$(XULRUNNER_FRAME_DEST)/esc
cp -f $(XPCOM_EXTRA) $(DEPLOY_OBJDIR)/ESC/components
endif
ifdef DESTDIR
Index: openkey.h
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/openkey.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- openkey.h 12 Jun 2006 23:39:49 -0000 1.1.1.1
+++ openkey.h 25 Oct 2006 03:58:16 -0000 1.2
@@ -18,13 +18,13 @@
#ifndef _OPENKEY_H
#define _OPENKEY_H 1
-#define OPENKEY_CARD_NAME "OpenKey Card Type"
-#define OPENKEY_CARD_NAME_MS "OpenKey Card Type\0" /* a multi-string */
+#define OPENKEY_CARD_NAME "CoolKey Card Type"
+#define OPENKEY_CARD_NAME_MS "CoolKey Card Type\0" /* a multi-string */
#define OPENKEY_PROV "Identity Alliance CSP"
#define OPENKEY_PROV_W L"Identity Alliance CSP"
-#define OPENKEY_NAME_W L"OpenKey"
+#define OPENKEY_NAME_W L"CoolKey"
/*
* User-defined certificate properties must faill in the range
Index: rhCoolKey.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/rhCoolKey.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rhCoolKey.cpp 27 Sep 2006 17:22:20 -0000 1.3
+++ rhCoolKey.cpp 25 Oct 2006 03:58:16 -0000 1.4
@@ -32,6 +32,7 @@
#endif
#include "nsIPrefBranch.h"
+#include "nsIPrefService.h"
#include "nsCOMPtr.h"
#include "nsIProxyObjectManager.h"
#include "nsIObserver.h"
@@ -43,6 +44,14 @@
#include <vector>
#include <string>
+
+#define STRINGIFY(x) #x
+#define GETSTRING(x) STRINGIFY(x)
+
+#ifndef ESC_VERSION
+#define ESC_VERSION 1.0.0-0
+#endif
+
#include <prlog.h>
#define COOL_MAX_PATH 1024
#define MAX_STR_LEN COOL_MAX_PATH
@@ -259,7 +268,7 @@
}
- nsCOMPtr<nsIPrefBranch> pref;
+ nsCOMPtr<nsIPrefService> pref;
pref = do_GetService("@mozilla.org/preferences-service;1");
if(!pref)
@@ -268,8 +277,15 @@
}
- pref->SetCharPref(aName, aValue);
+ nsCOMPtr<nsIPrefBranch> pBranch;
+ pref->GetBranch(nsnull,getter_AddRefs(pBranch));
+
+ if(pBranch)
+ {
+ pBranch->SetCharPref(aName, aValue);
+ pref->SavePrefFile(nsnull);
+ }
return S_OK;
@@ -1358,10 +1374,9 @@
{
PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::GetCoolKeyVersion \n"));
- char *version = "1.0.0-16";
+ char *version = GETSTRING(ESC_VERSION);
char *versionVal = (char *) nsMemory::Clone(version,sizeof(char) * strlen(version) + 1);
-
*_retval = versionVal;
17 years, 5 months
[Fedora-directory-commits] esc/src/app/daemon escd.cpp, 1.1, 1.2 manifest.mn, 1.1, 1.2
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/app/daemon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9469
Modified Files:
escd.cpp manifest.mn
Log Message:
Latest fixes.
Index: escd.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/app/daemon/escd.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- escd.cpp 27 Sep 2006 17:10:02 -0000 1.1
+++ escd.cpp 25 Oct 2006 03:56:57 -0000 1.2
@@ -67,9 +67,6 @@
PR_DestroyLock(mDataLock);
- if(single)
- delete single;
-
exit(0);
}
Index: manifest.mn
===================================================================
RCS file: /cvs/dirsec/esc/src/app/daemon/manifest.mn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- manifest.mn 27 Sep 2006 17:10:02 -0000 1.1
+++ manifest.mn 25 Oct 2006 03:56:57 -0000 1.2
@@ -20,15 +20,23 @@
CORE_DIST= $(CORE_DEPTH)/dist/
SYS_INC= /usr/include
+
+XULRUNNER_LIBS_LDFLAGS=
ifndef MOZ_OFFSET
MOZ_OFFSET = mozilla-1.7.13
+else
+XULRUNNER_LIBS_LDFLAGS=$(CORE_DIST)/$(OBJDIR)/xulrunner_build/dist/lib
endif
+
+
DEFINES += -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss
+DEFINES += $(shell pkg-config --cflags xft)
+
CPPFLAGS += $(DEFINES) -g
-LDFLAGS += -lstdc++ -L$(CORE_DIST)/$(OBJDIR)/lib -lnss3 -lnspr4 -lssl3 -lckyapplet -lX11
+LDFLAGS += -lstdc++ -L$(CORE_DIST)/$(OBJDIR)/lib -L$(XULRUNNER_LIBS_LDFLAGS) -lnss3 -lnspr4 -lssl3 -lckyapplet $(shell pkg-config --libs xft)
LDFLAGS += -lckymanager -lhttpchunked
# MODULE public and private header directories are implicitly REQUIRED.
17 years, 5 months
[Fedora-directory-commits] ldapserver/ldap/servers/snmp Makefile, 1.12, 1.13
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/snmp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28074/ldap/servers/snmp
Modified Files:
Makefile
Log Message:
Resolves: #210947
Summary: parameterizing the hardcoded paths (phase 3. installed binaries, change log, setup)
Comment #23
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/snmp/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile 29 Mar 2006 19:46:44 -0000 1.12
+++ Makefile 25 Oct 2006 00:05:18 -0000 1.13
@@ -89,9 +89,9 @@
EXTRA_LIBS += $(NETSNMP_LINK) $(EXTERNAL_AGENT_LIBS)
endif
-# the redhat-directory.mib goes in the plugins/snmp directory, and the other mib like
-# files go in the plugins/snmp/mibs directory
-MIB_DEST_DIR = $(RELDIR)/plugins/snmp
+# the redhat-directory.mib goes in the _datadir/brand-ds/plugins/snmp directory, and the other mib like
+# files go in the _datadir/brand-ds/plugins/snmp/mibs directory
+MIB_DEST_DIR = $(RELDIR)/$(DS_PLUGINDIR)/snmp
MIB_SRC_FILES =redhat-directory.mib
MIBS_DEST_DIR = $(MIB_DEST_DIR)/mibs
MIBS_SRC_FILES = NETWORK-SERVICES-MIB.txt \
17 years, 5 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd/tools/rsearch Makefile, 1.3, 1.4
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28074/ldap/servers/slapd/tools/rsearch
Modified Files:
Makefile
Log Message:
Resolves: #210947
Summary: parameterizing the hardcoded paths (phase 3. installed binaries, change log, setup)
Comment #23
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile 28 Aug 2006 23:23:59 -0000 1.3
+++ Makefile 25 Oct 2006 00:05:17 -0000 1.4
@@ -49,8 +49,8 @@
NSPR20=true # probably should be defined somewhere else (not sure where)
OBJDEST = $(OBJDIR)/servers/tools/obj
-BINDIR = $(RELDIR)/shared/bin
-DATDIR = $(RELDIR)/shared/data
+BINDIR = $(RELDIR)/usr/bin
+DATDIR = $(RELDIR)/usr/share/$(DS_BRAND)-ds/data
include $(BUILD_ROOT)/nsdefs.mk
include $(BUILD_ROOT)/nsconfig.mk
17 years, 5 months