proxmox-mirrors/mirror_corosync
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_corosync synced 2025-08-14 00:47:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove service.d directory since plugins are gone

Browse Source 
Signed-off-by: Steven Dake <sdake@redhat.com>
Reviewed-by: Fabio Di Nitto <fdinitto@redhat.com>
This commit is contained in:
Steven Dake 2012-01-14 14:13:38 -07:00
parent 75bc06d916
commit 0e2ca7edac
2 changed files with 0 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
corosync.spec.in
View File

@ -156,7 +156,6 @@ fi
%{_bindir}/corosync-xmlproc
%endif
%dir %{_sysconfdir}/corosync
%dir %{_sysconfdir}/corosync/service.d
%dir %{_sysconfdir}/corosync/uidgid.d
%config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example
%config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example.udpu

64
exec/coroparse.c
View File

@ -901,66 +901,6 @@ error_exit:
return res;
}
static int read_service_files_into_icmap(
const char **error_string)
{
FILE *fp;
const char *dirname;
DIR *dp;
struct dirent *dirent;
struct dirent *entry;
char filename[PATH_MAX + FILENAME_MAX + 1];
int res = 0;
struct stat stat_buf;
size_t len;
int return_code;
char key_name[ICMAP_KEYNAME_MAXLEN];
struct main_cp_cb_data data;
dirname = COROSYSCONFDIR "/service.d";
dp = opendir (dirname);
if (dp == NULL)
return 0;
len = offsetof(struct dirent, d_name) + NAME_MAX + 1;
entry = malloc(len);
if (entry == NULL) {
res = 0;
goto error_exit;
}
for (return_code = readdir_r(dp, entry, &dirent);
dirent != NULL && return_code == 0;
return_code = readdir_r(dp, entry, &dirent)) {
snprintf(filename, sizeof (filename), "%s/%s", dirname, dirent->d_name);
stat (filename, &stat_buf);
if (S_ISREG(stat_buf.st_mode)) {
fp = fopen (filename, "r");
if (fp == NULL) continue;
key_name[0] = 0;
res = parse_section(fp, key_name, error_string, main_config_parser_cb, &data);
fclose (fp);
if (res != 0) {
goto error_exit;
}
}
}
error_exit:
free (entry);
closedir(dp);
return res;
}
/* Read config file and load into icmap */
static int read_config_file_into_icmap(
const char **error_string)
@ -997,10 +937,6 @@ static int read_config_file_into_icmap(
res = read_uidgid_files_into_icmap(error_string);
}
if (res == 0) {
res = read_service_files_into_icmap(error_string);
}
if (res == 0) {
snprintf (error_reason, sizeof(error_string_response),
"Successfully read main configuration file '%s'.\n", filename);