OpenAFS Master Repository branch, master, updated. openafs-devel-1_5_76-2517-g0f30c95
Gerrit Code Review
gerrit@openafs.org
Fri, 11 May 2012 18:49:46 -0700 (PDT)
The following commit has been merged in the master branch:
commit 0f30c95a03ecf2a964db566fd8c3e96c1bcb6211
Author: Simon Wilkinson <sxw@your-file-system.com>
Date: Sun Oct 9 01:20:57 2011 +0100
cmd: Add support for pulling options from files
With this change, we gain the ability to set our command line options
from krb5.conf configuration files. This is only available for tools
which are implemented using the new cmd_OptionAs accessor methods.
Callers should load their configuration file using
cmd_OpenConfigFile("/path/to/config/file.conf");
(an addition to libauth to return a path to a system wide
configuration file will be forthcoming)
and then set their command name (for example, "fileserver", "afsd",
"vos" and so on) using
cmd_SetCommandName("mycommand");
The accessor functions will then populate their return values with
either:
a) The command line options, if specified
b) The contents of the tag matching the option name, in the
[command_subcommand] section of the configuration file, if it
exists
c) The contents of the same tag, in the [command] section of the
configuration file, if it that exists.
d) The contents of the same tag in the [defaults] section of the
configuration file.
Callers can also gain access to the entire configuration file by
calling cmd_RawFile, or to just the section corresponding to their
command line by calling cmd_RawSection. Note that when using the file
directly, it is up to callers to preserve consistency by implementing
similar inheritance rules as the above.
Change-Id: Ic501ab296af3638f961486869af79c9ce47b77b8
Reviewed-on: http://gerrit.openafs.org/7135
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
src/butc/Makefile.in | 2 +-
src/cmd/Makefile.in | 5 +-
src/cmd/cmd.c | 227 ++++++++++++++++++++++++++++++++++++++------
src/cmd/cmd.p.h | 5 +
src/venus/test/Makefile.in | 3 +-
tests/cmd/command-t.c | 33 ++++++-
tests/cmd/test1.conf | 6 +
7 files changed, 246 insertions(+), 35 deletions(-)
--
OpenAFS Master Repository