7:01 a.m.
The help message indicates that the CA certificate is
$sysconfdir/pki/CA/caert.pem while the actual path is
$sysconfdir/pki/CA/cacert.pem
This commit also fixes all translations files (through sed -i) to
avoid trivial fuzzy translations.
Signed-off-by: Christophe Fergeau <cfergeau(a)redhat.com>
---
daemon/libvirtd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index c9cd1a1..87d42b2 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -1063,7 +1063,7 @@ daemonUsage(const char *argv0, bool privileged)
" %s/run/libvirt/libvirt-sock-ro\n"
"\n"
" TLS:\n"
- " CA certificate: %s/pki/CA/caert.pem\n"
+ " CA certificate: %s/pki/CA/cacert.pem\n"
" Server certificate: %s/pki/libvirt/servercert.pem\n"
" Server private key:
%s/pki/libvirt/private/serverkey.pem\n"
"\n"
--
1.8.3.1
7:01 a.m.
New subject: [libvirt] [PATCH 2/2] daemon: Don't hardcode pki paths in help output
There are constants for these paths in remote_driver.h so we can
use these rather than duplicating them in the help output.
Signed-off-by: Christophe Fergeau <cfergeau(a)redhat.com>
---
daemon/libvirtd.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 87d42b2..f714cb1 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -1063,9 +1063,9 @@ daemonUsage(const char *argv0, bool privileged)
" %s/run/libvirt/libvirt-sock-ro\n"
"\n"
" TLS:\n"
- " CA certificate: %s/pki/CA/cacert.pem\n"
- " Server certificate: %s/pki/libvirt/servercert.pem\n"
- " Server private key:
%s/pki/libvirt/private/serverkey.pem\n"
+ " CA certificate: %s\n"
+ " Server certificate: %s\n"
+ " Server private key: %s\n"
"\n"
" PID file (unless overridden by -p):\n"
" %s/run/libvirtd.pid\n"
@@ -1073,9 +1073,9 @@ daemonUsage(const char *argv0, bool privileged)
SYSCONFDIR,
LOCALSTATEDIR,
LOCALSTATEDIR,
- SYSCONFDIR,
- SYSCONFDIR,
- SYSCONFDIR,
+ LIBVIRT_CACERT,
+ LIBVIRT_SERVERCERT,
+ LIBVIRT_SERVERKEY,
LOCALSTATEDIR);
} else {
fprintf(stderr, "%s",
--
1.8.3.1
8:57 a.m.
New subject: [libvirt] [PATCH 2/2] daemon: Don't hardcode pki paths in help output
On 09/18/2013 06:01 AM, Christophe Fergeau wrote:
There are constants for these paths in remote_driver.h so we can
use these rather than duplicating them in the help output.
Signed-off-by: Christophe Fergeau <cfergeau(a)redhat.com>
---
daemon/libvirtd.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
ACK and pushed.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
8:10 a.m.
On Wed, Sep 18, 2013 at 7:01 AM, Christophe Fergeau <cfergeau(a)redhat.com> wrote:
The help message indicates that the CA certificate is
$sysconfdir/pki/CA/caert.pem while the actual path is
$sysconfdir/pki/CA/cacert.pem
This commit also fixes all translations files (through sed -i) to
avoid trivial fuzzy translations.
Signed-off-by: Christophe Fergeau <cfergeau(a)redhat.com>
---
daemon/libvirtd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index c9cd1a1..87d42b2 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -1063,7 +1063,7 @@ daemonUsage(const char *argv0, bool privileged)
" %s/run/libvirt/libvirt-sock-ro\n"
"\n"
" TLS:\n"
- " CA certificate: %s/pki/CA/caert.pem\n"
+ " CA certificate: %s/pki/CA/cacert.pem\n"
" Server certificate: %s/pki/libvirt/servercert.pem\n"
" Server private key:
%s/pki/libvirt/private/serverkey.pem\n"
"\n"
--
1.8.3.1
--
libvir-list mailing list
libvir-list(a)redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
ACK.
--
Doug Goldstein
8:45 a.m.
On 09/18/2013 06:01 AM, Christophe Fergeau wrote:
The help message indicates that the CA certificate is
$sysconfdir/pki/CA/caert.pem while the actual path is
$sysconfdir/pki/CA/cacert.pem
This commit also fixes all translations files (through sed -i) to
avoid trivial fuzzy translations.
No, you actually didn't patch all translation files (but that's a GOOD
thing - the only time we should patch .po files is at a release).
ACK and pushed with an amended commit message.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
8:57 a.m.
On Wed, Sep 18, 2013 at 07:45:16AM -0600, Eric Blake wrote:
On 09/18/2013 06:01 AM, Christophe Fergeau wrote:
> The help message indicates that the CA certificate is
> $sysconfdir/pki/CA/caert.pem while the actual path is
> $sysconfdir/pki/CA/cacert.pem
> This commit also fixes all translations files (through sed -i) to
> avoid trivial fuzzy translations.
No, you actually didn't patch all translation files (but that's a GOOD
thing - the only time we should patch .po files is at a release).
ACK and pushed with an amended commit message.
Thanks for fixing the commit log, I had initially patched the po files, but
since 2/2 would create fuzzy strings anyway, I dropped the po files from
1/2, and forgot to update the commit log. Thanks for the review and the
push!
Christophe
4085
days inactive
4085
days old
5 comments
3 participants
participants (3)
-
Christophe Fergeau -
Doug Goldstein -
Eric Blake