NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

virt-login-shell: improve error message grammar

Browse Source 
and wrap some long lines

Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Ruben Kerkhof 2013-08-13 17:28:06 -06:00 committed by Eric Blake
parent b777a12d7b
commit 11cdc424d3
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/virt-login-shell.c
View File

@ -76,7 +76,8 @@ static int virLoginShellAllowedUser(virConfPtr conf,
/* Calc length and check items */ /* Calc length and check items */
for (pp = p->list; pp; pp = pp->next) { for (pp = p->list; pp; pp = pp->next) {
if (pp->type != VIR_CONF_STRING) { if (pp->type != VIR_CONF_STRING) {
virReportSystemError(EINVAL, "%s", _("shell must be a list of strings")); virReportSystemError(EINVAL, "%s",
_("shell must be a list of strings"));
goto cleanup; goto cleanup;
} else { } else {
/* /*
@ -105,7 +106,9 @@ static int virLoginShellAllowedUser(virConfPtr conf,
} }
} }
} }
virReportSystemError(EPERM, _("%s not matched against 'allowed_users' in %s"), name, conf_file); virReportSystemError(EPERM,
_("%s not matched against 'allowed_users' in %s"),
name, conf_file);
cleanup: cleanup:
VIR_FREE(gname); VIR_FREE(gname);
return ret; return ret;
@ -128,7 +131,8 @@ static char **virLoginShellGetShellArgv(virConfPtr conf)
/* Calc length and check items */ /* Calc length and check items */
for (len = 0, pp = p->list; pp; len++, pp = pp->next) { for (len = 0, pp = p->list; pp; len++, pp = pp->next) {
if (pp->type != VIR_CONF_STRING) { if (pp->type != VIR_CONF_STRING) {
virReportSystemError(EINVAL, "%s", _("shell must be a list of strings")); virReportSystemError(EINVAL, "%s",
_("shell must be a list of strings"));
goto error; goto error;
} }
} }
@ -248,7 +252,8 @@ main(int argc, char **argv)
} }
if (uid == 0) { if (uid == 0) {
virReportSystemError(EPERM, _("%s must be run by non root users"), progname); virReportSystemError(EPERM, _("%s must be run by non root users"),
progname);
goto cleanup; goto cleanup;
} }
@ -340,11 +345,12 @@ main(int argc, char **argv)
if (ccpid == 0) { if (ccpid == 0) {
if (chdir(homedir) < 0) { if (chdir(homedir) < 0) {
virReportSystemError(errno, _("Unable chdir(%s)"), homedir); virReportSystemError(errno, _("Unable to chdir(%s)"), homedir);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if (execv(shargv[0], (char *const*) shargv) < 0) { if (execv(shargv[0], (char *const*) shargv) < 0) {
virReportSystemError(errno, _("Unable exec shell %s"), shargv[0]); virReportSystemError(errno, _("Unable to exec shell %s"),
shargv[0]);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
} }