[Fedora-directory-commits] ldapserver configure.ac, 1.59, 1.60 aclocal.m4, 1.81, 1.82 configure, 1.102, 1.103 missing, 1.60, 1.61 install-sh, 1.60, 1.61 depcomp, 1.60, 1.61 compile, 1.53, 1.54 Makefile.in, 1.105, 1.106 config.sub, 1.59, 1.60 config.guess, 1.59, 1.60
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6706
Modified Files:
configure.ac aclocal.m4 configure missing install-sh depcomp
compile Makefile.in config.sub config.guess
Log Message:
bump version to 1.2.0
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- configure.ac 17 Mar 2009 01:00:25 -0000 1.59
+++ configure.ac 30 Mar 2009 22:32:35 -0000 1.60
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
# This version is the version returned by ns-slapd -v
-AC_INIT([dirsrv], [1.1.4], [http://bugzilla.redhat.com/])
+AC_INIT([dirsrv], [1.2.0], [http://bugzilla.redhat.com/])
# AC_CONFIG_HEADER must be called right after AC_INIT.
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- configure 17 Mar 2009 01:00:25 -0000 1.102
+++ configure 30 Mar 2009 22:32:35 -0000 1.103
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for dirsrv 1.1.4.
+# Generated by GNU Autoconf 2.59 for dirsrv 1.2.0.
#
# Report bugs to <http://bugzilla.redhat.com/>.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='dirsrv'
PACKAGE_TARNAME='dirsrv'
-PACKAGE_VERSION='1.1.4'
-PACKAGE_STRING='dirsrv 1.1.4'
+PACKAGE_VERSION='1.2.0'
+PACKAGE_STRING='dirsrv 1.2.0'
PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
# Factoring default headers for most tests.
@@ -962,7 +962,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures dirsrv 1.1.4 to adapt to many kinds of systems.
+\`configure' configures dirsrv 1.2.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1028,7 +1028,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of dirsrv 1.1.4:";;
+ short | recursive ) echo "Configuration of dirsrv 1.2.0:";;
esac
cat <<\_ACEOF
@@ -1234,7 +1234,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-dirsrv configure 1.1.4
+dirsrv configure 1.2.0
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1248,7 +1248,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by dirsrv $as_me 1.1.4, which was
+It was created by dirsrv $as_me 1.2.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1894,7 +1894,7 @@
# Define the identity of the package.
PACKAGE='dirsrv'
- VERSION='1.1.4'
+ VERSION='1.2.0'
cat >>confdefs.h <<_ACEOF
@@ -26865,7 +26865,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by dirsrv $as_me 1.1.4, which was
+This file was extended by dirsrv $as_me 1.2.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -26928,7 +26928,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-dirsrv config.status 1.1.4
+dirsrv config.status 1.2.0
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
15 years
[Fedora-directory-commits] esc/win32 setup.iss,1.5,1.6
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/win32
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30998
Modified Files:
setup.iss
Log Message:
Bump version no.
Index: setup.iss
===================================================================
RCS file: /cvs/dirsec/esc/win32/setup.iss,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- setup.iss 27 Feb 2009 21:51:20 -0000 1.5
+++ setup.iss 30 Mar 2009 22:05:41 -0000 1.6
@@ -4,28 +4,27 @@
[Setup]
AppName=Smart Card Manager
AppMutex=ESCMutex
-AppVerName=Smart Card Manager 1.1.0-2
-AppPublisher=Fedora.
+AppVerName=Smart Card Manager 1.1.0-3
+AppPublisher=Red Hat, Inc.
CreateAppDir=true
Compression=lzma
SolidCompression=true
MinVersion=0,5.0.2195
ShowLanguageDialog=yes
-OutputBaseFilename=SmartCardManagerSetup-1.1.0-2.win32.i386
-DefaultDirName={pf}\Fedora\ESC
+OutputBaseFilename=SmartCardManagerSetup-1.1.0-3.win32.i386
+DefaultDirName={pf}\Red Hat\ESC
DisableProgramGroupPage=false
-DefaultGroupName=Fedora
+DefaultGroupName=Red Hat
SetupIconFile=BUILD\ESC\components\esc.ico
UninstallDisplayIcon={app}\components\esc.ico
-;WizardImageFile=BUILD\ESC\chrome\content\esc\esc-image-large.bmp
-WizardImageFile=esc-image-large.bmp
+WizardImageFile=BUILD\ESC\chrome\content\esc\esc-image-large.bmp
WizardSmallImageFile=BUILD\ESC\components\esc.bmp
AllowNoIcons=yes
LicenseFile=esc-license.txt
InfoBeforeFile=info-before.txt
InfoAfterFile=info-after.txt
PrivilegesRequired=admin
-VersionInfoVersion=1.1.0.2
+VersionInfoVersion=1.1.0.3
[Files]
@@ -42,11 +41,9 @@
Source: BUILD\egate\egaterdr.sys; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
Source: BUILD\egate\egdrvins1.dll; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
Source: BUILD\egate\eginstall.exe; DestDir: {win}\egate2.4; Flags: ignoreversion
-Source: BUILD\pk11install.exe; DestDir: {app}\PKCS11
-
-;Files related to CSP, comment out if not available
Source: BUILD\clkcsp.dll; DestDir: {sys}; Flags: regserver restartreplace
Source: BUILD\cspres.dll; DestDir: {sys}; Flags: restartreplace
+Source: BUILD\pk11install.exe; DestDir: {app}\PKCS11
Source: BUILD\clkcsp.sig; DestDir: {sys}
Source: BUILD\atl71.dll; DestDir: {sys}; Flags: uninsneveruninstall onlyifdoesntexist
@@ -447,10 +444,7 @@
LogFile=inst.log
LogFileAppend=false
[Registry]
-
-;The following lines register the CSP. Comment out if not available
Root: HKLM; Subkey: Software\Microsoft\Cryptography\Defaults\Provider\CoolKey PKCS #11 CSP; ValueType: string; ValueName: PKCS11Module; ValueData: coolkeypk11.dll; Flags: uninsdeletekey
-
Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer; ValueType: binary; ValueName: ATRMask; ValueData: ff ff ff ff ff ff ff ff 00 00; Flags: uninsdeletekey
Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer; ValueType: string; ValueName: Crypto Provider; ValueData: CoolKey PKCS #11 CSP
Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer; ValueType: binary; ValueName: ATR; ValueData: 3b 75 94 00 00 62 02 02 00 00
15 years
[Fedora-directory-commits] esc/win32 build.sh,1.7,1.8
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/win32
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30357
Modified Files:
build.sh
Log Message:
Bump version no.
Index: build.sh
===================================================================
RCS file: /cvs/dirsec/esc/win32/build.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.sh 27 Feb 2009 21:51:20 -0000 1.7
+++ build.sh 30 Mar 2009 22:03:00 -0000 1.8
@@ -76,7 +76,7 @@
#ESC values
ESC_NAME=esc
-ESC_VERSION_NO=1.1.0-2
+ESC_VERSION_NO=1.1.0-3
#Cygwin values
15 years
[Fedora-directory-commits] winsync/passwordsync/passhook passhook.mak, 1.11, 1.12
by Nathan Kinder
Author: nkinder
Update of /cvs/dirsec/winsync/passwordsync/passhook
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv348/passwordsync/passhook
Modified Files:
passhook.mak
Log Message:
Related: 490048
Summary: Fixed debug passsync builds.
Index: passhook.mak
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/passhook/passhook.mak,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- passhook.mak 16 Feb 2009 22:37:32 -0000 1.11
+++ passhook.mak 30 Mar 2009 18:15:29 -0000 1.12
@@ -94,11 +94,16 @@
$(CPP_PROJ) $<
<<
-.cpp{$(INTDIR)}.obj::
+{.\}.cpp{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
+{..\}.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
.cxx{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
@@ -172,11 +177,16 @@
$(CPP_PROJ) $<
<<
-.cpp{$(INTDIR)}.obj::
+{.\}.cpp{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
+{..\}.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
.cxx{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
@@ -228,19 +238,3 @@
!ENDIF
!ENDIF
-
-!IF "$(CFG)" == "passhook - Win32 Release" || "$(CFG)" == "passhook - Win32 Debug"
-SOURCE=..\passhand.cpp
-
-"$(INTDIR)\passhand.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\passhook.cpp
-
-"$(INTDIR)\passhook.obj" : $(SOURCE) "$(INTDIR)"
-
-
-
-!ENDIF
-
15 years
[Fedora-directory-commits] winsync/passwordsync/passsync passsync.mak, 1.8, 1.9 service.cpp, 1.7, 1.8 syncserv.cpp, 1.15, 1.16
by Nathan Kinder
Author: nkinder
Update of /cvs/dirsec/winsync/passwordsync/passsync
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv348/passwordsync/passsync
Modified Files:
passsync.mak service.cpp syncserv.cpp
Log Message:
Related: 490048
Summary: Fixed debug passsync builds.
Index: passsync.mak
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/passsync/passsync.mak,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- passsync.mak 16 Feb 2009 22:20:21 -0000 1.8
+++ passsync.mak 30 Mar 2009 18:15:29 -0000 1.9
@@ -90,18 +90,23 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\passsync.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\passsync.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
-.cpp{$(INTDIR)}.obj::
+{.\}.cpp{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
+{..\}.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
.cxx{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
@@ -167,18 +172,23 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\passsync.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\passsync.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
-.cpp{$(INTDIR)}.obj::
+{.\}.cpp{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
+{..\}.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
.cxx{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
@@ -229,34 +239,3 @@
!ENDIF
!ENDIF
-
-!IF "$(CFG)" == "passsync - Win32 Release" || "$(CFG)" == "passsync - Win32 Debug"
-SOURCE=.\ntservice.cpp
-
-"$(INTDIR)\ntservice.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE=..\passhand.cpp
-
-"$(INTDIR)\passhand.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\service.cpp
-
-"$(INTDIR)\service.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE=.\subuniutil.cpp
-
-"$(INTDIR)\subuniutil.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE=.\syncserv.cpp
-
-"$(INTDIR)\syncserv.obj" : $(SOURCE) "$(INTDIR)"
-
-
-
-!ENDIF
-
Index: service.cpp
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/passsync/service.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- service.cpp 16 Feb 2009 22:20:21 -0000 1.7
+++ service.cpp 30 Mar 2009 18:15:29 -0000 1.8
@@ -58,11 +58,6 @@
//#include "dsperson.h"
#include "synchcmds.h"
#include "dssynch.h"
-
-#ifdef _DEBUG
-void doDebug( PassSyncService *pSynch );
-#endif // _DEBUG
-
//#include <nspr.h>
/////////////////////////////////////////////////////////////////
@@ -330,9 +325,6 @@
exit(theSynch.m_Status.dwWin32ExitCode);
- ////////// That's it - the rest is debugging stuff //////
-#ifdef _DEBUG
- doDebug( &theSynch );
-#endif
+ ////////// That's it //////
return 0;
}
Index: syncserv.cpp
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/passsync/syncserv.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- syncserv.cpp 13 Feb 2009 23:39:44 -0000 1.15
+++ syncserv.cpp 30 Mar 2009 18:15:29 -0000 1.16
@@ -504,6 +504,11 @@
int result = 0;
char searchFilter[SYNCSERV_BUF_SIZE];
+ if (username == NULL)
+ {
+ goto exit;
+ }
+
if (results != NULL) {
ldap_msgfree(results);
results = NULL;
15 years
[Fedora-directory-commits] esc/src/app/xul/esc/defaults/preferences esc-prefs.js, 1.6, 1.7
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc/defaults/preferences
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28799
Modified Files:
esc-prefs.js
Log Message:
Fix for #491003, global phone home pref.
Index: esc-prefs.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/defaults/preferences/esc-prefs.js,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- esc-prefs.js 27 Feb 2009 03:31:43 -0000 1.6
+++ esc-prefs.js 29 Mar 2009 00:54:57 -0000 1.7
@@ -29,9 +29,6 @@
pref("esc.windows.do.capi","yes");
-#Do we disable the password prompt ?
-
-pref("esc.disable.password.prompt","yes");
#Sample Security Officer Enrollment UI
@@ -39,8 +36,14 @@
#Sample Security Officer Workstation UI
-#pref("esc.security.url","https://test.host.com:7889/cgi-bin/sow/welcome.cgi");
+#pref("esc.security.url","https://dhcp-170.sjc.redhat.com:7889/cgi-bin/sow/welcome.cgi");
#Hide the format button or not.
pref("esc.hide.format","no");
+
+
+#Use this if you absolutely want a global phone home url for all tokens
+#Not recommended!
+
+#pref("esc.global.phone.home.url","http:/test.host.com:7888/cgi-bin/home/index.cgi");
15 years
[Fedora-directory-commits] esc/src/app/xpcom CoolKeyCSP.cpp, 1.3, 1.4
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xpcom
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28330
Modified Files:
CoolKeyCSP.cpp
Log Message:
Fix for Bug# 473982, publish certs to CAPI when enrolled token inserted.
Index: CoolKeyCSP.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/CoolKeyCSP.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CoolKeyCSP.cpp 25 Oct 2006 03:58:16 -0000 1.3
+++ CoolKeyCSP.cpp 29 Mar 2009 00:51:08 -0000 1.4
@@ -537,16 +537,19 @@
PR_LOG( coolKeyCSPLog, PR_LOG_DEBUG, ("CoolKeyCSPListener::RhNotifyStateChange state %d \n",aKeyState));
AutoCoolKey key(aKeyType, aKeyID);
+ int enrolled = CoolKeyIsEnrolled(&key);
switch (aKeyState)
{
- //case eCKState_KeyInserted:
+ case eCKState_KeyInserted:
case eCKState_EnrollmentComplete:
- bOK = PropCerts(&key);
+ if( enrolled) {
+ bOK = PropCerts(&key);
+ }
break;
- //case eCKState_KeyRemoved:
+ case eCKState_KeyRemoved:
case eCKState_FormatComplete:
bOK = RemoveCerts(&key);
15 years
[Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc ESC.js, 1.21, 1.22
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26727
Modified Files:
ESC.js
Log Message:
Fix for #491003, global phone home pref.
Index: ESC.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/ESC.js,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ESC.js 27 Feb 2009 03:31:42 -0000 1.21
+++ ESC.js 29 Mar 2009 00:37:52 -0000 1.22
@@ -54,6 +54,7 @@
const ESC_FACE_TO_FACE_MODE = "esc.face.to.face.mode";
const ESC_SECURITY_URL="esc.security.url";
const ESC_SECURE_URL="esc.secure.url";
+const ESC_GLOBAL_PHONE_HOME_URL= "esc.global.phone.home.url";
const ESC_HIDE_FORMAT="esc.hide.format";
const CLEAN_TOKEN = "cleanToken";
@@ -292,7 +293,12 @@
return true;
}
- //Check for special key since we have no phone home info.
+ //Check for optional global phone home url.
+
+
+ if(!home) {
+ home = GetGlobalPhoneHomeUrl(keyType,keyID);
+ }
var homeRes = false;
@@ -315,6 +321,19 @@
return homeRes;
}
+//Get global phone home url if pref is set
+
+function GetGlobalPhoneHomeUrl(keyType,keyID)
+{
+
+ var globalIssuerURL=null;
+
+ globalIssuerURL = DoCoolKeyGetConfigValue(ESC_GLOBAL_PHONE_HOME_URL);
+
+ return globalIssuerURL;
+
+}
+
//Test Phone Home url in config UI
function DoPhoneHomeTest()
@@ -644,7 +663,7 @@
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
return netkey.GetCoolKeyPolicy(keyType, keyID);
} catch (e) {
- ReportException(getBundleString("errorCoolKeyGetPolicy"), e);
+ //ReportException(getBundleString("errorCoolKeyGetPolicy"), e);
return "";
}
}
15 years
[Fedora-directory-commits] esc/src/lib/coolkey CoolKey.cpp,1.8,1.9
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/src/lib/coolkey
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24209/coolkey
Modified Files:
CoolKey.cpp
Log Message:
Fix for #235474, remove password prompt pref for Security Officer mode.
Index: CoolKey.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/CoolKey.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CoolKey.cpp 25 Jul 2007 20:43:22 -0000 1.8
+++ CoolKey.cpp 29 Mar 2009 00:23:54 -0000 1.9
@@ -266,15 +266,18 @@
CoolKeyReference reference, CoolKeyRelease release,
CoolKeyGetConfigValue getconfigvalue,CoolKeySetConfigValue setconfigvalue)
{
+ char tBuff[56];
g_Dispatch = dispatch;
g_Reference = reference;
g_Release = release;
g_GetConfigValue = getconfigvalue;
g_SetConfigValue = setconfigvalue;
- char * suppressPINPrompt =(char*) CoolKeyGetConfig("esc.disable.password.prompt");
+ char * suppressPINPrompt =(char*) CoolKeyGetConfig("esc.security.url");
+
+ PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s CoolKeySetCallbacks: prompt %s \n", GetTStamp(tBuff,56), suppressPINPrompt));
- if(suppressPINPrompt && !strcmp(suppressPINPrompt,"yes"))
+ if(!suppressPINPrompt)
{
PK11_SetPasswordFunc( CoolKeyVerifyPassword);
}
15 years
[Fedora-directory-commits] ldapserver/ldap/schema 01common.ldif, 1.4, 1.5
by Noriko Hosoi
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/schema
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2051
Modified Files:
01common.ldif
Log Message:
Resolves: #492562
Summary: homePhone is not RFC 1274 compliant
Description: added "homeTelephoneNumber" to the NAME list of "homePhone".
Index: 01common.ldif
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/schema/01common.ldif,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 01common.ldif 14 Jan 2009 15:07:58 -0000 1.4
+++ 01common.ldif 27 Mar 2009 16:45:41 -0000 1.5
@@ -96,7 +96,7 @@
attributeTypes: ( 0.9.2342.19200300.100.1.3 NAME ( 'mail' 'rfc822mailbox' ) DESC 'Standard LDAP attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 X-ORIGIN 'RFC 1274' )
attributeTypes: ( 0.9.2342.19200300.100.1.6 NAME 'roomNumber' DESC 'Standard LDAP attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 X-ORIGIN 'RFC 1274' )
attributeTypes: ( 0.9.2342.19200300.100.1.10 NAME 'manager' DESC 'Standard LDAP attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 X-ORIGIN 'RFC 1274' )
-attributeTypes: ( 0.9.2342.19200300.100.1.20 NAME 'homePhone' DESC 'Standard LDAP attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 X-ORIGIN 'RFC 1274' )
+attributeTypes: ( 0.9.2342.19200300.100.1.20 NAME ( 'homePhone' 'homeTelephoneNumber' ) DESC 'Standard LDAP attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 X-ORIGIN 'RFC 1274' )
attributeTypes: ( 0.9.2342.19200300.100.1.21 NAME 'secretary' DESC 'Standard LDAP attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 X-ORIGIN 'RFC 1274' )
attributeTypes: ( 0.9.2342.19200300.100.1.39 NAME 'homePostalAddress' DESC 'Standard LDAP attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 X-ORIGIN 'RFC 1274' )
attributeTypes: ( 0.9.2342.19200300.100.1.41 NAME ( 'mobile' 'mobileTelephoneNumber' ) DESC 'Standard LDAP attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 X-ORIGIN 'RFC 1274' )
15 years