155460 - Remove crypt password storage from windows build

ldap/admin/src/create_instance.c

@@ -3204,6 +3204,7 @@ char *ds_gen_confs(char *sroot, server_config_s *cf,
     fprintf(f, "nsslapd-pluginenabled: on\n");
     fprintf(f, "\n");
 
+#if !defined(_WIN32)
     fprintf(f, "dn: cn=CRYPT,cn=Password Storage Schemes,cn=plugins,cn=config\n");
     fprintf(f, "objectclass: top\n");
     fprintf(f, "objectclass: nsSlapdPlugin\n");
@@ -3213,6 +3214,7 @@ char *ds_gen_confs(char *sroot, server_config_s *cf,
     fprintf(f, "nsslapd-plugintype: pwdstoragescheme\n");
     fprintf(f, "nsslapd-pluginenabled: on\n");
     fprintf(f, "\n");
+#endif
 
     fprintf(f, "dn: cn=CLEAR,cn=Password Storage Schemes,cn=plugins,cn=config\n");
     fprintf(f, "objectclass: top\n");

ldap/libraries/libutil/Makefile

@@ -61,10 +61,6 @@ include $(LDAP_SRC)/nsldap.mk
 LIBUTIL_OBJS=	getopt.o ntevent.o \
 	ntreg.o ntstubs.o
 
-ifeq ($(ARCH), WINNT)
-LIBUTIL_OBJS += crypt.o
-endif
-
 OBJS = $(addprefix $(OBJDEST)/, $(LIBUTIL_OBJS)) 
 
 LIBUTIL=	$(addprefix $(LIBDIR)/, libutil.$(LIB_SUFFIX))

ldap/servers/plugins/pwdstorage/Makefile

@@ -65,12 +65,15 @@ INCLUDES += -I$(LDAP_SRC)/servers/slapd
 PWD_OBJS= \
 	pwd_init.o \
 	clear_pwd.o \
-	crypt_pwd.o \
 	ns-mta-md5_pwd.o \
 	sha_pwd.o \
 	ssha_pwd.o \
 	md5c.o
 
+ifneq ($(ARCH), WINNT)
+PWD_OBJS += crypt_pwd.o
+endif
+
 
 OBJS = $(addprefix $(OBJDEST)/, $(PWD_OBJS)) 
 

ldap/servers/plugins/pwdstorage/libpwdstorage.def

@@ -40,16 +40,16 @@ DESCRIPTION		'Fedora Directory Server 7 password storage scheme Plugin'
 EXPORTS
 	sha_pwd_storage_scheme_init @2
 	ssha_pwd_storage_scheme_init @3
-	crypt_pwd_storage_scheme_init @4
+;	crypt_pwd_storage_scheme_init @4
 	clear_pwd_storage_scheme_init @5
 	ns_mta_md5_pwd_storage_scheme_init @6
 	clear_pw_cmp @7
-	crypt_pw_cmp @8
+;	crypt_pw_cmp @8
 	ns_mta_md5_pw_cmp @9
 	sha1_pw_cmp @10 
 	sha1_pw_enc @11
 	salted_sha1_pw_enc @12
-	crypt_pw_enc @13
+;	crypt_pw_enc @13
 	clear_pw_enc @14
 	mta_MD5Init @15
 	mta_MD5Update @16

ldap/servers/plugins/pwdstorage/pwd_init.c

@@ -47,7 +47,9 @@ static Slapi_PluginDesc sha_pdesc = { "sha-password-storage-scheme", PLUGIN_MAGI
 
 static Slapi_PluginDesc ssha_pdesc = { "ssha-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Salted Secure Hashing Algorithm (SSHA)" };
 
+#ifndef _WIN32
 static Slapi_PluginDesc crypt_pdesc = { "crypt-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Unix crypt algorithm (CRYPT)" };
+#endif
 
 static Slapi_PluginDesc clear_pdesc = { "clear-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "No encryption (CLEAR)" };
 
@@ -104,6 +106,7 @@ ssha_pwd_storage_scheme_init( Slapi_PBlock *pb )
 	return( rc );
 }
 
+#ifndef _WIN32
 int
 crypt_pwd_storage_scheme_init( Slapi_PBlock *pb )
 {
@@ -128,6 +131,7 @@ crypt_pwd_storage_scheme_init( Slapi_PBlock *pb )
 	slapi_log_error( SLAPI_LOG_PLUGIN, plugin_name, "<= crypt_pwd_storage_scheme_init %d\n\n", rc );
 	return( rc );
 }
+#endif
 
 int
 clear_pwd_storage_scheme_init( Slapi_PBlock *pb )

ldap/servers/plugins/pwdstorage/pwdstorage.h

@@ -66,9 +66,11 @@ char * sha1_pw_enc( char *pwd );
 char * salted_sha1_pw_enc( char *pwd );
 int clear_pw_cmp( char *userpwd, char *dbpwd );
 char *clear_pw_enc( char *pwd );
+#ifndef _WIN32
 void crypt_init();
 int crypt_pw_cmp( char *userpwd, char *dbpwd );
 char *crypt_pw_enc( char *pwd );
+#endif
 int ns_mta_md5_pw_cmp( char *userpwd, char *dbpwd );