Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Moved Andrew Stribblehill from a comment to Authors. Also changed a c…

…ouple of comments and messages.
  • Loading branch information...
commit 915f49387d173ab1bdc5fa9662af4201d5a239b9 1 parent 4b72ef3
@jimis jimis authored
View
1  AUTHORS
@@ -58,6 +58,7 @@ Russ Poyner
Frerich Raabe
Laurent Raufaste
Jean Remond
+Andrew Stribblehill
James Thompson
Neil H Watson
yac
View
16 cf-serverd/cf-serverd-functions.c
@@ -277,7 +277,6 @@ void StartServer(EvalContext *ctx, Policy **policy, GenericAgentConfig *config)
fd_set rset;
int ret_val;
CfLock thislock;
- time_t last_policy_reload = 0;
extern int COLLECT_WINDOW;
struct sockaddr_storage cin;
@@ -343,19 +342,20 @@ void StartServer(EvalContext *ctx, Policy **policy, GenericAgentConfig *config)
ActAsDaemon();
}
+ /* Close sd on exec, needed for not passing the socket to cf-runagent
+ * spawned commands. */
+ fcntl(sd, F_SETFD, FD_CLOEXEC);
+
#endif /* !__MINGW32__ */
WritePID("cf-serverd.pid");
-
-/* Andrew Stribblehill <ads@debian.org> -- close sd on exec */
-#ifndef __MINGW32__
- fcntl(sd, F_SETFD, FD_CLOEXEC);
-#endif
CollectCallStart(COLLECT_INTERVAL);
+ time_t last_policy_reload = 0;
+
while (!IsPendingTermination())
{
- /* Note that this loop logic is single threaded, but ACTIVE_THREADS
- might still change in threads pertaining to service handling */
+ /* Note that this loop is executed from main thread only, but
+ ACTIVE_THREADS might still change from connectionthreads. */
if (ThreadLock(cft_server_children))
{
View
2  cf-serverd/server_transform.c
@@ -935,7 +935,7 @@ static void KeepFileAccessPromise(const EvalContext *ctx, const Promise *pp)
"Path does not exist, it's added as-is in access rules: %s",
path);
Log(LOG_LEVEL_INFO,
- "WARNING: that means that (not) having a trailing slash defines if it's a directory!");
+ "WARNING: this means that (not) having a trailing slash defines if it's (not) a directory!");
}
}
else /* file exists, path canonicalised */
Please sign in to comment.
Something went wrong with that request. Please try again.