projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e3d7efd
)
* Eliminate HAVE_FLOCK from the build system. Instead, test for the presence of...
author
Art Cancro
<ajc@citadel.org>
Thu, 11 Feb 2010 23:22:57 +0000
(23:22 +0000)
committer
Art Cancro
<ajc@citadel.org>
Thu, 11 Feb 2010 23:22:57 +0000
(23:22 +0000)
citadel/control.c
patch
|
blob
|
history
diff --git
a/citadel/control.c
b/citadel/control.c
index 8b57b698c11e06363723421816ec2233827846d6..e9725e3fa46433f3d5723ae9ef77dc0d8649a852 100644
(file)
--- a/
citadel/control.c
+++ b/
citadel/control.c
@@
-77,12
+77,7
@@
long control_highest_user = 0;
*/
void lock_control(void)
{
*/
void lock_control(void)
{
-#ifdef HAVE_FLOCK
-/*
- * TODO: solaris manpages describe this function, but the headers
- * don't show it!
- */
-
+#if defined(LOCK_EX) && defined(LOCK_NB)
if (flock(fileno(control_fp), (LOCK_EX | LOCK_NB))) {
CtdlLogPrintf(CTDL_EMERG, "citserver: unable to lock %s.\n", file_citadel_control);
CtdlLogPrintf(CTDL_EMERG, "Is another citserver already running?\n");
if (flock(fileno(control_fp), (LOCK_EX | LOCK_NB))) {
CtdlLogPrintf(CTDL_EMERG, "citserver: unable to lock %s.\n", file_citadel_control);
CtdlLogPrintf(CTDL_EMERG, "Is another citserver already running?\n");
@@
-720,7
+715,7
@@
void cmd_conf(char *argbuf)
CTDL_MODULE_INIT(control)
{
if (!threading) {
CTDL_MODULE_INIT(control)
{
if (!threading) {
- CtdlRegisterProtoHook(cmd_conf, "CONF", "
Autoconverted. TODO: document me.
");
+ CtdlRegisterProtoHook(cmd_conf, "CONF", "
get/set system configuration
");
}
/* return our Subversion id for the Log */
return "$Id$";
}
/* return our Subversion id for the Log */
return "$Id$";