mirror of
https://gitea.psi.ch/ELOG/elog.git
synced 2026-09-10 18:23:28 +00:00
Read password files in el_index_logbooks
SVN revision: 1322
This commit is contained in:
parent
41bac5436f
commit
7b5532ff67
10
src/elogd.c
10
src/elogd.c
@ -6,6 +6,9 @@
|
|||||||
Contents: Web server program for Electronic Logbook ELOG
|
Contents: Web server program for Electronic Logbook ELOG
|
||||||
|
|
||||||
$Log$
|
$Log$
|
||||||
|
Revision 1.629 2005/04/15 20:25:53 ritt
|
||||||
|
Read password files in el_index_logbooks
|
||||||
|
|
||||||
Revision 1.628 2005/04/15 20:13:35 ritt
|
Revision 1.628 2005/04/15 20:13:35 ritt
|
||||||
Fixed problem with password file creation through logbook selection page
|
Fixed problem with password file creation through logbook selection page
|
||||||
|
|
||||||
@ -1403,6 +1406,7 @@ int build_subst_list(LOGBOOK * lbs, char list[][NAME_LENGTH], char value[][NAME_
|
|||||||
void highlight_searchtext(regex_t * re_buf, char *src, char *dst, BOOL hidden);
|
void highlight_searchtext(regex_t * re_buf, char *src, char *dst, BOOL hidden);
|
||||||
int parse_config_file(char *config_file);
|
int parse_config_file(char *config_file);
|
||||||
PMXML_NODE load_password_file(LOGBOOK * lbs);
|
PMXML_NODE load_password_file(LOGBOOK * lbs);
|
||||||
|
void load_password_files();
|
||||||
|
|
||||||
/*---- Funcions from the MIDAS library -----------------------------*/
|
/*---- Funcions from the MIDAS library -----------------------------*/
|
||||||
|
|
||||||
@ -4354,6 +4358,8 @@ int el_index_logbooks()
|
|||||||
free_logbook_hierarchy(phier);
|
free_logbook_hierarchy(phier);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
load_password_files();
|
||||||
|
|
||||||
return EL_SUCCESS;
|
return EL_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -21461,9 +21467,6 @@ void server_loop(void)
|
|||||||
if (!verbose && !running_as_daemon)
|
if (!verbose && !running_as_daemon)
|
||||||
eputs("done");
|
eputs("done");
|
||||||
|
|
||||||
/* load password files */
|
|
||||||
load_password_files();
|
|
||||||
|
|
||||||
/* listen for connection */
|
/* listen for connection */
|
||||||
status = listen(lsock, SOMAXCONN);
|
status = listen(lsock, SOMAXCONN);
|
||||||
if (status < 0) {
|
if (status < 0) {
|
||||||
@ -22180,7 +22183,6 @@ void server_loop(void)
|
|||||||
/* reload configuration */
|
/* reload configuration */
|
||||||
check_config();
|
check_config();
|
||||||
el_index_logbooks();
|
el_index_logbooks();
|
||||||
load_password_files();
|
|
||||||
_hup = FALSE;
|
_hup = FALSE;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user