Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Backports:SLE-15-SP1
gssproxy
gp_config.fix
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File gp_config.fix of Package gssproxy
Version of libinit_config in SLE12 does not have ini_config_augment. This means we cannot support /etc/gssproxy/*.conf files. --- man/gssproxy.8.xml | 21 --------------------- man/gssproxy.conf.5.xml | 6 +----- src/gp_config.c | 4 ++++ src/gssproxy.c | 2 -- 4 files changed, 5 insertions(+), 28 deletions(-) --- a/man/gssproxy.8.xml +++ b/man/gssproxy.8.xml @@ -88,27 +88,6 @@ </varlistentry> <varlistentry> <term> - <option>-C</option>,<option>--configdir</option> - </term> - <listitem> - <para> - Specify a non-default config dir. Files named of the - form "##-foo.conf" (that is, beginning with two digits - and a dash, and ending in ".conf") will be read in - numeric order from this directory, in addition to the - config file itself. The default is - <filename>/etc/gssproxy</filename>. For reference on - the config file syntax and options, consult the - <citerefentry> - <refentrytitle>gssproxy.conf</refentrytitle> - <manvolnum>5</manvolnum> - </citerefentry> - manual page. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> <option>-s</option>,<option>--socket</option> </term> <listitem> --- a/man/gssproxy.conf.5.xml +++ b/man/gssproxy.conf.5.xml @@ -33,11 +33,7 @@ values. </para> <para> - GSS-Proxy conf files must either be named "gssproxy.conf", or be - of the form "##-foo.conf" (that is, start with two numbers - followed by a dash, and end in ".conf"). Files not conforming to - this will be ignored unless specifically requested through command - line parameters. + The GSS-Proxy conf file must be named "gssproxy.conf". </para> </refsect1> --- a/src/gp_config.c +++ b/src/gp_config.c @@ -772,6 +772,7 @@ static int gp_config_from_dir(const char struct ref_array *error_list = NULL; int ret; +#if 0 const char *patterns[] = { /* match only files starting with "##-" and ending in ".conf" */ "^[0-9]\\{2\\}-.\\{1,\\}\\.conf$", @@ -801,6 +802,9 @@ static int gp_config_from_dir(const char &result_cfg, &error_list, NULL); +#else + ret = 0; +#endif if (ret) { if (error_list) { uint32_t i; --- a/src/gssproxy.c +++ b/src/gssproxy.c @@ -167,8 +167,6 @@ int main(int argc, const char *argv[]) _("Run interactive (not a daemon)"), NULL}, \ {"config", 'c', POPT_ARG_STRING, &opt_config_file, 0, \ _("Specify a non-default config file"), NULL}, \ - {"configdir", 'C', POPT_ARG_STRING, &opt_config_dir, 0, \ - _("Specify a non-default config directory"), NULL}, \ {"socket", 's', POPT_ARG_STRING, &opt_config_socket, 0, \ _("Specify a custom default socket"), NULL}, \ {"debug", 'd', POPT_ARG_NONE, &opt_debug, 0, \
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor