aboutsummaryrefslogblamecommitdiff
path: root/security/courier-authlib/files/patch-Makefile.in
blob: ec7390a69e161bcc51855d11b6eab7bb031d82c5 (plain) (tree)
1
2
3
4
5
6
7
8

                                                           
                   
                   
                        
                      

                                                           






                                                                                
           

                                                                
                 


                                                             


                                               
                                                             
                                                          









                                                                    



                                                                       








                                                                  
                   





                                                                  
                                            

                                                
                   






                                
                     
                          
                  
                              


                                                                                                        
                            
                                         


                                                   


                                                     













                                                                           




                                                      
                    












                                                                                
                   
 
                                                       
                                                                                                 





                                                                                          
                                  
                   






                                                                              
                                         
                   







                                                                                                                      
                   







                                                                                  
                   






                                                                                    
                     









                                                                                            
                     









                                                                                            
                       


















                                                                                 



                                                                 




                                                                 
                                   
 
                                     
 
                      











                                                                             
                      


















                                                                                           
                       

                                                                

                      
                                                                

























                                                                                                  
                       







                                                                 


                                                        
                                                                                                                                  
                                                       


                                                    


                                                                        
                                                                                                                                                  
                                                                       





                                                                               




                                                                      

                                                                                                                                                                                     





                                                                                                        



                                                                    
                     





                                                                                       

                                                                         
                       













                                                                                                                                                          
--- Makefile.in.orig	2008-07-12 21:41:08.000000000 +0200
+++ Makefile.in	2008-07-16 08:36:48.000000000 +0200
@@ -41,11 +41,10 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-sbin_PROGRAMS = authtest$(EXEEXT) authenumerate$(EXEEXT) \
-	authpasswd$(EXEEXT)
-bin_PROGRAMS = courierauthconfig$(EXEEXT)
-noinst_PROGRAMS = authdaemontest$(EXEEXT) authmksock$(EXEEXT) \
-	authdaemondprog$(EXEEXT)
+@HAVE_BASE_TRUE@sbin_PROGRAMS = authtest$(EXEEXT) authenumerate$(EXEEXT)
+@HAVE_BASE_TRUE@bin_PROGRAMS = courierauthconfig$(EXEEXT)
+@HAVE_BASE_TRUE@noinst_PROGRAMS = authdaemontest$(EXEEXT) authmksock$(EXEEXT) \
+@HAVE_BASE_TRUE@	authdaemondprog$(EXEEXT)
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -81,7 +80,7 @@
 	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(pkglibexecdir)" \
 	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" \
 	"$(DESTDIR)$(man3dir)" "$(DESTDIR)$(includedir)"
-pkglibLTLIBRARIES_INSTALL = $(INSTALL)
+pkglibLTLIBRARIES_INSTALL = $(INSTALL) -m 0444
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 am_libauthcustom_la_OBJECTS = authcustom.lo preauthcustom.lo
 libauthcustom_la_OBJECTS = $(am_libauthcustom_la_OBJECTS)
@@ -133,6 +132,12 @@
 libauthuserdb_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(libauthuserdb_la_LDFLAGS) $(LDFLAGS) -o $@
+am_libauthvchkpw_la_OBJECTS = authvchkpw.lo authvchkpwlib.lo \
+	preauthvchkpw.lo
+libauthvchkpw_la_OBJECTS = $(am_libauthvchkpw_la_OBJECTS)
+libauthvchkpw_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libauthvchkpw_la_LDFLAGS) $(LDFLAGS) -o $@
 libcourierauth_la_DEPENDENCIES = libhmac/libhmac.la md5/libmd5.la \
 	sha1/libsha1.la numlib/libnumlib.la random128/librandom128.la \
 	rfc822/libencode.la
@@ -221,7 +226,8 @@
 	$(libauthmysql_la_SOURCES) $(libauthpam_la_SOURCES) \
 	$(libauthpgsql_la_SOURCES) $(libauthpipe_la_SOURCES) \
 	$(libauthpwd_la_SOURCES) $(libauthshadow_la_SOURCES) \
-	$(libauthuserdb_la_SOURCES) $(libcourierauth_la_SOURCES) \
+	$(libauthuserdb_la_SOURCES) $(libauthvchkpw_la_SOURCES) \
+	$(libcourierauth_la_SOURCES) \
 	$(libcourierauthcommon_la_SOURCES) \
 	$(libcourierauthsasl_la_SOURCES) \
 	$(libcourierauthsaslclient_la_SOURCES) \
@@ -233,7 +239,8 @@
 	$(libauthmysql_la_SOURCES) $(libauthpam_la_SOURCES) \
 	$(libauthpgsql_la_SOURCES) $(libauthpipe_la_SOURCES) \
 	$(libauthpwd_la_SOURCES) $(libauthshadow_la_SOURCES) \
-	$(libauthuserdb_la_SOURCES) $(libcourierauth_la_SOURCES) \
+	$(libauthuserdb_la_SOURCES) $(libauthvchkpw_la_SOURCES) \
+	$(libcourierauth_la_SOURCES) \
 	$(libcourierauthcommon_la_SOURCES) \
 	$(libcourierauthsasl_la_SOURCES) \
 	$(libcourierauthsaslclient_la_SOURCES) \
@@ -319,6 +326,7 @@
 LIBAUTHPWD = @LIBAUTHPWD@
 LIBAUTHSHADOW = @LIBAUTHSHADOW@
 LIBAUTHUSERDB = @LIBAUTHUSERDB@
+LIBAUTHVCHKPW = @LIBAUTHVCHKPW@
 LIBDB = @LIBDB@
 LIBDL = @LIBDL@
 LIBGDBM = @LIBGDBM@
@@ -422,22 +430,28 @@
 top_srcdir = @top_srcdir@
 userdb = @userdb@
 AUTOMAKE_OPTIONS = dist-bzip2
-SUBDIRS = libltdl gdbmobj bdbobj md5 sha1 libhmac numlib makedat userdb rfc822 random128 liblock liblog
+SUBDIRS = libltdl gdbmobj bdbobj md5 sha1 libhmac numlib
+@HAVE_USERDB_TRUE@SUBDIRS+= makedat userdb
+SUBDIRS += rfc822 random128
+@HAVE_BASE_TRUE@SUBDIRS+= liblock liblog
 INCLUDES = $(LTDLINCL)
 modules = @LIBAUTHUSERDB@ \
 	@LIBAUTHPAM@ @LIBAUTHPWD@ @LIBAUTHSHADOW@ \
 	@LIBAUTHPGSQL@ @LIBAUTHLDAP@ @LIBAUTHMYSQL@ \
-	@LIBAUTHCUSTOM@ @LIBAUTHPIPE@
+	@LIBAUTHCUSTOM@ @LIBAUTHVCHKPW@ @LIBAUTHPIPE@
 
 pkglibexecdir = $(libexecdir)/courier-authlib
 pkglibexec_SCRIPTS = authsystem.passwd
-pkglib_LTLIBRARIES = libcourierauth.la \
-	libcourierauthsasl.la libcourierauthsaslclient.la \
-	libcourierauthcommon.la $(modules)
+@HAVE_BASE_TRUE@pkglib_LTLIBRARIES = libcourierauth.la \
+@HAVE_BASE_TRUE@	libcourierauthsasl.la libcourierauthsaslclient.la \
+@HAVE_BASE_TRUE@	libcourierauthcommon.la $(modules)
+
+@HAVE_BASE_FALSE@pkglib_LTLIBRARIES = $(modules)
 
 sbin_SCRIPTS = authdaemond
 EXTRA_LTLIBRARIES = libauthuserdb.la \
 	libauthpam.la libauthpwd.la libauthshadow.la \
+	libauthvchkpw.la \
 	libauthpgsql.la \
 	libauthldap.la \
 	libauthmysql.la \
@@ -508,6 +522,13 @@
 libauthshadow_la_LIBADD = $(commonlibadd) $(libauthshadow_t)
 libauthshadow_la_LDFLAGS = $(commonldflags)
 
+# The authvchkpw module
+libauthvchkpw_t = @VPOPMAILLIBS@ @LIBM@
+libauthvchkpw_la_SOURCES = authvchkpw.c authvchkpwlib.c preauthvchkpw.c
+libauthvchkpw_la_DEPENDENCIES = $(commonlibdep)
+libauthvchkpw_la_LIBADD = $(commonlibadd)
+libauthvchkpw_la_LDFLAGS = $(commonldflags) $(libauthvchkpw_t)
+
 # The authpgsql module
 libauthpgsql_t = @PGSQL_LIBS@ @LIBM@ @NETLIBS@
 libauthpgsql_la_SOURCES = authpgsql.c preauthpgsql.c authpgsqllib.c authpgsql.h
@@ -579,8 +600,8 @@
 
 libcourierauthsaslclient_la_LIBADD = libcourierauth.la
 libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex '^auth_sasl_client$$' -avoid-version
-include_HEADERS = courier_auth_config.h courierauth.h courierauthsasl.h \
-	courierauthsaslclient.h courierauthdebug.h
+@HAVE_BASE_TRUE@include_HEADERS = courier_auth_config.h courierauth.h courierauthsasl.h \
+@HAVE_BASE_TRUE@	courierauthsaslclient.h courierauthdebug.h
 
 courierauthconfig_SOURCES = authinfo.c
 authpasswd_SOURCES = authpasswd.c
@@ -621,7 +642,7 @@
 man3 = authlib.3 auth_generic.3 auth_login.3 auth_getuserinfo.3 \
 	auth_enumerate.3 auth_passwd.3 auth_getoption.3 auth_sasl.3
 
-man1 = authpasswd.1 authtest.1
+man1 = authtest.1
 man_MANS = $(man1) $(man3)
 BUILT1 = authlib.html authldaprc.h authmysqlrc.h authpgsqlrc.h authpiperc.h \
 	authdaemonrc.h packageversion.h \
@@ -756,6 +777,8 @@
 	$(libauthshadow_la_LINK)  $(libauthshadow_la_OBJECTS) $(libauthshadow_la_LIBADD) $(LIBS)
 libauthuserdb.la: $(libauthuserdb_la_OBJECTS) $(libauthuserdb_la_DEPENDENCIES) 
 	$(libauthuserdb_la_LINK)  $(libauthuserdb_la_OBJECTS) $(libauthuserdb_la_LIBADD) $(LIBS)
+libauthvchkpw.la: $(libauthvchkpw_la_OBJECTS) $(libauthvchkpw_la_DEPENDENCIES) 
+	$(libauthvchkpw_la_LINK)  $(libauthvchkpw_la_OBJECTS) $(libauthvchkpw_la_LIBADD) $(LIBS)
 libcourierauth.la: $(libcourierauth_la_OBJECTS) $(libcourierauth_la_DEPENDENCIES) 
 	$(libcourierauth_la_LINK) -rpath $(pkglibdir) $(libcourierauth_la_OBJECTS) $(libcourierauth_la_LIBADD) $(LIBS)
 libcourierauthcommon.la: $(libcourierauthcommon_la_OBJECTS) $(libcourierauthcommon_la_DEPENDENCIES) 
@@ -935,6 +958,8 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authtest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authuserdb.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authuserdbpwd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authvchkpw.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authvchkpwlib.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpassword.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpasswordmd5.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpasswordsha1.Plo@am__quote@
@@ -951,6 +976,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthshadow.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthuserdb.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthuserdbcommon.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthvchkpw.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -1002,8 +1028,8 @@
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
+	  echo " install  -o root -g wheel -m 444 '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	  install  -o root -g wheel -m 444 "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
 	done
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
@@ -1047,8 +1073,8 @@
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \
+	  echo " install  -o root -g wheel -m 444 '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
+	  install  -o root -g wheel -m 444 "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \
 	done
 uninstall-man3:
 	@$(NORMAL_UNINSTALL)
@@ -1431,17 +1457,23 @@
 
 info-am:
 
-install-data-am: install-includeHEADERS install-man
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+@HAVE_BASE_TRUE@install-data-am: install-includeHEADERS install-man
+@HAVE_BASE_TRUE@	@$(NORMAL_INSTALL)
+@HAVE_BASE_TRUE@	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+@HAVE_BASE_FALSE@install-data-am:
+@HAVE_BASE_FALSE@	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+@HAVE_BASE_TRUE@install-exec-am: install-binPROGRAMS install-pkglibLTLIBRARIES \
+@HAVE_BASE_TRUE@	install-pkglibexecSCRIPTS install-sbinPROGRAMS \
+@HAVE_BASE_TRUE@	install-sbinSCRIPTS
+@HAVE_BASE_TRUE@	@$(NORMAL_INSTALL)
+@HAVE_BASE_TRUE@	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 
-install-dvi: install-dvi-recursive
+@HAVE_BASE_FALSE@install-exec-am: install-pkglibLTLIBRARIES
+@HAVE_BASE_FALSE@	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 
-install-exec-am: install-binPROGRAMS install-pkglibLTLIBRARIES \
-	install-pkglibexecSCRIPTS install-sbinPROGRAMS \
-	install-sbinSCRIPTS
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+install-dvi: install-dvi-recursive
 
 install-html: install-html-recursive
 
@@ -1514,6 +1546,12 @@
 	uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS
 
 
+authvchkpw.lo: authvchkpw.c vpopmail_config.h
+preauthvchkpw.lo: preauthvchkpw.c vpopmail_config.h
+
+vpopmail_config.h:
+	echo '#include "@vpopmail_home@/include/config.h"' >vpopmail_config.h
+
 authpgsqllib.lo: authpgsqllib.c authpgsqlrc.h
 
 @HAVE_AUTHPGSQL_TRUE@install-authpgsqlrc:
@@ -1553,6 +1591,19 @@
 @HAVE_LDAP_FALSE@uninstall-authldaprc:
 @HAVE_LDAP_FALSE@	@:
 
+@HAVE_LDAP_TRUE@install-ldapschema:
+@HAVE_LDAP_TRUE@	$(mkinstalldirs) ${sysconfdir}/openldap/schema
+@HAVE_LDAP_TRUE@	$(INSTALL_DATA) -m 0444 $(srcdir)/authldap.schema \
+@HAVE_LDAP_TRUE@		${sysconfdir}/openldap/schema/authldap.schema.default
+@HAVE_LDAP_TRUE@	if test ! -f ${sysconfdir}/openldap/schema/authldap.schema ; then \
+@HAVE_LDAP_TRUE@		$(INSTALL_DATA) -m 0444 $(srcdir)/authldap.schema \
+@HAVE_LDAP_TRUE@			${sysconfdir}/openldap/schema/authldap.schema ; \
+@HAVE_LDAP_TRUE@	fi
+
+@HAVE_LDAP_FALSE@install-ldapschema:
+@HAVE_LDAP_FALSE@	@:
+		
+
 authldaprc.h:
 	echo "#define AUTHLDAPRC \"@authldaprc@\"" >authldaprc.h
 
@@ -1582,16 +1633,22 @@
 authpiperc.h:
 	echo "#define PIPE_PROGRAM \"@authProg@\"" >authpiperc.h
 
-install-authdaemonrc:
-	$(mkinstalldirs) $(DESTDIR)`dirname @authdaemonrc@` || :
-	sed 's/@ALLMODULES@/$(modules:lib%.la=%)/' <authdaemonrc >authdaemonrc.tmp
-	$(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)@authdaemonrc@.dist
-	rm -f authdaemonrc.tmp
-	-chown @mailuser@ $(DESTDIR)@authdaemonrc@.dist
-	-chgrp @mailgroup@ $(DESTDIR)@authdaemonrc@.dist
+@HAVE_BASE_TRUE@install-authdaemonrc:
+@HAVE_BASE_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authdaemonrc@`
+@HAVE_BASE_TRUE@	sed 's/@ALLMODULES@/$(modules:lib%.la=%)/' <authdaemonrc >authdaemonrc.tmp
+@HAVE_BASE_TRUE@	$(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)@authdaemonrc@.dist
+@HAVE_BASE_TRUE@	rm -f authdaemonrc.tmp
+@HAVE_BASE_TRUE@	-chown @mailuser@ $(DESTDIR)@authdaemonrc@.dist
+@HAVE_BASE_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authdaemonrc@.dist
+
+@HAVE_BASE_FALSE@install-authdaemonrc:
+@HAVE_BASE_FALSE@	@:
+
+@HAVE_BASE_TRUE@uninstall-authdaemonrc:
+@HAVE_BASE_TRUE@	rm -f $(DESTDIR)@authdaemonrc@.dist
 
-uninstall-authdaemonrc:
-	rm -f $(DESTDIR)@authdaemonrc@.dist
+@HAVE_BASE_FALSE@uninstall-authdaemonrc:
+@HAVE_BASE_FALSE@	@:
 
 authdaemonrc.h:
 	echo "#define AUTHDAEMONRC \"@authdaemonrc@\"" >authdaemonrc.h
@@ -1634,21 +1691,23 @@
 # automake still a bit stupid...
 
 install-data-hook: install-authdaemonrc install-authpgsqlrc \
-	install-authldaprc install-authmysqlrc
+	install-authldaprc install-ldapschema install-authmysqlrc
 	:
 
 install-exec-hook:
-	$(mkinstalldirs) $(DESTDIR)$(bindir) || :
-	$(mkinstalldirs) $(DESTDIR)$(sbindir) || :
-	$(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) || :
-	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) authdaemondprog $(DESTDIR)$(pkglibexecdir)/authdaemond
-	$(mkinstalldirs) $(DESTDIR)@authdaemonvar@ || :
-	chmod 750 $(DESTDIR)@authdaemonvar@
-	-chown @mailuser@ $(DESTDIR)@authdaemonvar@
-	-chgrp @mailgroup@ $(DESTDIR)@authdaemonvar@
+@HAVE_BASE_TRUE@	$(mkinstalldirs) $(DESTDIR)$(bindir) || :
+@HAVE_BASE_TRUE@	$(mkinstalldirs) $(DESTDIR)$(sbindir) || :
+@HAVE_BASE_TRUE@	$(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) || :
+@HAVE_BASE_TRUE@	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) authdaemondprog $(DESTDIR)$(pkglibexecdir)/authdaemond
+@HAVE_BASE_TRUE@	$(mkinstalldirs) $(DESTDIR)@authdaemonvar@ || :
+@HAVE_BASE_TRUE@	chmod 750 $(DESTDIR)@authdaemonvar@
+@HAVE_BASE_TRUE@	-chown @mailuser@ $(DESTDIR)@authdaemonvar@
+@HAVE_BASE_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authdaemonvar@
 	test "@LIBAUTHUSERDB@" = "" && exit 0 ;\
 		$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) makedat/makedatprog \
 				$(DESTDIR)$(pkglibexecdir)/makedatprog ; \
+		$(INSTALL_SCRIPT) userdb/vchkpw2userdb \
+				$(DESTDIR)$(sbindir)/vchkpw2userdb ; \
 		$(INSTALL_SCRIPT) userdb/pw2userdb \
 				$(DESTDIR)$(sbindir)/pw2userdb ; \
 		$(INSTALL_SCRIPT) userdb/makeuserdb \
@@ -1662,9 +1721,10 @@
 	for f in $(pkglib_LTLIBRARIES); do . $$f; rm -f $(DESTDIR)$(pkglibdir)/$$dlname.0 $(DESTDIR)$(pkglibdir)/$$dlname.0.0; ln -s $$dlname $(DESTDIR)$(pkglibdir)/$$dlname.0; done
 
 uninstall-hook: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc
-	rm -f $(DESTDIR)$(pkglibexecdir)/authdaemond
+@HAVE_BASE_TRUE@	rm -f $(DESTDIR)$(pkglibexecdir)/authdaemond
 	test "@AUTHUSERDB@" = "" && exit 0 ;\
 		rm -f $(DESTDIR)$(pkglibexecdir)/makedatprog \
+				$(DESTDIR)$(sbindir)/vchkpw2userdb \
 				$(DESTDIR)$(sbindir)/pw2userdb \
 				$(DESTDIR)$(sbindir)/makeuserdb \
 				$(DESTDIR)$(sbindir)/userdb \
@@ -1676,7 +1736,7 @@
 	CONFIG_FILES=authlib.html CONFIG_HEADERS= $(SHELL) ./config.status
 
 authlib.3: authlib.3.in
-	CONFIG_FILES=authlib.3 CONFIG_HEADERS= $(SHELL) ./config.status
+@HAVE_BASE_TRUE@	CONFIG_FILES=authlib.3 CONFIG_HEADERS= $(SHELL) ./config.status
 
 @HAVE_SGML_TRUE@authpasswd.html: authpasswd.sgml docbook/sgml2html
 @HAVE_SGML_TRUE@	docbook/sgml2html authpasswd.sgml authpasswd.html
@@ -1750,10 +1810,10 @@
 	@SHELL@ authmigrate
 
 install-configure:
-	test -f $(DESTDIR)@authdaemonrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authdaemonrc@.dist || true
-	test -f $(DESTDIR)@authmysqlrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authmysqlrc@.dist || true
-	test -f $(DESTDIR)@authpgsqlrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authpgsqlrc@.dist || true
-	test -f $(DESTDIR)@authldaprc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authldaprc@.dist || true
+@HAVE_BASE_TRUE@	test -f $(DESTDIR)@authdaemonrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authdaemonrc@.dist || true ; chmod 0600 $(DESTDIR)@authdaemonrc@
+@HAVE_AUTHMYSQL_TRUE@	test -f $(DESTDIR)@authmysqlrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authmysqlrc@.dist || true ; chmod 0600 $(DESTDIR)@authmysqlrc@
+@HAVE_AUTHPGSQL_TRUE@	test -f $(DESTDIR)@authpgsqlrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authpgsqlrc@.dist || true ; chmod 0600 $(DESTDIR)@authpgsqlrc@
+@HAVE_LDAP_TRUE@	test -f $(DESTDIR)@authldaprc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authldaprc@.dist || true ; chmod 0600 $(DESTDIR)@authldaprc@
 
 # For maintainer's use only