diff options
| author | NeilBrown <neilb@suse.com> | 2016-12-17 12:58:21 -0500 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2016-12-20 13:29:04 -0500 |
| commit | 8bffe8c5ec1a82d4cb8e57cb8afc5a3571b0f947 (patch) | |
| tree | 3716c4f5c81d6e4f99658eeac327d366c01ac951 /utils/gssd/gssd.c | |
| parent | 107620082e29d3c62d28847dc2837bfd0b5667c8 (diff) | |
| download | nfs-utils-8bffe8c5ec1a82d4cb8e57cb8afc5a3571b0f947.tar.gz nfs-utils-8bffe8c5ec1a82d4cb8e57cb8afc5a3571b0f947.tar.xz nfs-utils-8bffe8c5ec1a82d4cb8e57cb8afc5a3571b0f947.zip | |
gssd: add /etc/nfs.conf support
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'utils/gssd/gssd.c')
| -rw-r--r-- | utils/gssd/gssd.c | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/utils/gssd/gssd.c b/utils/gssd/gssd.c index 3b4d147..4d18d35 100644 --- a/utils/gssd/gssd.c +++ b/utils/gssd/gssd.c @@ -71,6 +71,7 @@ #include "gss_util.h" #include "krb5_util.h" #include "nfslib.h" +#include "conffile.h" static char *pipefs_path = GSSD_PIPEFS_DIR; static DIR *pipefs_dir; @@ -78,6 +79,7 @@ static int pipefs_fd; static int inotify_fd; struct event inotify_ev; +char *conf_path = NFS_CONFFILE; char *keytabfile = GSSD_DEFAULT_KEYTAB_FILE; char **ccachesearch; int use_memcache = 0; @@ -847,6 +849,33 @@ main(int argc, char *argv[]) char *progname; char *ccachedir = NULL; struct event sighup_ev; + char *s; + + conf_init(); + use_memcache = conf_get_bool("gssd", "use-memcache", use_memcache); + root_uses_machine_creds = conf_get_bool("gssd", "use-machine-creds", + root_uses_machine_creds); + avoid_dns = conf_get_bool("gssd", "avoid-dns", avoid_dns); +#ifdef HAVE_SET_ALLOWABLE_ENCTYPES + limit_to_legacy_enctypes = conf_get_bool("gssd", "limit-to-legacy-enctypes", + limit_to_legacy_enctypes); +#endif + context_timeout = conf_get_num("gssd", "context-timeout", context_timeout); + rpc_timeout = conf_get_num("gssd", "rpc-timeout", rpc_timeout); + s = conf_get_str("gssd", "pipefs-directory"); + if (!s) + s = conf_get_str("general", "pipefs-directory"); + if (s) + pipefs_path = s; + s = conf_get_str("gssd", "keytab-file"); + if (s) + keytabfile = s; + s = conf_get_str("gssd", "cred-cache-directory"); + if (s) + ccachedir = s; + s = conf_get_str("gssd", "preferred-realm"); + if (s) + preferred_realm = s; while ((opt = getopt(argc, argv, "DfvrlmnMp:k:d:t:T:R:")) != -1) { switch (opt) { |