1. 09 8月, 2019 1 次提交
    • M
      nss: Don't stop parsing on unexpected key · 8be0ab63
      Michal Privoznik 提交于
      Due to latest rewrite of NSS module, we are doing yajl parsing
      ourselves. This means, we had to introduce couple of callback
      that yajl calls. According to its documentation, a callback can
      cancel parsing if it returns a zero value. Well, we do just that
      in the string callback (findLeasesParserString()). If the JSON
      file we are parsing contains a key that we are not interested in,
      zero is returned meaning stop all parsing. This is not correct,
      because the JSON file can contain some other keys which are not
      harmful for our address translation (e.g. 'client-id').
      Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
      Reviewed-by: NDaniel P. Berrangé <berrange@redhat.com>
      8be0ab63
  2. 08 8月, 2019 1 次提交
    • D
      tools: avoid accidentally using files from gnulib · 8242ce4f
      Daniel P. Berrangé 提交于
      The AM_CPPFLAGS setting includes the gnulib headers, which
      means we can get some replacement functions defined. Since
      virt-login-shell and the NSS module intentionally don't link
      to gnulib, these replacement functions causes link failures.
      
      This was seen cross-compiling on Debian for example:
      
      virt-login-shell.o: In function `main':
      /builds/libvirt/libvirt/build/tools/../../tools/virt-login-shell.c:81: undefined reference to `rpl_strerror'
      /builds/libvirt/libvirt/build/tools/../../tools/virt-login-shell.c:66: undefined reference to `rpl_strerror'
      /builds/libvirt/libvirt/build/tools/../../tools/virt-login-shell.c:75: undefined reference to `rpl_strerror'
      
      The only way to avoid these replacement gnulib headers is
      to drop the -Ignulib/lib flags. We do still want to use
      gnulib for configmake.h and intprops.h, but those can be
      included via their full path.
      
      We must also stop using internal.h, since that expects
      -Ignulib/lib to be on the include path in order to resolve
      the verify.h header.
      Reviewed-by: NMichal Privoznik <mprivozn@redhat.com>
      Signed-off-by: NDaniel P. Berrangé <berrange@redhat.com>
      8242ce4f
  3. 07 8月, 2019 3 次提交