Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
817b7f60
Commit
817b7f60
authored
Nov 12, 2013
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move the defaults for ${user} and ${group} over with the other
run-time determined defaults.
parent
78fd62b7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
9 deletions
+8
-9
mgt_main.c
bin/varnishd/mgt/mgt_main.c
+8
-0
mgt_param.c
bin/varnishd/mgt/mgt_param.c
+0
-9
No files found.
bin/varnishd/mgt/mgt_main.c
View file @
817b7f60
...
...
@@ -36,6 +36,8 @@
#include <ctype.h>
#include <fcntl.h>
#include <grp.h>
#include <pwd.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
...
...
@@ -415,6 +417,12 @@ main(int argc, char * const *argv)
MCF_CollectParams
();
/* If we have nobody/nogroup, use them as defaults */
if
(
getpwnam
(
"nobody"
)
!=
NULL
)
MCF_SetDefault
(
"user"
,
"nobody"
);
if
(
getgrnam
(
"nogroup"
)
!=
NULL
)
MCF_SetDefault
(
"group"
,
"nogroup"
);
if
(
sizeof
(
void
*
)
<
8
)
{
/*
* Adjust default parameters for 32 bit systems to conserve
...
...
bin/varnishd/mgt/mgt_param.c
View file @
817b7f60
...
...
@@ -30,10 +30,7 @@
#include "config.h"
#include <ctype.h>
#include <grp.h>
#include <limits.h>
#include <math.h>
#include <pwd.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
...
...
@@ -415,12 +412,6 @@ MCF_CollectParams(void)
MCF_AddParams
(
mgt_parspec
);
MCF_AddParams
(
WRK_parspec
);
MCF_AddParams
(
VSL_parspec
);
/* If we have nobody/nogroup, use them as defaults */
if
(
getpwnam
(
"nobody"
)
!=
NULL
)
MCF_SetDefault
(
"user"
,
"nobody"
);
if
(
getgrnam
(
"nogroup"
)
!=
NULL
)
MCF_SetDefault
(
"group"
,
"nogroup"
);
}
/*--------------------------------------------------------------------*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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