#include <limits.h>
#include <pwd.h>
#include <time.h>
-
+#include <libcitadel.h>
#include "citadel.h"
#include "axdefs.h"
#include "sysdep.h"
#include "config.h"
-#include "tools.h"
#include "citadel_dirs.h"
#define MAXSETUP 5 /* How many setup questions to ask */
printf("Enter new value or press return to leave unchanged:\n");
fgets(buf, sizeof buf, stdin);
buf[strlen(buf) - 1] = 0;
- if (strlen(buf) != 0)
+ if (!IsEmptyStr(buf))
strcpy(str, buf);
break;
config.c_ctdluid = atoi(ctdluidname);
}
}
- }
#endif
+ }
break;
case 3:
{
if (getenv("ENABLE_UNIX_AUTH")) {
if (!strcasecmp(getenv("ENABLE_UNIX_AUTH"), "yes")) {
- config.c_auth_mode = 1;
+ config.c_auth_mode = AUTHMODE_HOST;
}
else {
- config.c_auth_mode = 0;
+ config.c_auth_mode = AUTHMODE_NATIVE;
}
}
}
char relhome[PATH_MAX]="";
char ctdldir[PATH_MAX]=CTDLDIR;
+ CtdlInitBase64Table();
+
/* set an invalid setup type */
setup_type = (-1);
safestrncpy(relhome, ctdl_home_directory, sizeof relhome);
}
- calc_dirs_n_files(relh, home, relhome, ctdldir);
+ calc_dirs_n_files(relh, home, relhome, ctdldir, 0);
enable_home=(relh|home);
fclose(fp);
/* set some sample/default values in place of blanks... */
- if (strlen(config.c_nodename) == 0)
+ if (IsEmptyStr(config.c_nodename))
safestrncpy(config.c_nodename, my_utsname.nodename,
sizeof config.c_nodename);
strtok(config.c_nodename, ".");
- if (strlen(config.c_fqdn) == 0) {
+ if (IsEmptyStr(config.c_fqdn) ) {
if ((he = gethostbyname(my_utsname.nodename)) != NULL)
safestrncpy(config.c_fqdn, he->h_name,
sizeof config.c_fqdn);
safestrncpy(config.c_fqdn, my_utsname.nodename,
sizeof config.c_fqdn);
}
- if (strlen(config.c_humannode) == 0)
+ if (IsEmptyStr(config.c_humannode))
strcpy(config.c_humannode, "My System");
- if (strlen(config.c_phonenum) == 0)
+ if (IsEmptyStr(config.c_phonenum))
strcpy(config.c_phonenum, "US 800 555 1212");
if (config.c_initax == 0) {
config.c_initax = 4;
}
- if (strlen(config.c_moreprompt) == 0)
+ if (IsEmptyStr(config.c_moreprompt))
strcpy(config.c_moreprompt, "<more>");
- if (strlen(config.c_twitroom) == 0)
+ if (IsEmptyStr(config.c_twitroom))
strcpy(config.c_twitroom, "Trashcan");
- if (strlen(config.c_baseroom) == 0)
+ if (IsEmptyStr(config.c_baseroom))
strcpy(config.c_baseroom, BASEROOM);
- if (strlen(config.c_aideroom) == 0)
+ if (IsEmptyStr(config.c_aideroom))
strcpy(config.c_aideroom, "Aide");
if (config.c_port_number == 0) {
config.c_port_number = 504;
if (config.c_imaps_port == 0) config.c_imaps_port = 993;
if (config.c_pftcpdict_port == 0) config.c_pftcpdict_port = -1;
if (config.c_managesieve_port == 0) config.c_managesieve_port = 2020;
+ if (config.c_xmpp_c2s_port == 0) config.c_xmpp_c2s_port = 5222;
+ if (config.c_xmpp_s2s_port == 0) config.c_xmpp_s2s_port = 5269;
/* Go through a series of dialogs prompting for config info */
for (curr = 1; curr <= MAXSETUP; ++curr) {
disable_other_mta("dovecot");
disable_other_mta("exim");
disable_other_mta("exim4");
- disable_other_mta("hula");
disable_other_mta("imapd");
disable_other_mta("mta");
disable_other_mta("pop3d");
disable_other_mta("saslauthd");
disable_other_mta("sendmail");
disable_other_mta("vmailmgrd");
- disable_other_mta("zimbra");
#endif
/* Check for the 'db' nss and offer to disable it */