|
 |
c88dcf |
diff --git a/utils/gssd/gssd.c b/utils/gssd/gssd.c
|
|
|
c88dcf |
index 2c14e5f..00df2fc 100644
|
|
|
c88dcf |
--- a/utils/gssd/gssd.c
|
|
|
c88dcf |
+++ b/utils/gssd/gssd.c
|
|
|
c88dcf |
@@ -888,6 +888,9 @@ main(int argc, char *argv[])
|
|
|
c88dcf |
|
|
|
c88dcf |
read_gss_conf();
|
|
|
c88dcf |
|
|
|
c88dcf |
+ verbosity = conf_get_num("gssd", "Verbosity", verbosity);
|
|
|
c88dcf |
+ rpc_verbosity = conf_get_num("gssd", "RPC-Verbosity", rpc_verbosity);
|
|
|
c88dcf |
+
|
|
|
c88dcf |
while ((opt = getopt(argc, argv, "DfvrlmnMp:k:d:t:T:R:")) != -1) {
|
|
|
c88dcf |
switch (opt) {
|
|
|
c88dcf |
case 'f':
|
|
|
c88dcf |
diff --git a/utils/gssd/svcgssd.c b/utils/gssd/svcgssd.c
|
|
|
c88dcf |
index 8e918cc..ec49b61 100644
|
|
|
c88dcf |
--- a/utils/gssd/svcgssd.c
|
|
|
c88dcf |
+++ b/utils/gssd/svcgssd.c
|
|
|
c88dcf |
@@ -113,6 +113,10 @@ main(int argc, char *argv[])
|
|
|
c88dcf |
else
|
|
|
c88dcf |
principal = s;
|
|
|
c88dcf |
|
|
|
c88dcf |
+ verbosity = conf_get_num("svcgssd", "Verbosity", verbosity);
|
|
|
c88dcf |
+ rpc_verbosity = conf_get_num("svcgssd", "RPC-Verbosity", rpc_verbosity);
|
|
|
c88dcf |
+ idmap_verbosity = conf_get_num("svcgssd", "IDMAP-Verbosity", idmap_verbosity);
|
|
|
c88dcf |
+
|
|
|
c88dcf |
while ((opt = getopt(argc, argv, "fivrnp:")) != -1) {
|
|
|
c88dcf |
switch (opt) {
|
|
|
c88dcf |
case 'f':
|
|
|
c88dcf |
diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c
|
|
|
c88dcf |
index 4811e0f..d14eef7 100644
|
|
|
c88dcf |
--- a/utils/idmapd/idmapd.c
|
|
|
c88dcf |
+++ b/utils/idmapd/idmapd.c
|
|
|
c88dcf |
@@ -261,6 +261,10 @@ main(int argc, char **argv)
|
|
|
c88dcf |
strlcpy(pipefsdir, xpipefsdir, sizeof(pipefsdir));
|
|
|
c88dcf |
CONF_SAVE(nobodyuser, conf_get_str("Mapping", "Nobody-User"));
|
|
|
c88dcf |
CONF_SAVE(nobodygroup, conf_get_str("Mapping", "Nobody-Group"));
|
|
|
c88dcf |
+ if (conf_get_bool("General", "server-only", false))
|
|
|
c88dcf |
+ clientstart = 0;
|
|
|
c88dcf |
+ if (conf_get_bool("General", "client-only", false))
|
|
|
c88dcf |
+ serverstart = 0;
|
|
|
c88dcf |
}
|
|
|
c88dcf |
} else {
|
|
|
c88dcf |
conf_path = NFS_CONFFILE;
|
|
|
c88dcf |
@@ -276,6 +280,10 @@ main(int argc, char **argv)
|
|
|
c88dcf |
"cache-expiration", DEFAULT_IDMAP_CACHE_EXPIRY);
|
|
|
c88dcf |
CONF_SAVE(nobodyuser, conf_get_str("Mapping", "Nobody-User"));
|
|
|
c88dcf |
CONF_SAVE(nobodygroup, conf_get_str("Mapping", "Nobody-Group"));
|
|
|
c88dcf |
+ if (conf_get_bool("General", "server-only", false))
|
|
|
c88dcf |
+ clientstart = 0;
|
|
|
c88dcf |
+ if (conf_get_bool("General", "client-only", false))
|
|
|
c88dcf |
+ serverstart = 0;
|
|
|
c88dcf |
}
|
|
|
c88dcf |
|
|
|
c88dcf |
while ((opt = getopt(argc, argv, GETOPTSTR)) != -1)
|
|
|
c88dcf |
diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c
|
|
|
c88dcf |
index 6b57e2b..b256bd9 100644
|
|
|
c88dcf |
--- a/utils/nfsd/nfsd.c
|
|
|
c88dcf |
+++ b/utils/nfsd/nfsd.c
|
|
|
c88dcf |
@@ -83,6 +83,9 @@ main(int argc, char **argv)
|
|
|
c88dcf |
|
|
|
c88dcf |
conf_init_file(NFS_CONFFILE);
|
|
|
c88dcf |
xlog_from_conffile("nfsd");
|
|
|
c88dcf |
+
|
|
|
c88dcf |
+ nfssvc_get_minormask(&minormask);
|
|
|
c88dcf |
+
|
|
|
c88dcf |
count = conf_get_num("nfsd", "threads", count);
|
|
|
c88dcf |
grace = conf_get_num("nfsd", "grace-time", grace);
|
|
|
c88dcf |
lease = conf_get_num("nfsd", "lease-time", lease);
|
|
|
c88dcf |
@@ -101,13 +104,19 @@ main(int argc, char **argv)
|
|
|
c88dcf |
for (i = 2; i <= 4; i++) {
|
|
|
c88dcf |
char tag[20];
|
|
|
c88dcf |
sprintf(tag, "vers%d", i);
|
|
|
c88dcf |
- if (conf_get_bool("nfsd", tag, NFSCTL_VERISSET(versbits, i)))
|
|
|
c88dcf |
+ if (conf_get_bool("nfsd", tag, NFSCTL_VERISSET(versbits, i))) {
|
|
|
c88dcf |
NFSCTL_VERSET(versbits, i);
|
|
|
c88dcf |
- else
|
|
|
c88dcf |
+ if (i == 4)
|
|
|
c88dcf |
+ minorvers = minorversset = minormask;
|
|
|
c88dcf |
+ } else {
|
|
|
c88dcf |
NFSCTL_VERUNSET(versbits, i);
|
|
|
c88dcf |
+ if (i == 4) {
|
|
|
c88dcf |
+ minorvers = 0;
|
|
|
c88dcf |
+ minorversset = minormask;
|
|
|
c88dcf |
+ }
|
|
|
c88dcf |
+ }
|
|
|
c88dcf |
}
|
|
|
c88dcf |
|
|
|
c88dcf |
- nfssvc_get_minormask(&minormask);
|
|
|
c88dcf |
/* We assume the kernel will default all minor versions to 'on',
|
|
|
c88dcf |
* and allow the config file to disable some.
|
|
|
c88dcf |
*/
|
|
|
c88dcf |
diff --git a/utils/statd/sm-notify.c b/utils/statd/sm-notify.c
|
|
|
c88dcf |
index 7a48473..29dad38 100644
|
|
|
c88dcf |
--- a/utils/statd/sm-notify.c
|
|
|
c88dcf |
+++ b/utils/statd/sm-notify.c
|
|
|
c88dcf |
@@ -503,6 +503,7 @@ main(int argc, char **argv)
|
|
|
c88dcf |
s = conf_get_str("statd", "state-directory-path");
|
|
|
c88dcf |
if (s && !nsm_setup_pathnames(argv[0], s))
|
|
|
c88dcf |
exit(1);
|
|
|
c88dcf |
+ opt_update_state = conf_get_bool("sm-notify", "update-state", opt_update_state);
|
|
|
c88dcf |
|
|
|
c88dcf |
while ((c = getopt(argc, argv, "dm:np:v:P:f")) != -1) {
|
|
|
c88dcf |
switch (c) {
|