Commit 6af4e602 6af4e602477e23c4457e3101cffe93ca5eca5a27 by Sergey Poznyakoff

Fix diagnostic messages.

1 parent 916a4265
......@@ -236,7 +236,7 @@ _mu_conn_setup (LDAP **pld)
rc = ldap_initialize (&ld, ldapuri);
if (rc != LDAP_SUCCESS)
{
mu_error (_("Cannot create LDAP session handle for URI=%s (%d): %s\n"),
mu_error (_("Cannot create LDAP session handle for URI=%s (%d): %s"),
ldapuri, rc, ldap_err2string (rc));
free (ldapuri);
......@@ -434,7 +434,7 @@ _mu_entry_to_auth_data (LDAP *ld, LDAPMessage *msg,
/* FIXME: should use mu_debug_t */
rc = ldap_get_dn_ber (ld, msg, &ber, &bv);
ufn = ldap_dn2ufn (bv.bv_val);
mu_error ("INFO: %s\n", ufn);
mu_error ("INFO: %s", ufn);
ldap_memfree (ufn);
mu_assoc_get_iterator (ldap_param.field_map, &itr);
......
......@@ -378,7 +378,7 @@ mu_radius_authenticate (struct mu_auth_data **return_data MU_ARG_UNUSED,
if (!auth_request)
{
mu_error (_("--radius-auth-request is not specified"));
mu_error (_("radius request for auth is not specified"));
return EINVAL;
}
......@@ -416,7 +416,7 @@ mu_auth_radius_user_by_name (struct mu_auth_data **return_data,
if (!getpwnam_request)
{
mu_error (_("--radius-getpwnam-request is not specified"));
mu_error (_("radius request for getpwnam is not specified"));
return MU_ERR_FAILURE;
}
......@@ -457,7 +457,7 @@ mu_auth_radius_user_by_uid (struct mu_auth_data **return_data,
if (!getpwuid_request)
{
mu_error (_("--radius-getpwuid-request is not specified"));
mu_error (_("radius request for getpwuid is not specified"));
return MU_ERR_FAILURE;
}
......
......@@ -31,7 +31,7 @@ enum {
static struct argp_option _tls_argp_options[] = {
{"ssl-cert", OPT_SSL_CERT, N_("FILE"), OPTION_HIDDEN,
N_("Specify SSL certificate filep"), 0},
N_("Specify SSL certificate file"), 0},
{"ssl-key", OPT_SSL_KEY, N_("FILE"), OPTION_HIDDEN,
N_("Specify SSL certificate key"), },
{"ssl-cafile", OPT_SSL_CAFILE, N_("FILE"), OPTION_HIDDEN,
......
......@@ -404,13 +404,14 @@ mu_get_config (const char *file, const char *progname,
if (stat (file, &st))
{
if (errno != ENOENT)
mu_error (_("can't stat `%s'"), file);
mu_error (_("can't stat `%s': %s"), file, mu_strerror (errno));
return -1;
}
fd = open (file, O_RDONLY);
if (fd == -1)
{
mu_error (_("cannot open config file `%s'"), file);
mu_error (_("cannot open config file `%s': %s"), file,
mu_strerror (errno));
return -1;
}
......
......@@ -59,7 +59,7 @@ check_login_delay (char *username)
rc = mu_dbm_fetch (db, key, &data);
if (rc)
{
mu_diag_output (MU_DIAG_ERROR, _("Can't fetch login delay data: %s"),
mu_diag_output (MU_DIAG_ERROR, _("Cannot fetch login delay data: %s"),
mu_strerror (rc));
mu_dbm_close (db);
return 0;
......