*/
#define SHOW_ME_VAPPEND_PRINTF
-
#include "ctdl_module.h"
-
-
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
setup_titles[eLDAP_Bind_PW] = _("LDAP bind password:");//
}
-/**
- * \brief print the actual stack frame.
+/*
+ * print the actual stack frame.
*/
void cit_backtrace(void)
{
size_t size, i;
char **strings;
-
size = backtrace(stack_frames, sizeof(stack_frames) / sizeof(void*));
strings = backtrace_symbols(stack_frames, size);
for (i = 0; i < size; i++) {
struct config config;
- /* calculate all our path on a central place */
- /* where to keep our config */
+/* calculate all our path on a central place */
+/* where to keep our config */
char *setup_text[] = {
case UI_TEXT:
if (curr == 0) {
printf("%s\n", text);
- printf("..........................");
- printf("..........................");
+ printf("....................................................");
printf("..........................\r");
fflush(stdout);
dots_printed = 0;
/*
* delete_inittab_entry() -- Remove obsolete /etc/inittab entry for Citadel
- *
*/
void delete_inittab_entry(void)
{
/*
* install_init_scripts() -- Try to configure to start Citadel at boot
- *
*/
void install_init_scripts(void)
{
-
-
-
/*
* On systems which use xinetd, see if we can offer to install Citadel as
* the default telnet target.
}
}
-/***** begin version update section ***** */
- /* take care of any updating that is necessary */
+ /***** begin version update section *****/
old_setup_level = config.c_setup_level;
}
if (old_setup_level < 555) {
- important_message("Citadel Setup",
- "This Citadel installation is too old "
- "to be upgraded.");
+ important_message(
+ "Citadel Setup",
+ "This Citadel installation is too old to be upgraded."
+ );
cleanup(1);
}
write_config_to_disk();
old_setup_level = config.c_setup_level;
- /* end of version update section */
+ /***** end of version update section *****/
NEW_INST:
config.c_setup_level = REV_LEVEL;
-/******************************************/
if ((pw = getpwuid(config.c_ctdluid)) == NULL) {
gid = getgid();
} else {
migrate_old_installs(); /* Delete files and directories used by older Citadel versions */
- if (((setup_type == UI_SILENT) && (getenv("ALTER_ETC_SERVICES")!=NULL)) ||
- (setup_type != UI_SILENT))
+ if ( ((setup_type == UI_SILENT)
+ && (getenv("ALTER_ETC_SERVICES")!=NULL))
+ || (setup_type != UI_SILENT)
+ ) {
check_services_entry(); /* Check /etc/services */
+ }
+
#ifndef __CYGWIN__
delete_inittab_entry(); /* Remove obsolete /etc/inittab entry */
check_xinetd_entry(); /* Check /etc/xinetd.d/telnet */
disable_other_mtas(); /* Offer to disable other MTAs */
-
+ fixnss(); /* Check for the 'db' nss and offer to disable it */
#endif
- fixnss(); /* Check for the 'db' nss and offer to disable it */
progress("Setting file permissions", 1, 3);
rv = chown(file_citadel_config, config.c_ctdluid, gid);
rv = chmod(file_citadel_config, S_IRUSR | S_IWUSR);
progress("Setting file permissions", 3, 3);
- check_init_script (relhome);
+ check_init_script(relhome);
cleanup(0);
return 0;
}