From: Art Cancro <ajc@citadel.org>
Date: Tue, 13 Nov 2018 21:36:22 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
X-Git-Tag: v939~334
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=421c6e0bce6917ae9d09ae066c77fb58b964c399;hp=-c

Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
---

421c6e0bce6917ae9d09ae066c77fb58b964c399
diff --combined citadel/Makefile.in
index f1b1407bc,792c29f42..16ca85fd3
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@@ -36,12 -36,10 +36,10 @@@ include Make_module
  
  UTIL_TARGETS=citmail$(EXEEXT) sendcommand$(EXEEXT)
  
- UTILBIN_TARGETS= base64$(EXEEXT) setup$(EXEEXT) \
+ UTILBIN_TARGETS= setup$(EXEEXT) \
  	chkpw$(EXEEXT) chkpwd$(EXEEXT) \
- 	msgform$(EXEEXT) \
  	ctdlmigrate$(EXEEXT)
  
- 
  ACLOCAL=@ACLOCAL@
  AUTOCONF=@AUTOCONF@
  chkpwd_LIBS=@chkpwd_LIBS@
@@@ -71,9 -69,9 +69,9 @@@ LOCALEDIR=@LOCALEDIR
  
  
  SOURCES=utils/citmail.c \
- 	utils/setup.c utils/msgform.c utils/chkpw.c \
+ 	utils/setup.c utils/chkpw.c \
  	utils/sendcommand.c \
- 	utils/ctdlmigrate.c utils/base64.c utils/chkpwd.c \
+ 	utils/ctdlmigrate.c utils/chkpwd.c \
  	utillib/citadel_dirs.c \
  	citserver.c clientsocket.c config.c control.c $(DATABASE) \
  	domain.c serv_extensions.c genstamp.c \
@@@ -169,12 -167,6 +167,6 @@@ sendcommand$(EXEEXT): utils/sendcommand
  	$(CC) utils/sendcommand.o utillib/citadel_dirs.o \
  		$(LIBOBJS) $(LDFLAGS) -o sendcommand$(EXEEXT) $(LIBS)
  
- base64$(EXEEXT): utils/base64.o
- 	$(CC) utils/base64.o $(LDFLAGS) -o base64$(EXEEXT)
- 
- msgform$(EXEEXT): utils/msgform.o
- 	$(CC) utils/msgform.o $(LDFLAGS) -o msgform$(EXEEXT)
- 
  .PHONY: install-data install-doc install-exec clean cleaner distclean
  
  install-locale:
@@@ -208,7 -200,7 +200,7 @@@ upgrade: install-exec install-do
  
  install-data:
  	$(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/messages
 -	@for i in public_clients citadel_urlshorteners.rc \
 +	@for i in public_clients \
  		 `find $(srcdir)/messages $(srcdir)/network -type f | grep -v .svn`; do \
  		echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \
  		$(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \
@@@ -221,6 -213,7 +213,6 @@@
  install-data-new:
  	$(srcdir)/mkinstalldirs $(DESTDIR)$(ETC_DIR)/
  	$(INSTALL_DATA) $(srcdir)/public_clients $(DESTDIR)$(ETC_DIR)/public_clients
 -	$(INSTALL_DATA) $(srcdir)/citadel_urlshorteners.rc $(DESTDIR)$(ETC_DIR)/citadel_urlshorteners.rc
  	$(INSTALL_DATA) $(srcdir)/network/mail.aliases $(DESTDIR)$(ETC_DIR)/mail.aliases
  
  	$(srcdir)/mkinstalldirs $(DESTDIR)$(STATICDATA_DIR)/messages
@@@ -272,7 -265,7 +264,7 @@@ install-exec: al
  	$(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/unstripped
  	cp $(SERVER_TARGETS) $(DESTDIR)$(prefix)/unstripped/
  
 -	@for i in utilsmenu database_cleanup.sh migrate_aliases.sh; do \
 +	@for i in utilsmenu database_cleanup.sh ; do \
  		if test -f $(srcdir)/$$i; then \
  			echo $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(prefix)/$$i; \
  			$(INSTALL) $(srcdir)/$$i $(DESTDIR)$(prefix)/$$i; \
@@@ -292,6 -285,7 +284,6 @@@ install-exec-new: al
  		fi \
  	done
  	cp citserver $(DESTDIR)/$(UTILBIN_DIR)/citserver.unstripped
 -	cp migrate_aliases.sh $(DESTDIR)/$(UTILBIN_DIR)/
  	@for i in $(UTILBIN_TARGETS); do \
  		if test -f $$i; then \
  			echo $(INSTALL) $$i $(DESTDIR)/$(UTILBIN_DIR)/$$i; \
diff --combined citadel/include/citadel_dirs.h
index 6956a2810,7bc06f090..161ab943f
--- a/citadel/include/citadel_dirs.h
+++ b/citadel/include/citadel_dirs.h
@@@ -34,6 -34,7 +34,6 @@@ extern char ctdl_utilbin_dir[PATH_MAX]
  /* some of the frequently used files */
  extern char file_citadel_control[PATH_MAX];
  extern char file_citadel_config[PATH_MAX];
 -extern char file_citadel_urlshorteners[PATH_MAX];
  extern char file_lmtp_socket[PATH_MAX];
  extern char file_lmtp_unfiltered_socket[PATH_MAX];
  extern char file_arcq[PATH_MAX];
@@@ -46,7 -47,6 +46,6 @@@ extern char file_crpt_file_key[PATH_MAX
  extern char file_crpt_file_csr[PATH_MAX];
  extern char file_crpt_file_cer[PATH_MAX];
  extern char file_chkpwd[PATH_MAX];
- extern char file_base64[PATH_MAX];
  extern char file_guesstimezone[PATH_MAX];
  
  extern void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir, int dbg);
diff --combined citadel/utillib/citadel_dirs.c
index afb2b5441,e242db80d..c7407c4a2
--- a/citadel/utillib/citadel_dirs.c
+++ b/citadel/utillib/citadel_dirs.c
@@@ -51,6 -51,7 +51,6 @@@ char ctdl_bin_dir[PATH_MAX]=""
  /* some of our files, that are needed in several places */
  char file_citadel_control[PATH_MAX]="";
  char file_citadel_config[PATH_MAX]="";
 -char file_citadel_urlshorteners[PATH_MAX]="";
  char file_lmtp_socket[PATH_MAX]="";
  char file_lmtp_unfiltered_socket[PATH_MAX]="";
  char file_arcq[PATH_MAX]="";
@@@ -63,7 -64,6 +63,6 @@@ char file_crpt_file_key[PATH_MAX]=""
  char file_crpt_file_csr[PATH_MAX]="";
  char file_crpt_file_cer[PATH_MAX]="";
  char file_chkpwd[PATH_MAX]="";
- char file_base64[PATH_MAX]="";
  char file_guesstimezone[PATH_MAX]="";
  
  
@@@ -197,6 -197,11 +196,6 @@@ void calc_dirs_n_files(int relh, int ho
  			 "%scitadel.config",
  			 ctdl_autoetc_dir);
  	StripSlashes(file_citadel_config, 0);
 -	snprintf(file_citadel_urlshorteners, 
 -			 sizeof file_citadel_urlshorteners,
 -			 "%scitadel_urlshorteners.rc",
 -			 ctdl_etc_dir);
 -	StripSlashes(file_citadel_urlshorteners, 0);
  	snprintf(file_lmtp_socket, 
  			 sizeof file_lmtp_socket,
  			 "%slmtp.socket",
@@@ -247,11 -252,6 +246,6 @@@
  		 "%schkpwd",
  		 ctdl_utilbin_dir);
  	StripSlashes(file_chkpwd, 0);
- 	snprintf(file_base64,
- 		 sizeof file_base64,
- 		 "%sbase64",
- 		 ctdl_utilbin_dir);
- 	StripSlashes(file_base64, 0);
  	snprintf(file_guesstimezone,
  		 sizeof file_guesstimezone,
  		 "%sguesstimezone.sh",
@@@ -303,7 -303,6 +297,6 @@@
  	DBG_PRINT(file_crpt_file_csr);
  	DBG_PRINT(file_crpt_file_cer);
  	DBG_PRINT(file_chkpwd);
- 	DBG_PRINT(file_base64);
  	DBG_PRINT(file_guesstimezone);
  }