uname(&my_utsname);
/* set some sample/default values in place of blanks... */
- char c_nodename[256];
- safestrncpy(c_nodename, my_utsname.nodename, sizeof c_nodename);
- strtok(config.c_nodename, ".");
+ extract_token(config.c_nodename, my_utsname.nodename, 0, '.', sizeof config.c_nodename);
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_aideroom, "Aide", sizeof config.c_aideroom);
config.c_port_number = 504;
config.c_sleeping = 900;
- config.c_instant_expunge = 1;
if (config.c_ctdluid == 0) {
pw = getpwnam("citadel");
FILE *cfp;
int blocks_written = 0;
- if ((cfp = fopen(file_citadel_config, "w")) != NULL) {
+ cfp = fopen(file_citadel_config, "w");
+ if (cfp != NULL) {
blocks_written = fwrite((char *) &config, sizeof(struct config), 1, cfp);
if (blocks_written == 1) {
- fclose(cfp);
chown(file_citadel_config, CTDLUID, (-1));
chmod(file_citadel_config, 0600);
+ fclose(cfp);
return;
}
+ fclose(cfp);
}
syslog(LOG_EMERG, "%s: %s", file_citadel_config, strerror(errno));
}