[149539] Use Cyrus SASL instead of our custom one

Updated Files:
component_versions.mk components.mk internal_comp_deps.mk ldap/cm/Makefile
ldap/servers/slapd/sasl_io.c ldap/servers/slapd/saslbind.c

component_versions.mk

@@ -170,10 +170,10 @@ ifndef JSS_JAR_VERSION
 endif
 
 ifndef SASL_VERSDIR
-  SASL_VERSDIR=sasl_1_0
+  SASL_VERSDIR=cyrus
 endif
 ifndef SASL_RELDATE
-  SASL_RELDATE=20041130
+  SASL_RELDATE=v2.1.20
 endif
 
 # jakarta/axis for DSMLGW

components.mk

@@ -338,26 +338,30 @@ else
   SASL_INCDIR = $(SASL_BUILD_DIR)/include
 endif
 SASL_INCLUDE = $(SASL_INCDIR)
-SASL_LIB_ROOT_NAME = sasl
-# for cyrus it's sasl2
-#SASL_LIB_ROOT_NAME = sasl2
 
 ifeq ($(ARCH), WINNT)
-  SASL_LINK = /LIBPATH:$(SASL_LIBPATH) $(SASL_LIB_ROOT_NAME).lib
+  SASL_LIB_ROOT_NAME = sasl
+  SASL_LINK = /LIBPATH:$(SASL_LIBPATH) lib$(SASL_LIB_ROOT_NAME).lib
+  SASL_LIBS = lib$(SASL_LIB_ROOT_NAME).lib,lib$(SASL_LIB_ROOT_NAME).dll,saslDIGESTMD5.dll
 else
+  # for cyrus it's sasl2
+  SASL_LIB_ROOT_NAME = sasl2
+  SASL_LIBS = lib$(SASL_LIB_ROOT_NAME).a
+  ifeq ($(ARCH), Linux)
+    GSSAPI_LIBS=-L/usr/kerberos/lib -lgssapi_krb5
+  endif
   ifeq ($(ARCH), SOLARIS)
     GSSAPI_LIBS=-lgss
   endif
-#ifeq ($(ARCH), HPUX)
-  GSSAPI_LIBS=-lgss
-#endif
-  ifeq ($(ARCH), Linux)
-    GSSAPI_LIBS=-L/usr/kerberos/lib -lgssapi_krb5
+  ifeq ($(ARCH), HPUX)
+      GSSAPI_LIBS=-lgssapi_krb5
+      ifeq ($(USE_64),1)
+        GSSAPI_LIBS=-L/usr/lib/pa20_64/gss -lgssapi_krb5
+      endif
   endif
+
   SASL_LINK = -L$(SASL_LIBPATH) -l$(SASL_LIB_ROOT_NAME) $(GSSAPI_LIBS)
-#SASL_LINK = -L$(SASL_LIBPATH) -l$(SASL_LIB_ROOT_NAME)
 endif
-
 ###########################################################
 
 ### ICU package ##########################################

internal_comp_deps.mk

@@ -162,8 +162,8 @@ endif
 endif # LDAPSDK_SOURCE_ROOT
 
 ifndef SASL_SOURCE_ROOT
-#SASL_RELEASE = $(COMPONENTS_DIR_DEV)/sasl/$(SASL_VERSDIR)/$(SASL_RELDATE)/$(NSOBJDIR_NAME)
-SASL_RELEASE = $(COMPONENTS_DIR)/sasl/$(SASL_VERSDIR)/$(SASL_RELDATE)/$(NSOBJDIR_NAME)
+SASL_RELEASE = $(COMPONENTS_DIR_DEV)/sasl/$(SASL_VERSDIR)/$(SASL_RELDATE)/$(NSOBJDIR_NAME)
+#SASL_RELEASE = $(COMPONENTS_DIR)/sasl/$(SASL_VERSDIR)/$(SASL_RELDATE)/$(NSOBJDIR_NAME)
 SASL_DEP = $(SASL_INCLUDE)/sasl.h
 ifndef SASL_PULL_METHOD
 SASL_PULL_METHOD = $(COMPONENT_PULL_METHOD)
@@ -173,8 +173,10 @@ $(SASL_DEP): $(NSCP_DISTDIR_FULL_RTL)
 ifdef COMPONENT_DEPS
 	$(FTP_PULL) -method $(SASL_PULL_METHOD) \
 		-objdir $(SASL_BUILD_DIR) -componentdir $(SASL_RELEASE) \
-		-files lib,include
-
+		-files include
+	$(FTP_PULL) -method $(SASL_PULL_METHOD) \
+		-objdir $(SASL_BUILD_DIR)/lib -componentdir $(SASL_RELEASE)/lib \
+		-files $(SASL_LIBS)
 endif
 	-@if [ ! -f $@ ] ; \
 	then echo "Error: could not get component SASL file $@" ; \

ldap/cm/Makefile

@@ -345,6 +345,7 @@ endif # USE_ORGCHART
 # libdb for windows special and smartheap
 ifeq ($(ARCH), WINNT)
 	$(INSTALL) -m 755 $(DB_LIBPATH)/$(DB_LIBNAME).$(DLL_SUFFIX)  $(RELDIR)/bin/slapd/server
+	$(INSTALL) -m 755 $(SASL_LIBPATH)/*.$(DLL_SUFFIX)  $(RELDIR)/bin/slapd/server
 #Install smartheap dll in the server binary directory
 ifeq ($(DEBUG), optimize)
 	$(INSTALL) -m 755 $(SH_LIBPATH)/shsmp.$(DLL_SUFFIX)  $(RELDIR)/bin/slapd/server
@@ -440,7 +441,6 @@ endif
 	then $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/install/*.* $(RELDIR)/manual/en/slapd/install ; \
 	$(INSTALL) -m 644 $(OBJDIR)/manual/slapd/deploy/*.* $(RELDIR)/manual/en/slapd/deploy ; \
 	$(INSTALL) -m 644 $(OBJDIR)/manual/slapd/dsmlgw/*.* $(RELDIR)/manual/en/slapd/dsmlgw ; \
-	$(INSTALL) -m 644 $(OBJDIR)/manual/slapd/dsmlgw/graphics/*.* $(RELDIR)/manual/en/slapd/dsmlgw/graphics ; \
 	$(INSTALL) -m 644 $(OBJDIR)/manual/slapd/gwcust/*.* $(RELDIR)/manual/en/slapd/gwcust ; \
 	$(INSTALL) -m 644 $(OBJDIR)/manual/slapd/gwcust/graphics/*.* $(RELDIR)/manual/en/slapd/gwcust/graphics ; \
 	$(INSTALL) -m 644 $(OBJDIR)/manual/slapd/schema/*.* $(RELDIR)/manual/en/slapd/schema ; \

ldap/servers/slapd/sasl_io.c

@@ -3,7 +3,7 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
-#undef CYRUS_SASL
+#define CYRUS_SASL 1
 
 #include "slap.h"
 #include "slapi-plugin.h"

ldap/servers/slapd/saslbind.c

@@ -4,7 +4,7 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
-#undef CYRUS_SASL
+#define CYRUS_SASL 1
 
 #include <slap.h>
 #include <fe.h>