diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2000-07-10 23:04:17 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2000-07-10 23:04:17 +0000 |
| commit | f35ae45584df89239fbf91fa5d87e373c295382e (patch) | |
| tree | 7bca0c6078b4767337b17dcee1ea8a9dd9698c1c | |
| parent | dd65fedff588236fc743b044a2314b5445f982ce (diff) | |
| download | ATCD-f35ae45584df89239fbf91fa5d87e373c295382e.tar.gz | |
ChangeLogTag:Mon Jul 10 18:59:49 2000 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 11 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP.dsp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Security.idl | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 3f52907bded..7da390ab367 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,14 @@ +Mon Jul 10 18:59:49 2000 Ossama Othman <ossama@uci.edu> + + * orbsvcs/orbsvcs/Security.idl (SecurityORBServiceReady): + + Corrected typo in "SecurityORBServiceRaady." + + * orbsvcs/orbsvcs/SSLIOP.dsp: + + Added missing TAO_Security{d}.lib to list of libraries to link + in SSLIOP{d}.lib against. SSLIOP depends on it. + Mon Jul 10 17:28:55 2000 Ossama Othman <ossama@uci.edu> * orbsvcs/orbsvcs/Security.dsp: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.dsp b/TAO/orbsvcs/orbsvcs/SSLIOP.dsp index 04f2c0fe0b5..ebd8be75d68 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP.dsp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 ACE_SSL.lib ace.lib TAO.lib TAO_Svc_Utils.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_SSLIOP.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\..\ace\SSL"
+# ADD LINK32 ACE_SSL.lib ace.lib TAO.lib TAO_Svc_Utils.lib TAO_Security.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_SSLIOP.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\..\ace\SSL"
!ELSEIF "$(CFG)" == "SSLIOP - Win32 Debug"
@@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ACE_SSLd.lib TAOd.lib aced.lib TAO_Svc_Utilsd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_SSLIOPd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\..\ace\SSL"
+# ADD LINK32 ACE_SSLd.lib TAOd.lib aced.lib TAO_Svc_Utilsd.lib TAO_Securityd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_SSLIOPd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\..\ace\SSL"
# SUBTRACT LINK32 /profile
!ENDIF
diff --git a/TAO/orbsvcs/orbsvcs/Security.idl b/TAO/orbsvcs/orbsvcs/Security.idl index dc258a6247d..8faf50afcd5 100644 --- a/TAO/orbsvcs/orbsvcs/Security.idl +++ b/TAO/orbsvcs/orbsvcs/Security.idl @@ -30,7 +30,7 @@ module Security { const CORBA::ServiceOption SecurityLevel1 = 1; const CORBA::ServiceOption SecurityLevel2 = 2; const CORBA::ServiceOption NonRepudiation = 3; - const CORBA::ServiceOption SecurityORBServiceRaady = 4; + const CORBA::ServiceOption SecurityORBServiceReady = 4; const CORBA::ServiceOption SecurityServiceReady = 5; const CORBA::ServiceOption ReplaceORBServices = 6; const CORBA::ServiceOption ReplaceSecurityServices = 7; |