diff options
Diffstat (limited to 'usr/src/lib/libkmsagent')
| -rw-r--r-- | usr/src/lib/libkmsagent/Makefile.com | 3 | ||||
| -rw-r--r-- | usr/src/lib/libkmsagent/amd64/Makefile | 9 | ||||
| -rw-r--r-- | usr/src/lib/libkmsagent/common/KMSAgent.cpp | 17 | ||||
| -rw-r--r-- | usr/src/lib/libkmsagent/sparcv9/Makefile | 9 |
4 files changed, 14 insertions, 24 deletions
diff --git a/usr/src/lib/libkmsagent/Makefile.com b/usr/src/lib/libkmsagent/Makefile.com index cba1111887..4b1fe9dd12 100644 --- a/usr/src/lib/libkmsagent/Makefile.com +++ b/usr/src/lib/libkmsagent/Makefile.com @@ -85,8 +85,7 @@ CCOBJS = $(LIB_CPP_OBJECTS:%.o=pics/%.o) \ LIBS = $(DYNLIB) -CCNEEDED = -lCstd -lCrun -$(__GNUC)CCNEEDED = -L$(SFWLIBDIR) -R$(SFWLIBDIR) -lstdc++ -lgcc_s +$(__SUNC)CCNEEDED = -lCstd -lCrun LDLIBS += $(CCNEEDED) -lpam -lc -lsoftcrypto -lcrypto -lssl -lsocket LDLIBS64 += $(CCNEEDED) -lpam -lc -lsoftcrypto -lcrypto -lssl -lsocket diff --git a/usr/src/lib/libkmsagent/amd64/Makefile b/usr/src/lib/libkmsagent/amd64/Makefile index 1268f351e4..c1ec486658 100644 --- a/usr/src/lib/libkmsagent/amd64/Makefile +++ b/usr/src/lib/libkmsagent/amd64/Makefile @@ -31,13 +31,6 @@ include $(SRC)/lib/Makefile.lib.64 # CCNEEDED must be modified for 64-bit because the default only includes # -lCrun # -CCNEEDED = -lCstd -lCrun - -# -# If linking with gcc, we must fix the CCNEEDED and LDLIBS64 -# to get a clean link without duplicates. -# -$(__GNUC)CCNEEDED = -L$(SFWLIBDIR) -R$(SFWLIBDIR) -lstdc++ -lgcc_s -$(__GNUC)LDLIBS64 += $(CCNEEDED) +$(__SUNC)CCNEEDED = -lCstd -lCrun install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libkmsagent/common/KMSAgent.cpp b/usr/src/lib/libkmsagent/common/KMSAgent.cpp index 3d34ea571f..bb95e737c6 100644 --- a/usr/src/lib/libkmsagent/common/KMSAgent.cpp +++ b/usr/src/lib/libkmsagent/common/KMSAgent.cpp @@ -1518,8 +1518,9 @@ KMS_AGENT_STATUS KMSAgent_CreateKey ( CAutoMutex oAutoMutex((K_MUTEX_HANDLE) i_pProfile->m_pLock); struct KMS_Agent::KMS_Agent__DataUnit - stDataUnit = {"", "", "", "", - (KMS_Agent::KMS_Agent__DataUnitState) 0}; + stDataUnit = {(char *)"", (char *)"", (char *)"", + (char *)"", + (KMS_Agent::KMS_Agent__DataUnitState) 0}; struct soap *pstSoap = (struct soap *) i_pProfile->m_pvSoap; struct KMS_Agent::KMS_Agent__CreateKeyResponse oResponse; @@ -2120,7 +2121,8 @@ KMS_AGENT_STATUS KMSAgent_DisassociateDataUnitKeys ( CAutoMutex oAutoMutex((K_MUTEX_HANDLE) i_pProfile->m_pLock); - struct KMS_Agent::KMS_Agent__DataUnit stDataUnit = {"", "", "", "", + struct KMS_Agent::KMS_Agent__DataUnit stDataUnit = {(char *)"", + (char *)"", (char *)"", (char *)"", (KMS_Agent::KMS_Agent__DataUnitState) 0}; struct soap *pstSoap = (struct soap *) i_pProfile->m_pvSoap; @@ -2262,7 +2264,8 @@ KMS_AGENT_STATUS KMSAgent_RetrieveKey ( RETURN(KMS_AGENT_STATUS_INVALID_PARAMETER); } - struct KMS_Agent::KMS_Agent__DataUnit stDataUnit = {"", "", "", "", + struct KMS_Agent::KMS_Agent__DataUnit stDataUnit = { + (char *)"", (char *)"", (char *)"", (char *)"", (KMS_Agent::KMS_Agent__DataUnitState) 0}; struct soap *pstSoap = (struct soap *) i_pProfile->m_pvSoap; @@ -3146,7 +3149,8 @@ KMS_AGENT_STATUS KMSAgent_RetrieveDataUnitKeys ( // prepare args to soap transaction - struct KMS_Agent::KMS_Agent__DataUnit stDataUnit = {"", "", "", "", + struct KMS_Agent::KMS_Agent__DataUnit stDataUnit = { + (char *)"", (char *)"", (char *)"", (char *)"", (KMS_Agent::KMS_Agent__DataUnitState) 0}; struct soap *pstSoap = (struct soap *) i_pProfile->m_pvSoap; @@ -3380,7 +3384,8 @@ KMS_AGENT_STATUS KMSAgent_RetrieveProtectAndProcessKey ( CAutoMutex oAutoMutex((K_MUTEX_HANDLE) i_pProfile->m_pLock); - struct KMS_Agent::KMS_Agent__DataUnit stDataUnit ={"", "", "", "", + struct KMS_Agent::KMS_Agent__DataUnit stDataUnit = { + (char *)"", (char *)"", (char *)"", (char *)"", (KMS_Agent::KMS_Agent__DataUnitState) 0}; struct soap *pstSoap = (struct soap *) i_pProfile->m_pvSoap; diff --git a/usr/src/lib/libkmsagent/sparcv9/Makefile b/usr/src/lib/libkmsagent/sparcv9/Makefile index 1268f351e4..c1ec486658 100644 --- a/usr/src/lib/libkmsagent/sparcv9/Makefile +++ b/usr/src/lib/libkmsagent/sparcv9/Makefile @@ -31,13 +31,6 @@ include $(SRC)/lib/Makefile.lib.64 # CCNEEDED must be modified for 64-bit because the default only includes # -lCrun # -CCNEEDED = -lCstd -lCrun - -# -# If linking with gcc, we must fix the CCNEEDED and LDLIBS64 -# to get a clean link without duplicates. -# -$(__GNUC)CCNEEDED = -L$(SFWLIBDIR) -R$(SFWLIBDIR) -lstdc++ -lgcc_s -$(__GNUC)LDLIBS64 += $(CCNEEDED) +$(__SUNC)CCNEEDED = -lCstd -lCrun install: all $(ROOTLIBS64) $(ROOTLINKS64) |