On 1/12/16 7:14 AM, Roger Pau Monne wrote: > According to the FreeBSD sysconf man page [0] if the variable is associated > with functionality that is not supported, -1 is returned and errno is not > modified. Modify libxl__dm_runas_helper so it's able to correctly > deal with this situation by setting the initial buffer value to 2048. > > [0] https://www.freebsd.org/cgi/man.cgi?query=sysconf > > Signed-off-by: Roger Pau Monné <roger....@citrix.com> > --- > tools/libxl/libxl_dm.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c > index 0aaefd9..ec8fb51 100644 > --- a/tools/libxl/libxl_dm.c > +++ b/tools/libxl/libxl_dm.c > @@ -728,7 +728,14 @@ static int libxl__dm_runas_helper(libxl__gc *gc, const > char *username) > long buf_size; > int ret; > > + errno = 0; > buf_size = sysconf(_SC_GETPW_R_SIZE_MAX); > + if (buf_size < 0 && errno == 0) { > + buf_size = 2048; > + LOG(DEBUG, > +"sysconf(_SC_GETPW_R_SIZE_MAX) is not supported, using a buffer size of %ld", > + buf_size); > + } > if (buf_size < 0) { > LOGE(ERROR, "sysconf(_SC_GETPW_R_SIZE_MAX) returned error %ld", > buf_size); >
So on Linux the behavior is somewhat similar [1]. But I took a peek at the libvirt code for doing the similar thing and I notice that they just default if the value is returned as less than 0 [2]. Reading both man pages it seems like that would be the better bet instead of failing how the current code is. Your fix probably makes it fail less but it could still error out senselessly. Just a suggestion for an improvement overall. [1] http://man7.org/linux/man-pages/man3/sysconf.3.html#RETURN_VALUE [2] http://libvirt.org/git/?p=libvirt.git;a=blob;f=src/util/virutil.c;h=bb9604a0c1ffb9c99e454e84878a8c376f773046;hb=HEAD#l935 -- Doug Goldstein
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
