Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
James Rouzier
OpenLDAP
Commits
7c20ca92
Commit
7c20ca92
authored
Oct 07, 2021
by
Howard Chu
Browse files
ITS#9713 log fatal config errors at LDAP_DEBUG_ANY
and make sure logfile_only doesn't mute failures to open logfile
parent
2995da7e
Changes
3
Hide whitespace changes
Inline
Side-by-side
servers/slapd/config.c
View file @
7c20ca92
...
...
@@ -383,7 +383,7 @@ int config_set_vals(ConfigTable *Conf, ConfigArgs *c) {
if
(
!
c
->
cr_msg
[
0
]
)
{
snprintf
(
c
->
cr_msg
,
sizeof
(
c
->
cr_msg
),
"<%s> handler exited with %d"
,
c
->
argv
[
0
],
rc
);
Debug
(
LDAP_DEBUG_
CONFIG
,
"%s: %s!
\n
"
,
Debug
(
LDAP_DEBUG_
ANY
,
"%s: %s!
\n
"
,
c
->
log
,
c
->
cr_msg
);
}
return
(
ARG_BAD_CONF
);
...
...
@@ -398,7 +398,7 @@ int config_set_vals(ConfigTable *Conf, ConfigArgs *c) {
else
{
snprintf
(
c
->
cr_msg
,
sizeof
(
c
->
cr_msg
),
"<%s> offset is missing base pointer"
,
c
->
argv
[
0
]
);
Debug
(
LDAP_DEBUG_
CONFIG
,
"%s: %s!
\n
"
,
Debug
(
LDAP_DEBUG_
ANY
,
"%s: %s!
\n
"
,
c
->
log
,
c
->
cr_msg
);
return
(
ARG_BAD_CONF
);
}
...
...
servers/slapd/logging.c
View file @
7c20ca92
...
...
@@ -118,22 +118,28 @@ int
logfile_open
(
const
char
*
path
)
{
struct
stat
st
;
int
fd
;
int
fd
,
saved_errno
;
fd
=
open
(
path
,
O_CREAT
|
O_WRONLY
,
0640
);
if
(
fd
<
0
)
return
errno
;
if
(
fd
<
0
)
{
saved_errno
=
errno
;
fail:
logfile_only
=
0
;
/* make sure something gets output */
return
saved_errno
;
}
if
(
fstat
(
fd
,
&
st
)
)
{
int
saved_errno
=
errno
;
saved_errno
=
errno
;
close
(
fd
);
return
saved_errno
;
goto
fail
;
}
if
(
!
logfile_path
[
0
]
)
{
logpathlen
=
strlen
(
path
);
if
(
logpathlen
>=
sizeof
(
logfile_path
)
)
return
ENAMETOOLONG
;
if
(
logpathlen
>=
sizeof
(
logfile_path
)
)
{
saved_errno
=
ENAMETOOLONG
;
goto
fail
;
}
strcpy
(
logfile_path
,
path
);
strcpy
(
logpaths
[
0
],
path
);
strcpy
(
logpaths
[
1
],
path
);
...
...
servers/slapd/slapcommon.c
View file @
7c20ca92
...
...
@@ -574,6 +574,7 @@ slap_tool_init(
break
;
}
}
slap_debug_orig
=
slap_debug
;
#if defined(LDAP_SYSLOG) && defined(LDAP_DEBUG)
if
(
start_syslog
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment