summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2002-12-27 19:29:52 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2002-12-27 19:29:52 +0000
commitd7fe456f61e86d8bfeffb6a4557ddb7512326d1c (patch)
tree55af31e97ce0d27943ed997a3bbfbd859f152845
parentdc63794ae4cc1ae2c99fbc61f5f369da963fc7cf (diff)
downloadmailutils-d7fe456f61e86d8bfeffb6a4557ddb7512326d1c.tar.gz
mailutils-d7fe456f61e86d8bfeffb6a4557ddb7512326d1c.tar.bz2
Added NLS support
-rw-r--r--auth/Makefile.am1
-rw-r--r--auth/pam.c5
-rw-r--r--auth/sql.c33
-rw-r--r--auth/virtual.c5
4 files changed, 24 insertions, 20 deletions
diff --git a/auth/Makefile.am b/auth/Makefile.am
index dfbc1a16f..0ec2cc027 100644
--- a/auth/Makefile.am
+++ b/auth/Makefile.am
@@ -12,4 +12,5 @@ pam.c \
sql.c \
virtual.c
+libmuauth_la_LIBADD = @LTLIBINTL@
libmuauth_la_LDFLAGS = -version-info 0:0:0
diff --git a/auth/pam.c b/auth/pam.c
index 62d065c4e..b9cab119c 100644
--- a/auth/pam.c
+++ b/auth/pam.c
@@ -45,6 +45,7 @@
#include <mailutils/mailbox.h>
#include <mailutils/argp.h>
#include <mailutils/mu_auth.h>
+#include <mailutils/nls.h>
char *pam_service = NULL;
@@ -150,8 +151,8 @@ mu_pam_argp_parser (int key, char *arg, struct argp_state *state)
}
static struct argp_option mu_pam_argp_option[] = {
- { "pam-service", ARG_PAM_SERVICE, "STRING", 0,
- "Use STRING as PAM service name", 0},
+ { "pam-service", ARG_PAM_SERVICE, N_("STRING"), 0,
+ N_("Use STRING as PAM service name"), 0},
{ NULL, 0, NULL, 0, NULL, 0 }
};
diff --git a/auth/sql.c b/auth/sql.c
index 631e49ce6..a17901de0 100644
--- a/auth/sql.c
+++ b/auth/sql.c
@@ -43,6 +43,7 @@
#include <mailutils/argp.h>
#include <mailutils/mu_auth.h>
#include <mailutils/error.h>
+#include <mailutils/nls.h>
#ifdef HAVE_MYSQL
#include <mysql/mysql.h>
@@ -396,22 +397,22 @@ mu_sql_authenticate (void *ignored_return_data, void *key,
# define ARG_SQL_PORT 8
static struct argp_option mu_sql_argp_option[] = {
- {"sql-getpwnam", ARG_SQL_GETPWNAM, "QUERY", 0,
- "SQL query to retrieve a passwd entry based on username", 0},
- {"sql-getpwuid", ARG_SQL_GETPWUID, "QUERY", 0,
- "SQL query to retrieve a passwd entry based on UID", 0},
- {"sql-getpass", ARG_SQL_GETPASS, "QUERY", 0,
- "SQL query to retrieve a password from the database", 0},
- {"sql-host", ARG_SQL_HOST, "HOSTNAME", 0,
- "Name or IP of MySQL server to connect to", 0},
- {"sql-user", ARG_SQL_USER, "NAME", 0,
- "SQL user name", 0},
- {"sql-passwd", ARG_SQL_PASSWD, "STRING", 0,
- "SQL connection password", 0},
- {"sql-db", ARG_SQL_DB, "STRING", 0,
- "Name of the database to connect to", 0},
- {"sql-port", ARG_SQL_PORT, "NUMBER", 0,
- "Port to use", 0},
+ {"sql-getpwnam", ARG_SQL_GETPWNAM, N_("QUERY"), 0,
+ N_("SQL query to retrieve a passwd entry based on username"), 0},
+ {"sql-getpwuid", ARG_SQL_GETPWUID, N_("QUERY"), 0,
+ N_("SQL query to retrieve a passwd entry based on UID"), 0},
+ {"sql-getpass", ARG_SQL_GETPASS, N_("QUERY"), 0,
+ N_("SQL query to retrieve a password from the database"), 0},
+ {"sql-host", ARG_SQL_HOST, N_("HOSTNAME"), 0,
+ N_("Name or IP of MySQL server to connect to"), 0},
+ {"sql-user", ARG_SQL_USER, N_("NAME"), 0,
+ N_("SQL user name"), 0},
+ {"sql-passwd", ARG_SQL_PASSWD, N_("STRING"), 0,
+ N_("SQL connection password"), 0},
+ {"sql-db", ARG_SQL_DB, N_("STRING"), 0,
+ N_("Name of the database to connect to"), 0},
+ {"sql-port", ARG_SQL_PORT, N_("NUMBER"), 0,
+ N_("Port to use"), 0},
{ NULL, 0, NULL, 0, NULL, 0 }
};
diff --git a/auth/virtual.c b/auth/virtual.c
index a786c92e2..069fbc79c 100644
--- a/auth/virtual.c
+++ b/auth/virtual.c
@@ -51,6 +51,7 @@
#include <mailutils/mailbox.h>
#include <mailutils/argp.h>
#include <mailutils/mu_auth.h>
+#include <mailutils/nls.h>
#ifdef ENABLE_VIRTUAL_DOMAINS
@@ -189,8 +190,8 @@ mu_virt_argp_parser (int key, char *arg, struct argp_state *state)
}
static struct argp_option mu_virt_argp_option[] = {
- { "virtual-passwd-dir", ARG_PWDDIR, "DIR", 0,
- "Search for virtual passwd file in DIR", 0},
+ { "virtual-passwd-dir", ARG_PWDDIR, N_("DIR"), 0,
+ N_("Search for virtual passwd file in DIR"), 0},
{ NULL, 0, NULL, 0, NULL, 0 }
};

Return to:

Send suggestions and report system problems to the System administrator.