From 5865f521f37846634f981582eaedad81abb08104 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Mon, 11 Nov 2013 14:14:31 +0100 Subject: Always ask for old password if changing NIS account * modules/pam_unix/pam_unix_passwd.c (pam_sm_chauthtok): ask for old password if NIS account. --- modules/pam_unix/pam_unix_passwd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'modules/pam_unix/pam_unix_passwd.c') diff --git a/modules/pam_unix/pam_unix_passwd.c b/modules/pam_unix/pam_unix_passwd.c index 9aae3b03..0cfc0f4d 100644 --- a/modules/pam_unix/pam_unix_passwd.c +++ b/modules/pam_unix/pam_unix_passwd.c @@ -614,7 +614,8 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) if (_unix_blankpasswd(pamh, ctrl, user)) { return PAM_SUCCESS; - } else if (off(UNIX__IAMROOT, ctrl)) { + } else if (off(UNIX__IAMROOT, ctrl) || + (on(UNIX_NIS, ctrl) && _unix_comesfromsource(pamh, user, 0, 1))) { /* instruct user what is happening */ if (asprintf(&Announce, _("Changing password for %s."), user) < 0) { -- cgit v1.2.3 From 154c00e1a480d2bac7e8aba3b13888eb909f8e7f Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Fri, 24 Jan 2014 23:53:09 +0000 Subject: Fix gratuitous use of strdup and x_strdup There is no need to copy strings passed as arguments to execve, the only potentially noticeable effect of using strdup/x_strdup would be a malformed argument list in case of memory allocation error. Also, x_strdup, being a thin wrapper around strdup, is of no benefit when its argument is known to be non-NULL, and should not be used in such cases. * modules/pam_cracklib/pam_cracklib.c (password_check): Use strdup instead of x_strdup, the latter is of no benefit in this case. * modules/pam_ftp/pam_ftp.c (lookup): Likewise. * modules/pam_userdb/pam_userdb.c (user_lookup): Likewise. * modules/pam_userdb/pam_userdb.h (x_strdup): Remove. * modules/pam_mkhomedir/pam_mkhomedir.c (create_homedir): Do not use x_strdup for strings passed as arguments to execve. * modules/pam_unix/pam_unix_acct.c (_unix_run_verify_binary): Likewise. * modules/pam_unix/pam_unix_passwd.c (_unix_run_update_binary): Likewise. * modules/pam_unix/support.c (_unix_run_helper_binary): Likewise. (_unix_verify_password): Use strdup instead of x_strdup, the latter is of no benefit in this case. * modules/pam_xauth/pam_xauth.c (run_coprocess): Do not use strdup for strings passed as arguments to execv. --- modules/pam_cracklib/pam_cracklib.c | 6 +++--- modules/pam_ftp/pam_ftp.c | 2 +- modules/pam_mkhomedir/pam_mkhomedir.c | 12 ++++++------ modules/pam_unix/pam_unix_acct.c | 10 +++++----- modules/pam_unix/pam_unix_passwd.c | 16 ++++++++-------- modules/pam_unix/support.c | 16 ++++++++-------- modules/pam_userdb/pam_userdb.c | 2 +- modules/pam_userdb/pam_userdb.h | 3 --- modules/pam_xauth/pam_xauth.c | 12 +++++------- 9 files changed, 37 insertions(+), 42 deletions(-) (limited to 'modules/pam_unix/pam_unix_passwd.c') diff --git a/modules/pam_cracklib/pam_cracklib.c b/modules/pam_cracklib/pam_cracklib.c index 56913477..5eefd0ba 100644 --- a/modules/pam_cracklib/pam_cracklib.c +++ b/modules/pam_cracklib/pam_cracklib.c @@ -619,16 +619,16 @@ static const char *password_check(pam_handle_t *pamh, struct cracklib_options *o return msg; } - newmono = str_lower(x_strdup(new)); + newmono = str_lower(strdup(new)); if (!newmono) msg = _("memory allocation error"); - usermono = str_lower(x_strdup(user)); + usermono = str_lower(strdup(user)); if (!usermono) msg = _("memory allocation error"); if (!msg && old) { - oldmono = str_lower(x_strdup(old)); + oldmono = str_lower(strdup(old)); if (oldmono) wrapped = malloc(strlen(oldmono) * 2 + 1); if (wrapped) { diff --git a/modules/pam_ftp/pam_ftp.c b/modules/pam_ftp/pam_ftp.c index 896a1dda..221d8f87 100644 --- a/modules/pam_ftp/pam_ftp.c +++ b/modules/pam_ftp/pam_ftp.c @@ -81,7 +81,7 @@ static int lookup(const char *name, const char *list, const char **_user) char *list_copy, *x; char *sptr = NULL; - list_copy = x_strdup(list); + list_copy = strdup(list); x = list_copy; while (list_copy && (l = strtok_r(x, ",", &sptr))) { x = NULL; diff --git a/modules/pam_mkhomedir/pam_mkhomedir.c b/modules/pam_mkhomedir/pam_mkhomedir.c index 0b5fc752..a867a738 100644 --- a/modules/pam_mkhomedir/pam_mkhomedir.c +++ b/modules/pam_mkhomedir/pam_mkhomedir.c @@ -134,7 +134,7 @@ create_homedir (pam_handle_t *pamh, options_t *opt, int i; struct rlimit rlim; static char *envp[] = { NULL }; - char *args[] = { NULL, NULL, NULL, NULL, NULL }; + const char *args[] = { NULL, NULL, NULL, NULL, NULL }; if (getrlimit(RLIMIT_NOFILE, &rlim)==0) { if (rlim.rlim_max >= MAX_FD_NO) @@ -145,12 +145,12 @@ create_homedir (pam_handle_t *pamh, options_t *opt, } /* exec the mkhomedir helper */ - args[0] = x_strdup(MKHOMEDIR_HELPER); - args[1] = (char *) user; - args[2] = x_strdup(opt->umask); - args[3] = x_strdup(opt->skeldir); + args[0] = MKHOMEDIR_HELPER; + args[1] = user; + args[2] = opt->umask; + args[3] = opt->skeldir; - execve(MKHOMEDIR_HELPER, args, envp); + execve(MKHOMEDIR_HELPER, (char *const *) args, envp); /* should not get here: exit with error */ D(("helper binary is not available")); diff --git a/modules/pam_unix/pam_unix_acct.c b/modules/pam_unix/pam_unix_acct.c index 8ec44492..dc505e73 100644 --- a/modules/pam_unix/pam_unix_acct.c +++ b/modules/pam_unix/pam_unix_acct.c @@ -101,7 +101,7 @@ int _unix_run_verify_binary(pam_handle_t *pamh, unsigned int ctrl, int i=0; struct rlimit rlim; static char *envp[] = { NULL }; - char *args[] = { NULL, NULL, NULL, NULL }; + const char *args[] = { NULL, NULL, NULL, NULL }; /* reopen stdout as pipe */ dup2(fds[1], STDOUT_FILENO); @@ -130,11 +130,11 @@ int _unix_run_verify_binary(pam_handle_t *pamh, unsigned int ctrl, } /* exec binary helper */ - args[0] = x_strdup(CHKPWD_HELPER); - args[1] = x_strdup(user); - args[2] = x_strdup("chkexpiry"); + args[0] = CHKPWD_HELPER; + args[1] = user; + args[2] = "chkexpiry"; - execve(CHKPWD_HELPER, args, envp); + execve(CHKPWD_HELPER, (char *const *) args, envp); pam_syslog(pamh, LOG_ERR, "helper binary execve failed: %m"); /* should not get here: exit with error */ diff --git a/modules/pam_unix/pam_unix_passwd.c b/modules/pam_unix/pam_unix_passwd.c index 0cfc0f4d..5f3a3db3 100644 --- a/modules/pam_unix/pam_unix_passwd.c +++ b/modules/pam_unix/pam_unix_passwd.c @@ -204,7 +204,7 @@ static int _unix_run_update_binary(pam_handle_t *pamh, unsigned int ctrl, const int i=0; struct rlimit rlim; static char *envp[] = { NULL }; - char *args[] = { NULL, NULL, NULL, NULL, NULL, NULL }; + const char *args[] = { NULL, NULL, NULL, NULL, NULL, NULL }; char buffer[16]; /* XXX - should really tidy up PAM here too */ @@ -222,18 +222,18 @@ static int _unix_run_update_binary(pam_handle_t *pamh, unsigned int ctrl, const } /* exec binary helper */ - args[0] = x_strdup(UPDATE_HELPER); - args[1] = x_strdup(user); - args[2] = x_strdup("update"); + args[0] = UPDATE_HELPER; + args[1] = user; + args[2] = "update"; if (on(UNIX_SHADOW, ctrl)) - args[3] = x_strdup("1"); + args[3] = "1"; else - args[3] = x_strdup("0"); + args[3] = "0"; snprintf(buffer, sizeof(buffer), "%d", remember); - args[4] = x_strdup(buffer); + args[4] = buffer; - execve(UPDATE_HELPER, args, envp); + execve(UPDATE_HELPER, (char *const *) args, envp); /* should not get here: exit with error */ D(("helper binary is not available")); diff --git a/modules/pam_unix/support.c b/modules/pam_unix/support.c index 19d72e66..3a849c81 100644 --- a/modules/pam_unix/support.c +++ b/modules/pam_unix/support.c @@ -567,7 +567,7 @@ static int _unix_run_helper_binary(pam_handle_t *pamh, const char *passwd, int i=0; struct rlimit rlim; static char *envp[] = { NULL }; - char *args[] = { NULL, NULL, NULL, NULL }; + const char *args[] = { NULL, NULL, NULL, NULL }; /* XXX - should really tidy up PAM here too */ @@ -593,15 +593,15 @@ static int _unix_run_helper_binary(pam_handle_t *pamh, const char *passwd, } /* exec binary helper */ - args[0] = strdup(CHKPWD_HELPER); - args[1] = x_strdup(user); + args[0] = CHKPWD_HELPER; + args[1] = user; if (off(UNIX__NONULL, ctrl)) { /* this means we've succeeded */ - args[2]=strdup("nullok"); + args[2]="nullok"; } else { - args[2]=strdup("nonull"); + args[2]="nonull"; } - execve(CHKPWD_HELPER, args, envp); + execve(CHKPWD_HELPER, (char *const *) args, envp); /* should not get here: exit with error */ D(("helper binary is not available")); @@ -788,10 +788,10 @@ int _unix_verify_password(pam_handle_t * pamh, const char *name login_name = ""; } - new->user = x_strdup(name ? name : ""); + new->user = strdup(name ? name : ""); new->uid = getuid(); new->euid = geteuid(); - new->name = x_strdup(login_name); + new->name = strdup(login_name); /* any previous failures for this user ? */ if (pam_get_data(pamh, data_name, &void_old) diff --git a/modules/pam_userdb/pam_userdb.c b/modules/pam_userdb/pam_userdb.c index ff040e6f..ba36ebf2 100644 --- a/modules/pam_userdb/pam_userdb.c +++ b/modules/pam_userdb/pam_userdb.c @@ -184,7 +184,7 @@ user_lookup (pam_handle_t *pamh, const char *database, const char *cryptmode, else key.dsize = strlen(key.dptr); } else { - key.dptr = x_strdup(user); + key.dptr = strdup(user); key.dsize = strlen(user); } diff --git a/modules/pam_userdb/pam_userdb.h b/modules/pam_userdb/pam_userdb.h index 3cd8fee0..86e9b47f 100644 --- a/modules/pam_userdb/pam_userdb.h +++ b/modules/pam_userdb/pam_userdb.h @@ -15,9 +15,6 @@ #define PAM_USE_FPASS_ARG 0x0040 #define PAM_TRY_FPASS_ARG 0x0080 -/* Useful macros */ -#define x_strdup(s) ( (s) ? strdup(s):NULL ) - /* The name of the module we are compiling */ #ifndef MODULE_NAME #define MODULE_NAME "pam_userdb" diff --git a/modules/pam_xauth/pam_xauth.c b/modules/pam_xauth/pam_xauth.c index e1c00646..70755475 100644 --- a/modules/pam_xauth/pam_xauth.c +++ b/modules/pam_xauth/pam_xauth.c @@ -127,8 +127,7 @@ run_coprocess(pam_handle_t *pamh, const char *input, char **output, if (child == 0) { /* We're the child. */ size_t j; - char *args[10]; - const char *tmp; + const char *args[10]; int maxopened; /* Drop privileges. */ if (setgid(gid) == -1) @@ -166,16 +165,15 @@ run_coprocess(pam_handle_t *pamh, const char *input, char **output, } /* Convert the varargs list into a regular array of strings. */ va_start(ap, command); - args[0] = strdup(command); + args[0] = command; for (j = 1; j < ((sizeof(args) / sizeof(args[0])) - 1); j++) { - tmp = va_arg(ap, const char*); - if (tmp == NULL) { + args[j] = va_arg(ap, const char*); + if (args[j] == NULL) { break; } - args[j] = strdup(tmp); } /* Run the command. */ - execv(command, args); + execv(command, (char *const *) args); /* Never reached. */ _exit(1); } -- cgit v1.2.3 From b0ec5d1e472a0cd74972bfe9575dcf6a3d0cad1c Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Fri, 24 Jan 2014 15:32:08 +0000 Subject: Introduce pam_modutil_sanitize_helper_fds This change introduces pam_modutil_sanitize_helper_fds - a new function that redirects standard descriptors and closes all other descriptors. pam_modutil_sanitize_helper_fds supports three types of input and output redirection: - PAM_MODUTIL_IGNORE_FD: do not redirect at all. - PAM_MODUTIL_PIPE_FD: redirect to a pipe. For stdin, it is implemented by creating a pipe, closing its write end, and redirecting stdin to its read end. Likewise, for stdout/stderr it is implemented by creating a pipe, closing its read end, and redirecting to its write end. Unlike stdin redirection, stdout/stderr redirection to a pipe has a side effect that a process writing to such descriptor should be prepared to handle SIGPIPE appropriately. - PAM_MODUTIL_NULL_FD: redirect to /dev/null. For stdin, it is implemented via PAM_MODUTIL_PIPE_FD because there is no functional difference. For stdout/stderr, it is classic redirection to /dev/null. PAM_MODUTIL_PIPE_FD is usually more suitable due to linux kernel security restrictions, but when the helper process might be writing to the corresponding descriptor and termination of the helper process by SIGPIPE is not desirable, one should choose PAM_MODUTIL_NULL_FD. * libpam/pam_modutil_sanitize.c: New file. * libpam/Makefile.am (libpam_la_SOURCES): Add it. * libpam/include/security/pam_modutil.h (pam_modutil_redirect_fd, pam_modutil_sanitize_helper_fds): New declarations. * libpam/libpam.map (LIBPAM_MODUTIL_1.1.9): New interface. * modules/pam_exec/pam_exec.c (call_exec): Use pam_modutil_sanitize_helper_fds. * modules/pam_mkhomedir/pam_mkhomedir.c (create_homedir): Likewise. * modules/pam_unix/pam_unix_acct.c (_unix_run_verify_binary): Likewise. * modules/pam_unix/pam_unix_passwd.c (_unix_run_update_binary): Likewise. * modules/pam_unix/support.c (_unix_run_helper_binary): Likewise. * modules/pam_xauth/pam_xauth.c (run_coprocess): Likewise. * modules/pam_unix/support.h (MAX_FD_NO): Remove. --- libpam/Makefile.am | 2 +- libpam/include/security/pam_modutil.h | 13 +++ libpam/libpam.map | 5 + libpam/pam_modutil_sanitize.c | 175 ++++++++++++++++++++++++++++++++++ modules/pam_exec/pam_exec.c | 34 ++----- modules/pam_mkhomedir/pam_mkhomedir.c | 15 +-- modules/pam_unix/pam_unix_acct.c | 23 ++--- modules/pam_unix/pam_unix_passwd.c | 20 ++-- modules/pam_unix/support.c | 20 ++-- modules/pam_unix/support.h | 2 - modules/pam_xauth/pam_xauth.c | 26 +++-- 11 files changed, 251 insertions(+), 84 deletions(-) create mode 100644 libpam/pam_modutil_sanitize.c (limited to 'modules/pam_unix/pam_unix_passwd.c') diff --git a/libpam/Makefile.am b/libpam/Makefile.am index 417ca779..685a797d 100644 --- a/libpam/Makefile.am +++ b/libpam/Makefile.am @@ -43,4 +43,4 @@ libpam_la_SOURCES = pam_account.c pam_auth.c pam_data.c pam_delay.c \ pam_modutil_cleanup.c pam_modutil_getpwnam.c pam_modutil_ioloop.c \ pam_modutil_getgrgid.c pam_modutil_getpwuid.c pam_modutil_getgrnam.c \ pam_modutil_getspnam.c pam_modutil_getlogin.c pam_modutil_ingroup.c \ - pam_modutil_priv.c + pam_modutil_priv.c pam_modutil_sanitize.c diff --git a/libpam/include/security/pam_modutil.h b/libpam/include/security/pam_modutil.h index 8087ba15..4ce8c552 100644 --- a/libpam/include/security/pam_modutil.h +++ b/libpam/include/security/pam_modutil.h @@ -129,6 +129,19 @@ extern int PAM_NONNULL((1,2)) pam_modutil_regain_priv(pam_handle_t *pamh, struct pam_modutil_privs *p); +enum pam_modutil_redirect_fd { + PAM_MODUTIL_IGNORE_FD, /* do not redirect */ + PAM_MODUTIL_PIPE_FD, /* redirect to a pipe */ + PAM_MODUTIL_NULL_FD, /* redirect to /dev/null */ +}; + +/* redirect standard descriptors, close all other descriptors. */ +extern int PAM_NONNULL((1)) +pam_modutil_sanitize_helper_fds(pam_handle_t *pamh, + enum pam_modutil_redirect_fd redirect_stdin, + enum pam_modutil_redirect_fd redirect_stdout, + enum pam_modutil_redirect_fd redirect_stderr); + #ifdef __cplusplus } #endif diff --git a/libpam/libpam.map b/libpam/libpam.map index b0885d65..d6835b47 100644 --- a/libpam/libpam.map +++ b/libpam/libpam.map @@ -67,3 +67,8 @@ LIBPAM_MODUTIL_1.1.3 { pam_modutil_drop_priv; pam_modutil_regain_priv; } LIBPAM_MODUTIL_1.1; + +LIBPAM_MODUTIL_1.1.9 { + global: + pam_modutil_sanitize_helper_fds; +} LIBPAM_MODUTIL_1.1.3; diff --git a/libpam/pam_modutil_sanitize.c b/libpam/pam_modutil_sanitize.c new file mode 100644 index 00000000..65f85d01 --- /dev/null +++ b/libpam/pam_modutil_sanitize.c @@ -0,0 +1,175 @@ +/* + * This file implements the following functions: + * pam_modutil_sanitize_helper_fds: + * redirects standard descriptors, closes all other descriptors. + */ + +#include "pam_modutil_private.h" +#include +#include +#include +#include +#include + +/* + * Creates a pipe, closes its write end, redirects fd to its read end. + * Returns fd on success, -1 otherwise. + */ +static int +redirect_in_pipe(pam_handle_t *pamh, int fd, const char *name) +{ + int in[2]; + + if (pipe(in) < 0) { + pam_syslog(pamh, LOG_ERR, "Could not create pipe: %m"); + return -1; + } + + close(in[1]); + + if (in[0] == fd) + return fd; + + if (dup2(in[0], fd) != fd) { + pam_syslog(pamh, LOG_ERR, "dup2 of %s failed: %m", name); + fd = -1; + } + + close(in[0]); + return fd; +} + +/* + * Creates a pipe, closes its read end, redirects fd to its write end. + * Returns fd on success, -1 otherwise. + */ +static int +redirect_out_pipe(pam_handle_t *pamh, int fd, const char *name) +{ + int out[2]; + + if (pipe(out) < 0) { + pam_syslog(pamh, LOG_ERR, "Could not create pipe: %m"); + return -1; + } + + close(out[0]); + + if (out[1] == fd) + return fd; + + if (dup2(out[1], fd) != fd) { + pam_syslog(pamh, LOG_ERR, "dup2 of %s failed: %m", name); + fd = -1; + } + + close(out[1]); + return fd; +} + +/* + * Opens /dev/null for writing, redirects fd there. + * Returns fd on success, -1 otherwise. + */ +static int +redirect_out_null(pam_handle_t *pamh, int fd, const char *name) +{ + int null = open("/dev/null", O_WRONLY); + + if (null < 0) { + pam_syslog(pamh, LOG_ERR, "open of %s failed: %m", "/dev/null"); + return -1; + } + + if (null == fd) + return fd; + + if (dup2(null, fd) != fd) { + pam_syslog(pamh, LOG_ERR, "dup2 of %s failed: %m", name); + fd = -1; + } + + close(null); + return fd; +} + +static int +redirect_out(pam_handle_t *pamh, enum pam_modutil_redirect_fd mode, + int fd, const char *name) +{ + switch (mode) { + case PAM_MODUTIL_PIPE_FD: + if (redirect_out_pipe(pamh, fd, name) < 0) + return -1; + break; + case PAM_MODUTIL_NULL_FD: + if (redirect_out_null(pamh, fd, name) < 0) + return -1; + break; + case PAM_MODUTIL_IGNORE_FD: + break; + } + return fd; +} + +/* Closes all descriptors after stderr. */ +static void +close_fds(void) +{ + /* + * An arbitrary upper limit for the maximum file descriptor number + * returned by RLIMIT_NOFILE. + */ + const int MAX_FD_NO = 65535; + + /* The lower limit is the same as for _POSIX_OPEN_MAX. */ + const int MIN_FD_NO = 20; + + int fd; + struct rlimit rlim; + + if (getrlimit(RLIMIT_NOFILE, &rlim) || rlim.rlim_max > MAX_FD_NO) + fd = MAX_FD_NO; + else if (rlim.rlim_max < MIN_FD_NO) + fd = MIN_FD_NO; + else + fd = rlim.rlim_max - 1; + + for (; fd > STDERR_FILENO; --fd) + close(fd); +} + +int +pam_modutil_sanitize_helper_fds(pam_handle_t *pamh, + enum pam_modutil_redirect_fd stdin_mode, + enum pam_modutil_redirect_fd stdout_mode, + enum pam_modutil_redirect_fd stderr_mode) +{ + if (stdin_mode != PAM_MODUTIL_IGNORE_FD && + redirect_in_pipe(pamh, STDIN_FILENO, "stdin") < 0) { + return -1; + } + + if (redirect_out(pamh, stdout_mode, STDOUT_FILENO, "stdout") < 0) + return -1; + + /* + * If stderr should not be ignored and + * redirect mode for stdout and stderr are the same, + * optimize by redirecting stderr to stdout. + */ + if (stderr_mode != PAM_MODUTIL_IGNORE_FD && + stdout_mode == stderr_mode) { + if (dup2(STDOUT_FILENO, STDERR_FILENO) != STDERR_FILENO) { + pam_syslog(pamh, LOG_ERR, + "dup2 of %s failed: %m", "stderr"); + return -1; + } + } else { + if (redirect_out(pamh, stderr_mode, STDERR_FILENO, "stderr") < 0) + return -1; + } + + close_fds(); + return 0; +} diff --git a/modules/pam_exec/pam_exec.c b/modules/pam_exec/pam_exec.c index b56e4b26..12c44444 100644 --- a/modules/pam_exec/pam_exec.c +++ b/modules/pam_exec/pam_exec.c @@ -302,6 +302,10 @@ call_exec (const char *pam_type, pam_handle_t *pamh, char **envlist, **tmp; int envlen, nitems; char *envstr; + enum pam_modutil_redirect_fd redirect_stdin = + expose_authtok ? PAM_MODUTIL_IGNORE_FD : PAM_MODUTIL_PIPE_FD; + enum pam_modutil_redirect_fd redirect_stdout = + (use_stdout || logfile) ? PAM_MODUTIL_IGNORE_FD : PAM_MODUTIL_NULL_FD; /* First, move all the pipes off of stdin, stdout, and stderr, to ensure * that calls to dup2 won't close them. */ @@ -330,18 +334,6 @@ call_exec (const char *pam_type, pam_handle_t *pamh, _exit (err); } } - else - { - close (STDIN_FILENO); - - /* New stdin. */ - if ((i = open ("/dev/null", O_RDWR)) < 0) - { - int err = errno; - pam_syslog (pamh, LOG_ERR, "open of /dev/null failed: %m"); - _exit (err); - } - } /* Set up stdout. */ @@ -374,26 +366,18 @@ call_exec (const char *pam_type, pam_handle_t *pamh, free (buffer); } } - else - { - close (STDOUT_FILENO); - if ((i = open ("/dev/null", O_RDWR)) < 0) - { - int err = errno; - pam_syslog (pamh, LOG_ERR, "open of /dev/null failed: %m"); - _exit (err); - } - } - if (dup2 (STDOUT_FILENO, STDERR_FILENO) == -1) + if ((use_stdout || logfile) && + dup2 (STDOUT_FILENO, STDERR_FILENO) == -1) { int err = errno; pam_syslog (pamh, LOG_ERR, "dup2 failed: %m"); _exit (err); } - for (i = 3; i < sysconf (_SC_OPEN_MAX); i++) - close (i); + if (pam_modutil_sanitize_helper_fds(pamh, redirect_stdin, + redirect_stdout, redirect_stdout) < 0) + _exit(1); if (call_setuid) if (setuid (geteuid ()) == -1) diff --git a/modules/pam_mkhomedir/pam_mkhomedir.c b/modules/pam_mkhomedir/pam_mkhomedir.c index a867a738..c9220897 100644 --- a/modules/pam_mkhomedir/pam_mkhomedir.c +++ b/modules/pam_mkhomedir/pam_mkhomedir.c @@ -58,8 +58,6 @@ #include #include -#define MAX_FD_NO 10000 - /* argument parsing */ #define MKHOMEDIR_DEBUG 020 /* be verbose about things */ #define MKHOMEDIR_QUIET 040 /* keep quiet about things */ @@ -131,18 +129,13 @@ create_homedir (pam_handle_t *pamh, options_t *opt, /* fork */ child = fork(); if (child == 0) { - int i; - struct rlimit rlim; static char *envp[] = { NULL }; const char *args[] = { NULL, NULL, NULL, NULL, NULL }; - if (getrlimit(RLIMIT_NOFILE, &rlim)==0) { - if (rlim.rlim_max >= MAX_FD_NO) - rlim.rlim_max = MAX_FD_NO; - for (i=0; i < (int)rlim.rlim_max; i++) { - close(i); - } - } + if (pam_modutil_sanitize_helper_fds(pamh, PAM_MODUTIL_PIPE_FD, + PAM_MODUTIL_PIPE_FD, + PAM_MODUTIL_PIPE_FD) < 0) + _exit(PAM_SYSTEM_ERR); /* exec the mkhomedir helper */ args[0] = MKHOMEDIR_HELPER; diff --git a/modules/pam_unix/pam_unix_acct.c b/modules/pam_unix/pam_unix_acct.c index dc505e73..27998451 100644 --- a/modules/pam_unix/pam_unix_acct.c +++ b/modules/pam_unix/pam_unix_acct.c @@ -98,24 +98,21 @@ int _unix_run_verify_binary(pam_handle_t *pamh, unsigned int ctrl, /* fork */ child = fork(); if (child == 0) { - int i=0; - struct rlimit rlim; static char *envp[] = { NULL }; const char *args[] = { NULL, NULL, NULL, NULL }; - /* reopen stdout as pipe */ - dup2(fds[1], STDOUT_FILENO); - /* XXX - should really tidy up PAM here too */ - if (getrlimit(RLIMIT_NOFILE,&rlim)==0) { - if (rlim.rlim_max >= MAX_FD_NO) - rlim.rlim_max = MAX_FD_NO; - for (i=0; i < (int)rlim.rlim_max; i++) { - if (i != STDOUT_FILENO) { - close(i); - } - } + /* reopen stdout as pipe */ + if (dup2(fds[1], STDOUT_FILENO) != STDOUT_FILENO) { + pam_syslog(pamh, LOG_ERR, "dup2 of %s failed: %m", "stdout"); + _exit(PAM_AUTHINFO_UNAVAIL); + } + + if (pam_modutil_sanitize_helper_fds(pamh, PAM_MODUTIL_PIPE_FD, + PAM_MODUTIL_IGNORE_FD, + PAM_MODUTIL_PIPE_FD) < 0) { + _exit(PAM_AUTHINFO_UNAVAIL); } if (geteuid() == 0) { diff --git a/modules/pam_unix/pam_unix_passwd.c b/modules/pam_unix/pam_unix_passwd.c index 5f3a3db3..606071ea 100644 --- a/modules/pam_unix/pam_unix_passwd.c +++ b/modules/pam_unix/pam_unix_passwd.c @@ -201,8 +201,6 @@ static int _unix_run_update_binary(pam_handle_t *pamh, unsigned int ctrl, const /* fork */ child = fork(); if (child == 0) { - int i=0; - struct rlimit rlim; static char *envp[] = { NULL }; const char *args[] = { NULL, NULL, NULL, NULL, NULL, NULL }; char buffer[16]; @@ -210,15 +208,15 @@ static int _unix_run_update_binary(pam_handle_t *pamh, unsigned int ctrl, const /* XXX - should really tidy up PAM here too */ /* reopen stdin as pipe */ - dup2(fds[0], STDIN_FILENO); - - if (getrlimit(RLIMIT_NOFILE,&rlim)==0) { - if (rlim.rlim_max >= MAX_FD_NO) - rlim.rlim_max = MAX_FD_NO; - for (i=0; i < (int)rlim.rlim_max; i++) { - if (i != STDIN_FILENO) - close(i); - } + if (dup2(fds[0], STDIN_FILENO) != STDIN_FILENO) { + pam_syslog(pamh, LOG_ERR, "dup2 of %s failed: %m", "stdin"); + _exit(PAM_AUTHINFO_UNAVAIL); + } + + if (pam_modutil_sanitize_helper_fds(pamh, PAM_MODUTIL_IGNORE_FD, + PAM_MODUTIL_PIPE_FD, + PAM_MODUTIL_PIPE_FD) < 0) { + _exit(PAM_AUTHINFO_UNAVAIL); } /* exec binary helper */ diff --git a/modules/pam_unix/support.c b/modules/pam_unix/support.c index 3a849c81..fdb45c20 100644 --- a/modules/pam_unix/support.c +++ b/modules/pam_unix/support.c @@ -564,23 +564,21 @@ static int _unix_run_helper_binary(pam_handle_t *pamh, const char *passwd, /* fork */ child = fork(); if (child == 0) { - int i=0; - struct rlimit rlim; static char *envp[] = { NULL }; const char *args[] = { NULL, NULL, NULL, NULL }; /* XXX - should really tidy up PAM here too */ /* reopen stdin as pipe */ - dup2(fds[0], STDIN_FILENO); - - if (getrlimit(RLIMIT_NOFILE,&rlim)==0) { - if (rlim.rlim_max >= MAX_FD_NO) - rlim.rlim_max = MAX_FD_NO; - for (i=0; i < (int)rlim.rlim_max; i++) { - if (i != STDIN_FILENO) - close(i); - } + if (dup2(fds[0], STDIN_FILENO) != STDIN_FILENO) { + pam_syslog(pamh, LOG_ERR, "dup2 of %s failed: %m", "stdin"); + _exit(PAM_AUTHINFO_UNAVAIL); + } + + if (pam_modutil_sanitize_helper_fds(pamh, PAM_MODUTIL_IGNORE_FD, + PAM_MODUTIL_PIPE_FD, + PAM_MODUTIL_PIPE_FD) < 0) { + _exit(PAM_AUTHINFO_UNAVAIL); } if (geteuid() == 0) { diff --git a/modules/pam_unix/support.h b/modules/pam_unix/support.h index 6f5b2eb6..cd6ddb76 100644 --- a/modules/pam_unix/support.h +++ b/modules/pam_unix/support.h @@ -141,8 +141,6 @@ static const UNIX_Ctrls unix_args[UNIX_CTRLS_] = #define UNIX_DEFAULTS (unix_args[UNIX__NONULL].flag) -#define MAX_FD_NO 2000000 - /* use this to free strings. ESPECIALLY password strings */ #define _pam_delete(xx) \ diff --git a/modules/pam_xauth/pam_xauth.c b/modules/pam_xauth/pam_xauth.c index c7ce55ab..2be43513 100644 --- a/modules/pam_xauth/pam_xauth.c +++ b/modules/pam_xauth/pam_xauth.c @@ -128,7 +128,6 @@ run_coprocess(pam_handle_t *pamh, const char *input, char **output, /* We're the child. */ size_t j; const char *args[10]; - int maxopened; /* Drop privileges. */ if (setgid(gid) == -1) { @@ -150,19 +149,26 @@ run_coprocess(pam_handle_t *pamh, const char *input, char **output, (unsigned long) geteuid ()); _exit (err); } - /* Initialize the argument list. */ - memset(args, 0, sizeof(args)); /* Set the pipe descriptors up as stdin and stdout, and close * everything else, including the original values for the * descriptors. */ - dup2(ipipe[0], STDIN_FILENO); - dup2(opipe[1], STDOUT_FILENO); - maxopened = (int)sysconf(_SC_OPEN_MAX); - for (i = 0; i < maxopened; i++) { - if ((i != STDIN_FILENO) && (i != STDOUT_FILENO)) { - close(i); - } + if (dup2(ipipe[0], STDIN_FILENO) != STDIN_FILENO) { + int err = errno; + pam_syslog(pamh, LOG_ERR, "dup2 of %s failed: %m", "stdin"); + _exit(err); } + if (dup2(opipe[1], STDOUT_FILENO) != STDOUT_FILENO) { + int err = errno; + pam_syslog(pamh, LOG_ERR, "dup2 of %s failed: %m", "stdout"); + _exit(err); + } + if (pam_modutil_sanitize_helper_fds(pamh, PAM_MODUTIL_IGNORE_FD, + PAM_MODUTIL_IGNORE_FD, + PAM_MODUTIL_NULL_FD) < 0) { + _exit(1); + } + /* Initialize the argument list. */ + memset(args, 0, sizeof(args)); /* Convert the varargs list into a regular array of strings. */ va_start(ap, command); args[0] = command; -- cgit v1.2.3 From aff9b0f2b67eac784c99536fede9423da66f194a Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Thu, 19 Jun 2014 13:51:20 +0200 Subject: pam_unix: Check for NULL return from Goodcrypt_md5(). modules/pam_unix/pam_unix_passwd.c (check_old_password): Check for NULL return from Goodcrypt_md5(). --- modules/pam_unix/pam_unix_passwd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/pam_unix/pam_unix_passwd.c') diff --git a/modules/pam_unix/pam_unix_passwd.c b/modules/pam_unix/pam_unix_passwd.c index 606071ea..2d330e51 100644 --- a/modules/pam_unix/pam_unix_passwd.c +++ b/modules/pam_unix/pam_unix_passwd.c @@ -301,7 +301,7 @@ static int check_old_password(const char *forwho, const char *newpass) s_pas = strtok_r(NULL, ":,", &sptr); while (s_pas != NULL) { char *md5pass = Goodcrypt_md5(newpass, s_pas); - if (!strcmp(md5pass, s_pas)) { + if (md5pass == NULL || !strcmp(md5pass, s_pas)) { _pam_delete(md5pass); retval = PAM_AUTHTOK_ERR; break; -- cgit v1.2.3 From e89d4c97385ff8180e6e81e84c5aa745daf28a79 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Mon, 22 Jun 2015 14:53:01 +0200 Subject: Release version 1.2.1 Security fix: CVE-2015-3238 If the process executing pam_sm_authenticate or pam_sm_chauthtok method of pam_unix is not privileged enough to check the password, e.g. if selinux is enabled, the _unix_run_helper_binary function is called. When a long enough password is supplied (16 pages or more, i.e. 65536+ bytes on a system with 4K pages), this helper function hangs indefinitely, blocked in the write(2) call while writing to a blocking pipe that has a limited capacity. With this fix, the verifiable password length will be limited to PAM_MAX_RESP_SIZE bytes (i.e. 512 bytes) for pam_exec and pam_unix. * NEWS: Update * configure.ac: Bump version * modules/pam_exec/pam_exec.8.xml: document limitation of password length * modules/pam_exec/pam_exec.c: limit password length to PAM_MAX_RESP_SIZE * modules/pam_unix/pam_unix.8.xml: document limitation of password length * modules/pam_unix/pam_unix_passwd.c: limit password length * modules/pam_unix/passverify.c: Likewise * modules/pam_unix/passverify.h: Likewise * modules/pam_unix/support.c: Likewise --- NEWS | 3 +++ configure.ac | 2 +- modules/pam_exec/pam_exec.8.xml | 3 ++- modules/pam_exec/pam_exec.c | 4 ++-- modules/pam_unix/pam_unix.8.xml | 7 +++++++ modules/pam_unix/pam_unix_passwd.c | 23 +++++++++++++++-------- modules/pam_unix/passverify.c | 5 ++++- modules/pam_unix/passverify.h | 2 +- modules/pam_unix/support.c | 7 ++++++- po/Linux-PAM.pot | 24 ++++++++++++------------ po/ar.po | 22 +++++++++++----------- po/as.po | 22 +++++++++++----------- po/ast.po | 22 +++++++++++----------- po/bal.po | 22 +++++++++++----------- po/bg.po | 22 +++++++++++----------- po/bn.po | 22 +++++++++++----------- po/bn_IN.po | 22 +++++++++++----------- po/br.po | 22 +++++++++++----------- po/bs.po | 22 +++++++++++----------- po/ca.po | 22 +++++++++++----------- po/cs.po | 22 +++++++++++----------- po/da.po | 22 +++++++++++----------- po/de.po | 22 +++++++++++----------- po/el.po | 22 +++++++++++----------- po/en_GB.po | 22 +++++++++++----------- po/es.po | 22 +++++++++++----------- po/et.po | 22 +++++++++++----------- po/eu.po | 22 +++++++++++----------- po/fa.po | 22 +++++++++++----------- po/fi.po | 22 +++++++++++----------- po/fr.po | 22 +++++++++++----------- po/ga.po | 22 +++++++++++----------- po/gl.po | 22 +++++++++++----------- po/gu.po | 22 +++++++++++----------- po/he.po | 22 +++++++++++----------- po/hi.po | 22 +++++++++++----------- po/hu.po | 22 +++++++++++----------- po/ia.po | 22 +++++++++++----------- po/id.po | 22 +++++++++++----------- po/it.po | 22 +++++++++++----------- po/ja.po | 22 +++++++++++----------- po/ka.po | 22 +++++++++++----------- po/kk.po | 22 +++++++++++----------- po/km.po | 22 +++++++++++----------- po/kn.po | 22 +++++++++++----------- po/ko.po | 22 +++++++++++----------- po/ks.po | 22 +++++++++++----------- po/lt.po | 22 +++++++++++----------- po/lv.po | 22 +++++++++++----------- po/mai.po | 22 +++++++++++----------- po/ml.po | 22 +++++++++++----------- po/mr.po | 22 +++++++++++----------- po/ms.po | 22 +++++++++++----------- po/nb.po | 22 +++++++++++----------- po/nds.po | 22 +++++++++++----------- po/nl.po | 22 +++++++++++----------- po/nn.po | 22 +++++++++++----------- po/or.po | 22 +++++++++++----------- po/pa.po | 22 +++++++++++----------- po/pl.po | 22 +++++++++++----------- po/pt.po | 22 +++++++++++----------- po/pt_BR.po | 22 +++++++++++----------- po/ro.po | 22 +++++++++++----------- po/ru.po | 22 +++++++++++----------- po/si.po | 22 +++++++++++----------- po/sk.po | 22 +++++++++++----------- po/sq.po | 22 +++++++++++----------- po/sr.po | 22 +++++++++++----------- po/sr@latin.po | 22 +++++++++++----------- po/sv.po | 22 +++++++++++----------- po/ta.po | 22 +++++++++++----------- po/te.po | 22 +++++++++++----------- po/tg.po | 22 +++++++++++----------- po/tr.po | 22 +++++++++++----------- po/uk.po | 22 +++++++++++----------- po/ur.po | 22 +++++++++++----------- po/vi.po | 22 +++++++++++----------- po/zh_CN.po | 22 +++++++++++----------- po/zh_HK.po | 22 +++++++++++----------- po/zh_TW.po | 22 +++++++++++----------- po/zu.po | 22 +++++++++++----------- xtests/tst-pam_pwhistory1.sh | 0 82 files changed, 834 insertions(+), 808 deletions(-) mode change 100644 => 100755 xtests/tst-pam_pwhistory1.sh (limited to 'modules/pam_unix/pam_unix_passwd.c') diff --git a/NEWS b/NEWS index 9de2713d..5349d031 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,8 @@ Linux-PAM NEWS -- history of user-visible changes. +Release 1.2.1 +* Fix CVE-2015-3238, affected PAM modules are pam_unix and pam_exec + Release 1.2.0 * Update documentation * Update translations diff --git a/configure.ac b/configure.ac index fd0e3109..08e45306 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([Linux-PAM], [1.2.0], , [Linux-PAM]) +AC_INIT([Linux-PAM], [1.2.1], , [Linux-PAM]) AC_CONFIG_SRCDIR([conf/pam_conv1/pam_conv_y.y]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([-Wall -Wno-portability]) diff --git a/modules/pam_exec/pam_exec.8.xml b/modules/pam_exec/pam_exec.8.xml index 23793668..d1b00a21 100644 --- a/modules/pam_exec/pam_exec.8.xml +++ b/modules/pam_exec/pam_exec.8.xml @@ -106,7 +106,8 @@ During authentication the calling command can read the password from stdin3 - . + . Only first PAM_MAX_RESP_SIZE + bytes of a password are provided to the command. diff --git a/modules/pam_exec/pam_exec.c b/modules/pam_exec/pam_exec.c index 5ab96303..17ba6ca2 100644 --- a/modules/pam_exec/pam_exec.c +++ b/modules/pam_exec/pam_exec.c @@ -178,11 +178,11 @@ call_exec (const char *pam_type, pam_handle_t *pamh, } pam_set_item (pamh, PAM_AUTHTOK, resp); - authtok = strdupa (resp); + authtok = strndupa (resp, PAM_MAX_RESP_SIZE); _pam_drop (resp); } else - authtok = void_pass; + authtok = strndupa (void_pass, PAM_MAX_RESP_SIZE); if (pipe(fds) != 0) { diff --git a/modules/pam_unix/pam_unix.8.xml b/modules/pam_unix/pam_unix.8.xml index 40084023..a8b64bb5 100644 --- a/modules/pam_unix/pam_unix.8.xml +++ b/modules/pam_unix/pam_unix.8.xml @@ -79,6 +79,13 @@ needed for use with certain applications. + + The maximum length of a password supported by the pam_unix module + via the helper binary is PAM_MAX_RESP_SIZE + - currently 512 bytes. The rest of the password provided by the + conversation function to the module will be ignored. + + The password component of this module performs the task of updating the user's password. The default encryption hash is taken from the diff --git a/modules/pam_unix/pam_unix_passwd.c b/modules/pam_unix/pam_unix_passwd.c index 2d330e51..c2e5de5e 100644 --- a/modules/pam_unix/pam_unix_passwd.c +++ b/modules/pam_unix/pam_unix_passwd.c @@ -240,15 +240,22 @@ static int _unix_run_update_binary(pam_handle_t *pamh, unsigned int ctrl, const /* wait for child */ /* if the stored password is NULL */ int rc=0; - if (fromwhat) - pam_modutil_write(fds[1], fromwhat, strlen(fromwhat)+1); - else - pam_modutil_write(fds[1], "", 1); - if (towhat) { - pam_modutil_write(fds[1], towhat, strlen(towhat)+1); + if (fromwhat) { + int len = strlen(fromwhat); + + if (len > PAM_MAX_RESP_SIZE) + len = PAM_MAX_RESP_SIZE; + pam_modutil_write(fds[1], fromwhat, len); } - else - pam_modutil_write(fds[1], "", 1); + pam_modutil_write(fds[1], "", 1); + if (towhat) { + int len = strlen(towhat); + + if (len > PAM_MAX_RESP_SIZE) + len = PAM_MAX_RESP_SIZE; + pam_modutil_write(fds[1], towhat, len); + } + pam_modutil_write(fds[1], "", 1); close(fds[0]); /* close here to avoid possible SIGPIPE above */ close(fds[1]); diff --git a/modules/pam_unix/passverify.c b/modules/pam_unix/passverify.c index b325602c..e79b55e6 100644 --- a/modules/pam_unix/passverify.c +++ b/modules/pam_unix/passverify.c @@ -1115,12 +1115,15 @@ getuidname(uid_t uid) int read_passwords(int fd, int npass, char **passwords) { + /* The passwords array must contain npass preallocated + * buffers of length MAXPASS + 1 + */ int rbytes = 0; int offset = 0; int i = 0; char *pptr; while (npass > 0) { - rbytes = read(fd, passwords[i]+offset, MAXPASS-offset); + rbytes = read(fd, passwords[i]+offset, MAXPASS+1-offset); if (rbytes < 0) { if (errno == EINTR) continue; diff --git a/modules/pam_unix/passverify.h b/modules/pam_unix/passverify.h index 3de67593..caf7ae8a 100644 --- a/modules/pam_unix/passverify.h +++ b/modules/pam_unix/passverify.h @@ -8,7 +8,7 @@ #define PAM_UNIX_RUN_HELPER PAM_CRED_INSUFFICIENT -#define MAXPASS 200 /* the maximum length of a password */ +#define MAXPASS PAM_MAX_RESP_SIZE /* the maximum length of a password */ #define OLD_PASSWORDS_FILE "/etc/security/opasswd" diff --git a/modules/pam_unix/support.c b/modules/pam_unix/support.c index fdb45c20..abccd828 100644 --- a/modules/pam_unix/support.c +++ b/modules/pam_unix/support.c @@ -609,7 +609,12 @@ static int _unix_run_helper_binary(pam_handle_t *pamh, const char *passwd, /* if the stored password is NULL */ int rc=0; if (passwd != NULL) { /* send the password to the child */ - if (write(fds[1], passwd, strlen(passwd)+1) == -1) { + int len = strlen(passwd); + + if (len > PAM_MAX_RESP_SIZE) + len = PAM_MAX_RESP_SIZE; + if (write(fds[1], passwd, len) == -1 || + write(fds[1], "", 1) == -1) { pam_syslog (pamh, LOG_ERR, "Cannot send password to helper: %m"); retval = PAM_AUTH_ERR; } diff --git a/po/Linux-PAM.pot b/po/Linux-PAM.pot index 3e37e16f..390ceb11 100644 --- a/po/Linux-PAM.pot +++ b/po/Linux-PAM.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Linux-PAM 1.2.0\n" +"Project-Id-Version: Linux-PAM 1.2.1\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -242,12 +242,12 @@ msgid "contains the user name in some form" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "" @@ -371,7 +371,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "" @@ -542,31 +542,31 @@ msgstr[1] "" msgid "Warning: your password will expire in %d days" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "" diff --git a/po/ar.po b/po/ar.po index 2687ace3..c6a91c2b 100644 --- a/po/ar.po +++ b/po/ar.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2011-11-30 11:57+0000\n" "Last-Translator: Tomáš Mráz \n" "Language-Team: Arabic \n" @@ -242,12 +242,12 @@ msgid "contains the user name in some form" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "لم يتم إدخال كلمة السر" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "لم يتم تغيير كلمة السر" @@ -375,7 +375,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "كلمة السر التي تم إدخالها مستخدمة بالفعل. اختر كلمة سر أخرى." @@ -552,31 +552,31 @@ msgstr[5] "" msgid "Warning: your password will expire in %d days" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "تعذر تغيير كلمة السر الخاصة بـ NIS." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "يجب اختيار كلمة سر أطول" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "كلمة سر UNIX (الحالية): " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "يجب الانتظار فترة أطول لتغيير كلمة السر" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "أدخل كلمة سر UNIX الجديدة: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "أعد كتابة كلمة سر UNIX الجديدة: " diff --git a/po/as.po b/po/as.po index 5b63ad12..403dbaeb 100644 --- a/po/as.po +++ b/po/as.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-04-10 06:40+0000\n" "Last-Translator: ngoswami \n" "Language-Team: Assamese (http://www.transifex.com/projects/p/fedora/language/" @@ -245,12 +245,12 @@ msgid "contains the user name in some form" msgstr "কিবা ধৰনত ব্যৱহাৰকৰ্তাৰ নাম আছে" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "কোনো গুপ্তশব্দ দিয়া হোৱা নাই" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "গুপ্ত শব্দ অপৰিবৰ্ত্তিত" @@ -374,7 +374,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "%s পঞ্জিকা সৃষ্টি আৰু আৰম্ভ কৰিব পৰা নাই ।" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "গুপ্তশব্দ ইতিমধ্যে ব্যৱহৃত । অন্য এটা বাচি লওক ।" @@ -549,31 +549,31 @@ msgstr[1] "সকীয়নী: আপোনাৰ গুপ্তশব্দ %d msgid "Warning: your password will expire in %d days" msgstr "সকীয়নী: আপোনাৰ গুপ্তশব্দ %d দিনত অন্ত হ'ব" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "NIS গুপ্তশব্দ সলনি কৰিব পৰা নহয় ।" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "আপুনি ইয়াতকৈ এটা দীঘল গুপ্তশব্দ নিৰ্ব্বাচন কৰিব লাগিব" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "%s ৰ বাবে গুপ্তশব্দ সলনি কৰা হৈছে ।" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(বৰ্ত্তমানৰ) UNIX গুপ্তশব্দ: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "আপোনাৰ গুপ্তশব্দ সলনি কৰিবলৈ আপুনি আৰু কিছু পৰ অপেক্ষা কৰিব লাগিব" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "নতুন UNIX গুপ্তশব্দ দিয়ক: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "নতুন UNIX গুপ্তশব্দ পুনঃ লিখক: " diff --git a/po/ast.po b/po/ast.po index b2b753eb..23d3aac2 100644 --- a/po/ast.po +++ b/po/ast.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2011-11-30 11:56+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Asturian (http://www.transifex.com/projects/p/fedora/language/" @@ -242,12 +242,12 @@ msgid "contains the user name in some form" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "" @@ -371,7 +371,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "" @@ -542,31 +542,31 @@ msgstr[1] "" msgid "Warning: your password will expire in %d days" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "" diff --git a/po/bal.po b/po/bal.po index 84a067c8..0b7c082e 100644 --- a/po/bal.po +++ b/po/bal.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2011-11-30 11:56+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Balochi \n" @@ -241,12 +241,12 @@ msgid "contains the user name in some form" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "" @@ -370,7 +370,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "" @@ -541,31 +541,31 @@ msgstr[1] "" msgid "Warning: your password will expire in %d days" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "" diff --git a/po/bg.po b/po/bg.po index 1a2e6800..80f0c506 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-08-09 14:31+0000\n" "Last-Translator: Valentin Laskov \n" "Language-Team: Bulgarian \n" @@ -245,12 +245,12 @@ msgid "contains the user name in some form" msgstr "под някаква форма съдържа името на потребителя" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "Не е предоставена парола" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "Паролата не е променена" @@ -376,7 +376,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "Не мога да създам и настроя директория '%s'." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "Паролата вече е използвана. Изберете друга." @@ -553,31 +553,31 @@ msgstr[1] "Внимание: срокът на паролата Ви изтич msgid "Warning: your password will expire in %d days" msgstr "Внимание: паролата Ви ще изтече след %d дни" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "NIS парола не може да бъде променена." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "Трябва да изберете по-дълга парола" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "Смяна на паролата за %s." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(текуща) UNIX парола: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "Трябва да изчакате повече, за да промените Вашата парола" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Въведете нова UNIX парола: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "Отново новата UNIX парола: " diff --git a/po/bn.po b/po/bn.po index c7e04709..ddf93a98 100644 --- a/po/bn.po +++ b/po/bn.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2012-04-10 20:36+0000\n" "Last-Translator: Mahay Alam Khan \n" "Language-Team: Bengali \n" @@ -250,12 +250,12 @@ msgid "contains the user name in some form" msgstr "কোনো রূপে ব্যবহারকারী নাম অন্তর্ভুক্ত হয়েছে" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "কোনো পাসওয়ার্ড উল্লিখিত হয়নি" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "পাসওয়ার্ড পরিবর্তন করা হয়নি" @@ -379,7 +379,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "ডিরেক্টরি '%s' নির্মাণ ও আরম্ভ করতে ব্যর্থ।" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "পাসওয়ার্ড পূর্বে ব্যবহৃত হয়েছে। একটি পৃথক পাসওয়ার্ড নির্বাচন করুন।" @@ -557,32 +557,32 @@ msgstr[1] "সতর্কবাণী: %d দিন পরে পাসওয় msgid "Warning: your password will expire in %d days" msgstr "সতর্কবাণী: %d দিন পরে পাসওয়ার্ডের মেয়াদপূর্ণ হবে" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "NIS পাসওয়ার্ড পরিবর্তন করা সম্ভব হয়নি।" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "চিহ্নিত পাসওয়ার্ডের থেকে লম্বা পাসওয়ার্ড উল্লেখ করা আবশ্যক" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "%s-র পাসওয়ার্ড পরিবর্তন করা হচ্ছে।" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(বর্তমান) UNIX পাসওয়ার্ড: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "কিছু কাল পরে পাসওয়ার্ড পরিবর্তন করা সম্ভব হবে" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "নতুন UNIX পাসওয়ার্ড উল্লেখ করুন: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "নতুন UNIX পাসওয়ার্ড পুনরায় লিখুন: " diff --git a/po/bn_IN.po b/po/bn_IN.po index 8c766eb5..244a4ca5 100644 --- a/po/bn_IN.po +++ b/po/bn_IN.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2012-02-28 10:38+0000\n" "Last-Translator: runa \n" "Language-Team: Bengali (India) \n" @@ -245,12 +245,12 @@ msgid "contains the user name in some form" msgstr "কোনো রূপে ব্যবহারকারী নাম অন্তর্ভুক্ত হয়েছে" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "কোনো পাসওয়ার্ড উল্লিখিত হয়নি" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "পাসওয়ার্ড পরিবর্তন করা হয়নি" @@ -374,7 +374,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "ডিরেক্টরি '%s' নির্মাণ ও আরম্ভ করতে ব্যর্থ।" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "পাসওয়ার্ড পূর্বে ব্যবহৃত হয়েছে। একটি পৃথক পাসওয়ার্ড নির্বাচন করুন।" @@ -552,32 +552,32 @@ msgstr[1] "সতর্কবাণী: %d দিন পরে পাসওয় msgid "Warning: your password will expire in %d days" msgstr "সতর্কবাণী: %d দিন পরে পাসওয়ার্ডের মেয়াদপূর্ণ হবে" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "NIS পাসওয়ার্ড পরিবর্তন করা সম্ভব হয়নি।" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "চিহ্নিত পাসওয়ার্ডের থেকে লম্বা পাসওয়ার্ড উল্লেখ করা আবশ্যক" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "%s-র পাসওয়ার্ড পরিবর্তন করা হচ্ছে।" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(বর্তমান) UNIX পাসওয়ার্ড: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "কিছু কাল পরে পাসওয়ার্ড পরিবর্তন করা সম্ভব হবে" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "নতুন UNIX পাসওয়ার্ড উল্লেখ করুন: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "নতুন UNIX পাসওয়ার্ড পুনরায় লিখুন: " diff --git a/po/br.po b/po/br.po index 704a4d9b..dcf5bda9 100644 --- a/po/br.po +++ b/po/br.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2011-11-30 11:56+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Breton (http://www.transifex.com/projects/p/fedora/language/" @@ -242,12 +242,12 @@ msgid "contains the user name in some form" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "" @@ -371,7 +371,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "" @@ -542,31 +542,31 @@ msgstr[1] "" msgid "Warning: your password will expire in %d days" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "" diff --git a/po/bs.po b/po/bs.po index 6310cfed..d32498e6 100644 --- a/po/bs.po +++ b/po/bs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2011-11-30 11:56+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Bosnian (http://www.transifex.com/projects/p/fedora/language/" @@ -243,12 +243,12 @@ msgid "contains the user name in some form" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "" @@ -373,7 +373,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "" @@ -545,31 +545,31 @@ msgstr[2] "" msgid "Warning: your password will expire in %d days" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "" diff --git a/po/ca.po b/po/ca.po index 8c46abf9..f8a4459b 100644 --- a/po/ca.po +++ b/po/ca.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-08-13 21:44+0000\n" "Last-Translator: Robert Antoni Buj i Gelonch \n" "Language-Team: Catalan \n" @@ -246,12 +246,12 @@ msgid "contains the user name in some form" msgstr "conté el nom d'usuari d'alguna forma" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "No s'ha proporcionat cap contrasenya" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "No s'ha canviat la contrasenya" @@ -375,7 +375,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "No s'ha pogut crear i inicialitzar el directori '%s'." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "Aquesta contrasenya ja s'ha fet servir. Trieu-ne una altra." @@ -554,31 +554,31 @@ msgstr[1] "Atenció: la contrasenya venç d'aquí a %d dies" msgid "Warning: your password will expire in %d days" msgstr "Atenció: la contrasenya venç d'aquí a %d dies" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "No s'ha pogut canviar la contrasenya NIS." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "Heu de triar una contrasenya més llarga" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "S'està canviant la contrasenya de %s." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "contrasenya (actual) d'UNIX: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "Heu d'esperar més temps abans de canviar la contrasenya" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Introduïu la nova contrasenya d'UNIX: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "Torneu a escriure la nova contrasenya d'UNIX: " diff --git a/po/cs.po b/po/cs.po index a6663e4c..9b379548 100644 --- a/po/cs.po +++ b/po/cs.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2011-11-30 12:14+0000\n" "Last-Translator: Tomáš Mráz \n" "Language-Team: Czech (http://www.transifex.net/projects/p/fedora/language/" @@ -245,12 +245,12 @@ msgid "contains the user name in some form" msgstr "obsahuje v nějaké formě uživatelské jméno" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "Nezadáno heslo" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "Heslo nebylo změněno" @@ -375,7 +375,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "Nezdařilo se vytvořit a inicializovat adresář '%s'." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "Heslo již bylo použito. Zvolte jiné." @@ -552,31 +552,31 @@ msgstr[2] "Varování: Vaše heslo vyprší za %d dní" msgid "Warning: your password will expire in %d days" msgstr "Varování: Počet dní do vypršení hesla: %d" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "NIS heslo se nepodařilo změnit." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "Musíte zvolit delší heslo" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "Změna hesla pro %s." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(současné) UNIX heslo: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "Na změnu svého hesla musíte počkat déle" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Zadejte nové UNIX heslo: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "Opakujte nové UNIX heslo: " diff --git a/po/da.po b/po/da.po index d96eee21..db0a3d0d 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-01-15 16:52+0000\n" "Last-Translator: Kris Thomsen \n" "Language-Team: Danish \n" @@ -242,12 +242,12 @@ msgid "contains the user name in some form" msgstr "indeholder brugernavnet i en eller anden form" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "Ingen adgangskode angivet" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "Adgangskoden er uændret" @@ -371,7 +371,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "Kunne ikke oprette og initialisere mappe \"%s\"." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "Adgangskoden er allerede blevet brugt. Vælg en anden." @@ -546,31 +546,31 @@ msgstr[1] "Advarsel: Din adgangskode udløber om %d dage" msgid "Warning: your password will expire in %d days" msgstr "Advarsel: din adgangskode udløber om %d dage" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "NIS-adgangskoden kunne ikke ændres." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "Du skal vælge en længere adgangskode" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "Ændrer adgangskode for %s." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(nuværende) UNIX-adgangskode: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "Du skal vente lidt længere for at ændre din adgangskode" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Indtast ny UNIX-adgangskode: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "Genindtast ny UNIX-adgangskode: " diff --git a/po/de.po b/po/de.po index 901b7481..f08f551a 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2012-12-12 19:06+0000\n" "Last-Translator: Roman Spirgi \n" "Language-Team: German \n" @@ -246,12 +246,12 @@ msgid "contains the user name in some form" msgstr "enthält den Benutzernamen in irgendeiner Form" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "Kein Passwort angegeben" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "Passwort nicht geändert" @@ -378,7 +378,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "Verzeichnis %s kann nicht erstellt und initialisiert werden: %m" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "Passwort wurde bereits verwendet. Wählen Sie ein anderes aus." @@ -554,31 +554,31 @@ msgstr[1] "Warnung: Ihr Passwort läuft in %d Tagen ab." msgid "Warning: your password will expire in %d days" msgstr "Warnung: Ihr Passwort läuft in %d Tagen ab." -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "Änderung des NIS-Passworts nicht möglich." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "Sie müssen ein längeres Passwort auswählen." -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "Ändern des Passworts für %s." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(aktuelles) UNIX-Passwort: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "Sie können Ihr Passwort noch nicht ändern" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Geben Sie ein neues UNIX-Passwort ein: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "Geben Sie das neue UNIX-Passwort erneut ein: " diff --git a/po/el.po b/po/el.po index 355b9de2..e70c5616 100644 --- a/po/el.po +++ b/po/el.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2011-11-30 11:56+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Greek \n" @@ -241,12 +241,12 @@ msgid "contains the user name in some form" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "" @@ -370,7 +370,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "" @@ -541,31 +541,31 @@ msgstr[1] "" msgid "Warning: your password will expire in %d days" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "" diff --git a/po/en_GB.po b/po/en_GB.po index 835e3f17..5ed2729b 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2011-11-30 11:56+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/" @@ -242,12 +242,12 @@ msgid "contains the user name in some form" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "" @@ -371,7 +371,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "" @@ -542,31 +542,31 @@ msgstr[1] "" msgid "Warning: your password will expire in %d days" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "" diff --git a/po/es.po b/po/es.po index aa8477fa..bb8ce3fc 100644 --- a/po/es.po +++ b/po/es.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-06-04 13:29+0000\n" "Last-Translator: Daniel Cabrera \n" "Language-Team: Spanish \n" @@ -250,12 +250,12 @@ msgid "contains the user name in some form" msgstr "de alguna manera contiene el nombre del usuario" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "No se ha proporcionado ninguna contraseña" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "La contraseña no ha cambiado" @@ -380,7 +380,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "No se pudo crear e inicializar el directorio '%s'." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "La contraseña ya se ha utilizado. Seleccione otra." @@ -560,31 +560,31 @@ msgstr[1] "Advertencia: la contraseña caducará dentro de %d días" msgid "Warning: your password will expire in %d days" msgstr "Advertencia: la contraseña caducará dentro de %d días" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "No es posible cambiar la contraseña NIS." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "Debe elegir una contraseña más larga" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "Cambiando la contraseña de %s." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(actual) contraseña de UNIX: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "Debe esperar más tiempo para cambiar la contraseña" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Introduzca la nueva contraseña de UNIX: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "Vuelva a escribir la nueva contraseña de UNIX: " diff --git a/po/et.po b/po/et.po index 1701007b..5dc5c240 100644 --- a/po/et.po +++ b/po/et.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2012-12-02 11:25+0000\n" "Last-Translator: mihkel \n" "Language-Team: Estonian (http://www.transifex.com/projects/p/fedora/language/" @@ -243,12 +243,12 @@ msgid "contains the user name in some form" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "" @@ -372,7 +372,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "Parooli on juba kasutatud. Vali uus parool." @@ -544,31 +544,31 @@ msgstr[1] "Hoiatus: su parool aegub %d päeva pärast" msgid "Warning: your password will expire in %d days" msgstr "Hoiatus: su parool aegub %d päeva pärast" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "Sa pead valima pikema parooli" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(praegune) UNIX-i parool." -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Sisesta uus UNIX-i parool:" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "Kinnita uus UNIX-i parool:" diff --git a/po/eu.po b/po/eu.po index a24ae59c..ecf76598 100644 --- a/po/eu.po +++ b/po/eu.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2012-12-24 13:54+0000\n" "Last-Translator: Asier Iturralde Sarasola \n" "Language-Team: Basque (http://www.transifex.com/projects/p/fedora/language/" @@ -243,12 +243,12 @@ msgid "contains the user name in some form" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "" @@ -372,7 +372,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "" @@ -543,31 +543,31 @@ msgstr[1] "" msgid "Warning: your password will expire in %d days" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "" diff --git a/po/fa.po b/po/fa.po index 77fb50f2..8b301498 100644 --- a/po/fa.po +++ b/po/fa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2011-11-30 11:56+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Persian (http://www.transifex.com/projects/p/fedora/language/" @@ -242,12 +242,12 @@ msgid "contains the user name in some form" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "" @@ -370,7 +370,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "" @@ -540,31 +540,31 @@ msgstr[0] "" msgid "Warning: your password will expire in %d days" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "" diff --git a/po/fi.po b/po/fi.po index b5314ea9..4debc313 100644 --- a/po/fi.po +++ b/po/fi.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-03-25 17:42+0000\n" "Last-Translator: Juhani Numminen \n" "Language-Team: Finnish (http://www.transifex.com/projects/p/fedora/language/" @@ -247,12 +247,12 @@ msgid "contains the user name in some form" msgstr "sisältää käyttäjätunnuksen jossakin muodossa" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "Et antanut salasanaa" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "Salasanaa ei vaihdettu" @@ -382,7 +382,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "Hakemistoa ”%s” ei voida luoda eikä alustaa." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "Salasana on jo käytetty. Valitse toinen." @@ -558,31 +558,31 @@ msgstr[1] "Varoitus: salasana vanhentuu %d päivän kuluttua." msgid "Warning: your password will expire in %d days" msgstr "Varoitus: salasana vanhentuu %d päivän kuluttua." -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "NIS-salasanaa ei voitu vaihtaa." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "Salasanan tulee olla pidempi" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "Vaihdetaan käyttäjän %s salasana." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(nykyinen) UNIX salasana: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "Sinun täytyy odottaa kauemmin vaihtaaksesi salasanan" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Anna uusi UNIX-salasana: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "Anna uusi UNIX-salasana uudelleen: " diff --git a/po/fr.po b/po/fr.po index 7d697637..94c31264 100644 --- a/po/fr.po +++ b/po/fr.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-01-12 17:52+0000\n" "Last-Translator: Jérôme Fenal \n" "Language-Team: French \n" @@ -256,12 +256,12 @@ msgid "contains the user name in some form" msgstr "contient le nom d'utilisateur d'une certaine manière" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "Aucun mot de passe fourni" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "Mot de passe inchangé" @@ -391,7 +391,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "Impossible de créer et d'initialiser le répertoire « %s »." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "Mot de passe déjà utilisé. Choisissez-en un autre." @@ -567,31 +567,31 @@ msgstr[1] "Avertissement : votre mot de passe expire dans %d jours" msgid "Warning: your password will expire in %d days" msgstr "Avertissement : votre mot de passe expire dans %d jours" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "Le mot de passe NIS n'a pas pu être changé." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "Vous devez choisir un mot de passe plus long" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "Changement du mot de passe pour %s." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "Mot de passe UNIX (actuel) : " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "Vous devez encore attendre avant de changer votre mot de passe" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Entrez le nouveau mot de passe UNIX : " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "Retapez le nouveau mot de passe UNIX : " diff --git a/po/ga.po b/po/ga.po index 69fafb16..8c400b9e 100644 --- a/po/ga.po +++ b/po/ga.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-09-10 18:14+0000\n" "Last-Translator: leftmostcat \n" "Language-Team: Irish (http://www.transifex.com/projects/p/fedora/language/" @@ -249,12 +249,12 @@ msgid "contains the user name in some form" msgstr "tá an t-ainm úsáideora ann i bhfoirm éigin" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "Níor soláthraíodh aon fhocal faire" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "Níor athraíodh an focal faire" @@ -393,7 +393,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "Ní féidir comhadlann '%s' a chruthú agus a thúsú." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "Úsáidtear an focal faire cheana. Roghnaigh ceann eile." @@ -575,31 +575,31 @@ msgstr[4] "Rabhadh: rachaidh d'fhocal faire as feidhm i gceann %d lá" msgid "Warning: your password will expire in %d days" msgstr "Rabhadh: rachaidh d'fhocal faire as feidhm i gceann %d lá" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "Níorbh fhéidir focal faire NIS a athrú." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "Caithfidh tú focal faire níos faide a roghnú" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "Focal faire %s á athrú." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "Focal faire UNIX (reatha): " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "Caithfidh tú fanacht níos faide chun d'fhocal faire a athrú" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Iontráil focal faire UNIX nua: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "Iontráil focal faire UNIX nua arís:" diff --git a/po/gl.po b/po/gl.po index 557e8b88..7b20201b 100644 --- a/po/gl.po +++ b/po/gl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2011-11-30 11:56+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Galician (http://www.transifex.com/projects/p/fedora/language/" @@ -242,12 +242,12 @@ msgid "contains the user name in some form" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "" @@ -371,7 +371,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "" @@ -542,31 +542,31 @@ msgstr[1] "" msgid "Warning: your password will expire in %d days" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "" diff --git a/po/gu.po b/po/gu.po index b225fe51..42f22df1 100644 --- a/po/gu.po +++ b/po/gu.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-04-15 12:16+0000\n" "Last-Translator: sweta \n" "Language-Team: Gujarati \n" @@ -245,12 +245,12 @@ msgid "contains the user name in some form" msgstr "અમુક ફોર્મમાં વપરાશકર્તા નામ ને સમાવે છે" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "કોઈ પાસવર્ડ પૂરો પડાયેલ નથી" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "પાસવર્ડ બદલાયેલ નથી" @@ -374,7 +374,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "ડિરેક્ટરી '%s' ને શરૂ કરવામાં અને બનાવવામાં અસમર્થ." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "પાસવર્ડ પહેલાથી જ વપરાઈ ગયેલ છે. બીજો પસંદ કરો." @@ -549,31 +549,31 @@ msgstr[1] "ચેતવણી: તમારો પાસવર્ડ %d દિ msgid "Warning: your password will expire in %d days" msgstr "ચેતવણી: તમારો પાસવર્ડ %d દિવસોમાં નિવૃત્ત થઈ જશે" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "NIS પાસવર્ડ બદલી શક્યા નહિં." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "તમારે લાંબો પાસવર્ડ જ પસંદ કરવો જોઈએ" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "%s માટે પાસવર્ડ બદલવાનું." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(વર્તમાન) UNIX પાસવર્ડ: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "તમારો પાસવર્ડ બદલવા માટે તમારે લાંબો સમય રાહ જોવી જ પડશે" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "નવો UNIX પાસવર્ડ દાખલ કરો: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "નવો UNIX પાસવર્ડ ફરીથી લખો: " diff --git a/po/he.po b/po/he.po index 15cf2735..41dde0b9 100644 --- a/po/he.po +++ b/po/he.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2011-11-30 11:57+0000\n" "Last-Translator: Tomáš Mráz \n" "Language-Team: Hebrew \n" @@ -241,12 +241,12 @@ msgid "contains the user name in some form" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "לא סופקה ססמה" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "ססמה לא שונתה" @@ -370,7 +370,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "" @@ -542,31 +542,31 @@ msgstr[1] "אזהרה: הססמה שלך תפוג תוך %d ימים" msgid "Warning: your password will expire in %d days" msgstr "אזהרה: הססמה שלך תפוג תוך %d ימים" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "לא היה ניתן לשנות ססמת NIS." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "אתה חייב לבחור ססמה ארוכה יותר" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "משנה ססמה עבור %s.‏" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "ססמת יוניקס (נוכחית): " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "אתה חייב לחכות יותר כדי לשנות את הססמה" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "הכנס ססמת יוניקס חדשה:" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "נא להקליד שוב את ססמת היוניקס החדשה: " diff --git a/po/hi.po b/po/hi.po index 46d2413e..bd316514 100644 --- a/po/hi.po +++ b/po/hi.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-01-21 12:02+0000\n" "Last-Translator: kumarvimal \n" "Language-Team: Hindi \n" @@ -244,12 +244,12 @@ msgid "contains the user name in some form" msgstr "कुछ रूप में उपयोक्ता नाम समाहित करता है" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "कोई कूटशब्द नहीं दिया गया है" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "शब्दकूट परिवर्तित" @@ -373,7 +373,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "निर्देशिका '%s' बनाने और आरंभ करने में असमर्थ." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "शब्दकूट को पहले ही बदला जा चुका है. दूसरा चुनें." @@ -548,31 +548,31 @@ msgstr[1] "चेतावनी: आपका शब्दकूट %d दि msgid "Warning: your password will expire in %d days" msgstr "चेतावनी: आपका शब्दकूट %d दिनों में समाप्त हो जायेगा" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "NIS शब्दकूट बदला नहीं जा सका." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "आपको जरूर एक लंबा शब्दकूट चुनना चाहिए" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "%s के लिए कूटशब्द बदल रहा है" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(मौजूदा) UNIX शब्दकूट: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "आपको अपना शब्दकूट बदलने के लिए लंबी प्रतीक्षा करनी होगी" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "नया UNIX शब्दकूट दें: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "नया UNIX शब्दकूट फिर टाइप करें: " diff --git a/po/hu.po b/po/hu.po index 94a7aaf2..3bd4aa51 100644 --- a/po/hu.po +++ b/po/hu.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-01-08 15:13+0000\n" "Last-Translator: Zoltan Hoppár \n" "Language-Team: Hungarian \n" @@ -247,12 +247,12 @@ msgid "contains the user name in some form" msgstr "valahogy tartalmazza a felhasználó nevét" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "Nincs jelszó megadva" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "Változatlan jelszó" @@ -376,7 +376,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "„%s” mappa nem hozható létre és állítható be." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "A jelszót már használta. Válasszon másikat." @@ -554,31 +554,31 @@ msgstr[1] "Figyelmeztetés: a jelszava %d nap múlva lejár" msgid "Warning: your password will expire in %d days" msgstr "Figyelmeztetés: a jelszava %d nap múlva lejár" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "NIS jelszót nem sikerült módosítani." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "Válasszon hosszabb jelszót" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "%s jelszavának megváltoztatása." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "A (jelenlegi) UNIX jelszó: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "Tovább kell várnia míg megváltoztathatja a jelszavát" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Adja meg az új UNIX jelszót: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "Írja be újra a UNIX jelszót: " diff --git a/po/ia.po b/po/ia.po index 575344f5..a3e8b8ee 100644 --- a/po/ia.po +++ b/po/ia.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2012-12-17 22:00+0000\n" "Last-Translator: Nik Kalach \n" "Language-Team: Interlingua \n" @@ -247,12 +247,12 @@ msgid "contains the user name in some form" msgstr "nove contrasigno contine le nomine de usator in alicun forma" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "Necun contrasigno fornite" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "Le contrasigno non ha cambiate" @@ -379,7 +379,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "Impossibile de crear e de initiar le directorio '%s'." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "Le contrasigno jam se ha utilisate. Selige un altere." @@ -554,31 +554,31 @@ msgstr[1] "Advertimento: le contrasigno perimera in %d dies" msgid "Warning: your password will expire in %d days" msgstr "Advertimento: le contrasigno perimera in %d dies" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "Le contrasigno NIS non pote esser cambiate." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "Selige un contrasigno plus longe" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "Cambiamento del contrasigno pro %s." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "Contrasigno UNIX (actual):" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "Attende ancora pro cambiar le contrasigno" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Introduce le nove contrasigno UNIX: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "Repete le nove contrasigno UNIX: " diff --git a/po/id.po b/po/id.po index 3f21580c..d66b1101 100644 --- a/po/id.po +++ b/po/id.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-04-22 05:07+0000\n" "Last-Translator: sentabi\n" "Language-Team: Indonesian \n" @@ -242,12 +242,12 @@ msgid "contains the user name in some form" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "" @@ -370,7 +370,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "Tidak dapat membuat direktori '%s'." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "Sandi sudah digunakan sebelumnya. Pilih sandi yang lain." @@ -540,31 +540,31 @@ msgstr[0] "" msgid "Warning: your password will expire in %d days" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Masukkan sandi Unix yang baru :" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "Ketik ulang sandi Unix:" diff --git a/po/it.po b/po/it.po index 179c2e6a..056972e0 100644 --- a/po/it.po +++ b/po/it.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-04-09 03:03+0000\n" "Last-Translator: fvalen \n" "Language-Team: Italian \n" @@ -250,12 +250,12 @@ msgid "contains the user name in some form" msgstr "contiene il nome utente in alcune forme" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "Nessuna password fornita" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "Password non modificata" @@ -385,7 +385,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "Impossibile creare e inizializzare la directory '%s'" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "Password già utilizzata. Sceglierne un'altra." @@ -563,31 +563,31 @@ msgstr[1] "Avviso: la password scadrà tra %d giorni" msgid "Warning: your password will expire in %d days" msgstr "Avviso: la password scadrà tra %d giorni" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "Impossibile modificare la password NIS." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "Scegliere una password più lunga" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "Cambio password per %s." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "Password UNIX (corrente): " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "Attendere ancora per cambiare la password" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Immettere nuova password UNIX: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "Reimmettere la nuova password UNIX: " diff --git a/po/ja.po b/po/ja.po index 67bf89a4..6016e070 100644 --- a/po/ja.po +++ b/po/ja.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-05-07 12:44+0000\n" "Last-Translator: Jiro Matsuzawa \n" "Language-Team: Japanese \n" @@ -245,12 +245,12 @@ msgid "contains the user name in some form" msgstr "なんらかの形式のユーザー名を含みます" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "パスワードが与えられていません" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "パスワードが変更されていません" @@ -373,7 +373,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "ディレクトリ %s を作成して初期化できません。" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "" "パスワードはすでに使用されています。 別のパスワードを選択してください。" @@ -549,31 +549,31 @@ msgstr[0] "警告: パスワードは%d日で有効期限が切れます。" msgid "Warning: your password will expire in %d days" msgstr "警告: パスワードは %d 日で有効期限が切れます。" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "NIS パスワードを変更できませんでした。" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "長いパスワードを選択する必要があります" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "%s 用にパスワードを変更中" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "現在の UNIX パスワード:" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "パスワードを変更するには長く待つ必要があります" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "新しい UNIX パスワードを入力してください:" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "新しい UNIX パスワードを再入力してください:" diff --git a/po/ka.po b/po/ka.po index 50084594..d2c32c94 100644 --- a/po/ka.po +++ b/po/ka.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-01-26 15:08+0000\n" "Last-Translator: George Machitidze \n" "Language-Team: Georgian (http://www.transifex.com/projects/p/fedora/language/" @@ -243,12 +243,12 @@ msgid "contains the user name in some form" msgstr "რაღაც ფორმით გავს მომხმარებლის სახელს" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "პაროლი არ იქნა მითითებული" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "პაროლი არ შეცვლილა" @@ -371,7 +371,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "" @@ -541,31 +541,31 @@ msgstr[0] "" msgid "Warning: your password will expire in %d days" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(მიმდინარე) UNIX პაროლი: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "შეიყვანეთ ახალი UNIX პაროლი: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "გაიმეორეთ ახალი UNIX პაროლი: " diff --git a/po/kk.po b/po/kk.po index 5897d9f2..cb3a0170 100644 --- a/po/kk.po +++ b/po/kk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-06-11 09:53+0000\n" "Last-Translator: Baurzhan Muftakhidinov \n" "Language-Team: Kazakh (http://www.transifex.com/projects/p/fedora/language/" @@ -245,12 +245,12 @@ msgid "contains the user name in some form" msgstr "құрамында пайдаланушы аты бар" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "Пароль көрсетілмеді" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "Пароль өзгертілмеді" @@ -373,7 +373,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "%s бумасын жасау мүмкін емес: %m" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "Пароль осыған дейін қолданған. Басқасын таңдаңыз." @@ -548,31 +548,31 @@ msgstr[0] "Ескерту: сіздің пароліңіздің мерзімі msgid "Warning: your password will expire in %d days" msgstr "Ескерту: сіздің пароліңіздің мерзімі %d күнде бітеді" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "NIS паролін өзгерту мүмкін емес." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "Сізге ұзынырақ парольді таңдау керек" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "%s үшін парольді өзгерту." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(ағымдағы) UNIX паролі: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "Пароліңізді өзгерті үшін біраз күтуіңіз керек" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Жаңа UNIX паролін енгізіңіз: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "Жаңа UNIX паролін қайта енгізіңіз: " diff --git a/po/km.po b/po/km.po index addab79d..8d5aa524 100644 --- a/po/km.po +++ b/po/km.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2011-11-30 12:00+0000\n" "Last-Translator: Tomáš Mráz \n" "Language-Team: LANGUAGE \n" @@ -243,12 +243,12 @@ msgid "contains the user name in some form" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "មិន​បាន​ផ្ដល់​ពាក្យសម្ងាត់" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "ពាក្យសម្ងាត់​មិន​បាន​ផ្លាស់ប្ដូរ​ឡើយ" @@ -371,7 +371,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "ពាក្យសម្ងាត់​ត្រូវ​បាន​ប្រើ​រួច​ហើយ ។ សូម​ជ្រើស​មួយ​ទៀត ។" @@ -543,31 +543,31 @@ msgstr[0] "" msgid "Warning: your password will expire in %d days" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "មិន​អាច​ផ្លាស់ប្ដូរ​ពាក្យសម្ងាត់ NIS បាន​ឡើយ ។" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "អ្នក​ត្រូវ​តែ​ជ្រើស​ពាក្យសម្ងាត់​វែង​ជាង​នេះ" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(បច្ចុប្បន្ន) ពាក្យ​សម្ងាត់ UNIX ៖" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "អ្នក​ត្រូវ​តែ​រង់ចាំ​បន្តិច ដើម្បី​ផ្លាស់ប្ដូរ​ពាក្យសម្ងាត់​របស់​អ្នក" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "បញ្ចូល​ពាក្យ​សម្ងាត់ UNIX ថ្មី ៖ " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "វាយ​ពាក្យ​សម្ងាត់ UNIX ថ្មី​ម្ដង​ទៀត ៖ " diff --git a/po/kn.po b/po/kn.po index 7c240374..378c9484 100644 --- a/po/kn.po +++ b/po/kn.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-04-15 08:49+0000\n" "Last-Translator: shanky \n" "Language-Team: Kannada (http://www.transifex.com/projects/p/fedora/language/" @@ -245,12 +245,12 @@ msgid "contains the user name in some form" msgstr "ಇದು ಯಾವುದೊ ಒಂದು ಬಗೆಯಲ್ಲಿ ಬಳಕೆದಾರ ಹೆಸರನ್ನು ಒಳಗೊಂಡಿದೆ" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "ಯಾವುದೇ ಗುಪ್ತಪದ ನೀಡಲಾಗಿಲ್ಲ" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "ಗುಪ್ತಪದ ಬದಲಾಗಿಲ್ಲ" @@ -373,7 +373,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "ಕೋಶ '%s' ಅನ್ನು ರಚಿಸಲು ಹಾಗು ಆರಂಭಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "ಗುಪ್ತಪದವು ಈಗಾಗಲೆ ಬಳಸಲ್ಪಟ್ಟಿದೆ. ಬೇರೊಂದನ್ನು ಬಳಸಿ." @@ -549,31 +549,31 @@ msgstr[0] "ಎಚ್ಚರಿಕೆ: ನಿಮ್ಮ ಗುಪ್ತಪದದ msgid "Warning: your password will expire in %d days" msgstr "ಎಚ್ಚರಿಕೆ: %d ದಿನಗಳಲ್ಲಿ ನಿಮ್ಮ ಗುಪ್ತಪದದ ಅವಧಿ ಅಂತ್ಯಗೊಳ್ಳುತ್ತದೆ" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "NIS ಗುಪ್ತಪದವನ್ನು ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ್ಲ." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "ನೀವು ಒಂದು ಉದ್ದವಾದ ಗುಪ್ತಪದವನ್ನು ಆರಿಸಬೇಕು" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "%s ಗಾಗಿ ಗುಪ್ತಪದವನ್ನು ಬದಲಾಯಿಸಲಾಗುತ್ತಿದೆ." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(ಪ್ರಸ್ತುತ) UNIX ಗುಪ್ತಪದ: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "ನಿಮ್ಮ ಗುಪ್ತಪದವನ್ನು ಬದಲಾಯಿಸಲು ನೀವು ಬಹಳ ಸಮಯ ಕಾಯಬೇಕು" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "ಹೊಸ UNIX ಗುಪ್ತಪದವನ್ನು ದಾಖಲಿಸಿ: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "ಹೊಸ UNIX ಗುಪ್ತಪದವನ್ನು ಪುನಃ ಟೈಪಿಸಿ: " diff --git a/po/ko.po b/po/ko.po index 3cd81c29..8828c780 100644 --- a/po/ko.po +++ b/po/ko.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-04-16 13:34+0000\n" "Last-Translator: eukim \n" "Language-Team: Korean (http://www.transifex.com/projects/p/fedora/language/" @@ -245,12 +245,12 @@ msgid "contains the user name in some form" msgstr "어떠한 형식으로 사용자 이름을 포함합니다. " #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "암호가 없음" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "암호가 변경되지 않음" @@ -373,7 +373,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "'%s' 디렉토리를 생성 및 초기화할 수 없습니다. " #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "이미 사용되고 있는 암호입니다. 다른 암호를 선택해 주십시오." @@ -547,31 +547,31 @@ msgstr[0] "경고: %d일 내로 암호가 만료됩니다" msgid "Warning: your password will expire in %d days" msgstr "경고: %d일 내로 암호가 만료됩니다" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "NIS 암호는 변경할 수 없습니다." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "더 긴 암호를 선택해 주십시오" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "%s에 대한 암호 변경 중 " -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(현재) UNIX 암호:" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "암호 변경을 위해 조금더 기다려 주십시오." -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "새 UNIX 암호 입력:" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "새 UNIX 암호 재입력:" diff --git a/po/ks.po b/po/ks.po index a36bba3f..42208c27 100644 --- a/po/ks.po +++ b/po/ks.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2011-11-30 11:56+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Kashmiri (http://www.transifex.com/projects/p/fedora/language/" @@ -242,12 +242,12 @@ msgid "contains the user name in some form" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "" @@ -371,7 +371,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "" @@ -542,31 +542,31 @@ msgstr[1] "" msgid "Warning: your password will expire in %d days" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "" diff --git a/po/lt.po b/po/lt.po index 15241474..71c7d8c4 100644 --- a/po/lt.po +++ b/po/lt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2011-11-30 11:56+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Lithuanian (http://www.transifex.com/projects/p/fedora/" @@ -243,12 +243,12 @@ msgid "contains the user name in some form" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "" @@ -373,7 +373,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "" @@ -545,31 +545,31 @@ msgstr[2] "" msgid "Warning: your password will expire in %d days" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "" diff --git a/po/lv.po b/po/lv.po index bbde30ea..45153ede 100644 --- a/po/lv.po +++ b/po/lv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2011-11-30 11:56+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Latvian (http://www.transifex.com/projects/p/fedora/language/" @@ -243,12 +243,12 @@ msgid "contains the user name in some form" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "" @@ -373,7 +373,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "" @@ -545,31 +545,31 @@ msgstr[2] "" msgid "Warning: your password will expire in %d days" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "" diff --git a/po/mai.po b/po/mai.po index 4cbda3a6..d813d318 100644 --- a/po/mai.po +++ b/po/mai.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2011-11-30 11:56+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Maithili (http://www.transifex.com/projects/p/fedora/language/" @@ -242,12 +242,12 @@ msgid "contains the user name in some form" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "" @@ -371,7 +371,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "" @@ -542,31 +542,31 @@ msgstr[1] "" msgid "Warning: your password will expire in %d days" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "" diff --git a/po/ml.po b/po/ml.po index 5deee9c9..f7515ace 100644 --- a/po/ml.po +++ b/po/ml.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-04-15 05:55+0000\n" "Last-Translator: Ani Peter \n" "Language-Team: Malayalam \n" @@ -242,12 +242,12 @@ msgid "contains the user name in some form" msgstr "ഉപയോക്താവിന്റെ നാമം ഏതെങ്കിലും ഒരു തരത്തിലുണ്ടു്" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "അടയാളവാക്ക് നല്‍കിയിട്ടില്ല" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "അടയാളവാക്ക് മാറ്റിയിട്ടില്ല" @@ -371,7 +371,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "%s ഡയറക്ടറി ഉണ്ടാക്കുവാനും ആരംഭിക്കുവാനും സാധ്യമായില്ല." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "അടയാളവാക്ക് നിലവില്‍ ഉപയോഗിത്തിലുള്ളതാണ്. മറ്റൊന്ന് നല്‍കുക." @@ -548,31 +548,31 @@ msgstr[1] "മുന്നറിയിപ്പ്: നിങ്ങളുടെ msgid "Warning: your password will expire in %d days" msgstr "മുന്നറിയിപ്പ്: നിങ്ങളുടെ അടയാളവാക്കിന്റെ കാലാവധി %d ദിവസത്തിനുള്ളില്‍ അവസാനിക്കുന്നു" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "NIS അടയാളവാക്ക് മാറ്റുവാന്‍ സാധ്യമാകുന്നില്ല." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "ഇതിലും വലിയ അടയാളവാക്ക് തിരഞ്ഞെടുക്കുക" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "%s-നുളള അടയാളവാക്ക് മാറ്റുന്നു." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(നിലവിലുളളത്) UNIX രഅടയാളവാക്ക്: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "നിങ്ങളുടെ അടയാളവാക്ക് മാറ്റുന്നതിനായി ഇനിയും കാത്തിരിക്കേണ്ടതാണ്." -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "പുതിയ UNIX അടയാളവാക്ക് നല്‍കുക: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "പുതിയ UNIX അടയാളവാക്ക് വീണ്ടും ടൈപ്പ് ചെയ്യുക: " diff --git a/po/mr.po b/po/mr.po index f191cbfd..77f9aa99 100644 --- a/po/mr.po +++ b/po/mr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-05-03 07:46+0000\n" "Last-Translator: sandeeps \n" "Language-Team: Marathi (http://www.transifex.com/projects/p/fedora/language/" @@ -244,12 +244,12 @@ msgid "contains the user name in some form" msgstr "कुठल्यातरी स्वरूपात वापरकर्ता नाव आढळले" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "गुप्तशब्द दिलेला नाही" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "गुप्तशब्द बदलविला नाही" @@ -373,7 +373,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "डिरेक्ट्री '%s' बनवण्यास व प्रारंभ करण्यास अशक्य." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "ह्या गुप्तशब्दचा आधीच वापर झाला आहे. दुसरा निवडा." @@ -548,31 +548,31 @@ msgstr[1] "सावधानता: तुमचे गुप्तशब्द msgid "Warning: your password will expire in %d days" msgstr "सावधानता: तुमचे गुप्तशब्द %d दिवसात कालबाह्य होईल" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "NIS गुप्तशब्द बदलविले जाऊ शकत नाही." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "तुम्ही मोठा गुप्तशब्द निवडला पाहीजे" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "%s करीता गुप्तशब्द बदलवित आहे." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(चालू) UNIX गुप्तशब्द: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "तुमचा गुप्तशब्द बदलण्यासाठी तुम्हाला बराच वेळ वाट पहावी लागेल" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "नवीन UNIX गुप्तशब्द प्रविष्ट करा: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "नवीन UNIX गुप्तशब्द पुन्हा टाइप करा: " diff --git a/po/ms.po b/po/ms.po index 113df162..02be6d80 100644 --- a/po/ms.po +++ b/po/ms.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2011-11-30 12:01+0000\n" "Last-Translator: Tomáš Mráz \n" "Language-Team: LANGUAGE \n" @@ -242,12 +242,12 @@ msgid "contains the user name in some form" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "" @@ -370,7 +370,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "" @@ -540,31 +540,31 @@ msgstr[0] "" msgid "Warning: your password will expire in %d days" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "Menukar katalaluan untuk %s." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(semasa) katalaluan UNIX:" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Masukkan katalaluan UNIX baru:" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "" diff --git a/po/nb.po b/po/nb.po index 95fee704..21a1a81c 100644 --- a/po/nb.po +++ b/po/nb.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-01-08 13:18+0000\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian Bokmål \n" @@ -243,12 +243,12 @@ msgid "contains the user name in some form" msgstr "inneholder brukernavnet i en eller annen form" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "Passord ikke angitt" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "Passord uendret" @@ -375,7 +375,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "Kan ikke lage og initiere katalog «%s»." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "Passordet er allerede benyttet. Velg et annet." @@ -550,31 +550,31 @@ msgstr[1] "Advarsel: passordet ditt vil utløpe om %d dager" msgid "Warning: your password will expire in %d days" msgstr "Advarsel: passordet ditt vil utløpe om %d dager" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "NIS-passord kunne ikke endres." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "Du må velge et lengre passord" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "Endrer passord for %s." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(gjeldende) UNIX-passord: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "Du må vente lenger før du kan endre passordet" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Angi nytt UNIX-passord: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "Bekreft nytt UNIX-passord: " diff --git a/po/nds.po b/po/nds.po index e3d6e075..b5b8d276 100644 --- a/po/nds.po +++ b/po/nds.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2011-11-30 11:56+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Low German \n" @@ -241,12 +241,12 @@ msgid "contains the user name in some form" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "" @@ -370,7 +370,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "" @@ -541,31 +541,31 @@ msgstr[1] "" msgid "Warning: your password will expire in %d days" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "" diff --git a/po/nl.po b/po/nl.po index 2e153c64..cc3de2a0 100644 --- a/po/nl.po +++ b/po/nl.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-07-10 13:21+0000\n" "Last-Translator: hamaryns \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/fedora/language/" @@ -250,12 +250,12 @@ msgid "contains the user name in some form" msgstr "bevat de gebruikersnaam in een of andere vorm" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "Geen wachtwoord opgegeven" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "Wachtwoord is ongewijzigd" @@ -382,7 +382,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "Niet in staat om map ‘%s’ aan te maken." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "Wachtwoord is al eens gebruikt. Kies een ander wachtwoord." @@ -560,31 +560,31 @@ msgstr[1] "Waarschuwing: uw wachtwoord zal binnen %d dagen verlopen" msgid "Warning: your password will expire in %d days" msgstr "Waarschuwing: uw wachtwoord zal binnen %d dagen verlopen" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "NIS-wachtwoord kon niet worden gewijzigd." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "U moet een langer wachtwoord kiezen" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "Veranderen van wachtwoord voor %s." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(huidig) UNIX-wachtwoord:" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "U moet langer wachten om uw wachtwoord te wijzigen" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Nieuw UNIX-wachtwoord invoeren:" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "Nieuw UNIX-wachtwoord herhalen:" diff --git a/po/nn.po b/po/nn.po index 9d67ae2d..a8d3d29a 100644 --- a/po/nn.po +++ b/po/nn.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2011-11-30 11:56+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Norwegian Nynorsk \n" @@ -241,12 +241,12 @@ msgid "contains the user name in some form" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "" @@ -370,7 +370,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "" @@ -541,31 +541,31 @@ msgstr[1] "" msgid "Warning: your password will expire in %d days" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "" diff --git a/po/or.po b/po/or.po index a7fec3da..83b0d2aa 100644 --- a/po/or.po +++ b/po/or.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-04-15 14:35+0000\n" "Last-Translator: Manoj Kumar Giri \n" "Language-Team: Oriya (http://www.transifex.com/projects/p/fedora/language/" @@ -245,12 +245,12 @@ msgid "contains the user name in some form" msgstr "ଚାଳକ ନାମକୁ କୌଣସି ଉପାୟରେ ଧାରଣ କରିଥାଏ" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "କୌଣସି ପ୍ରବେଶ ସଙ୍କେତ ପ୍ରଦାନ କରାଯାଇ ନାହିଁ" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "ପ୍ରବେଶ ସଙ୍କେତ ଅପରିବର୍ତ୍ତିତ ଅଛି" @@ -374,7 +374,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "ଡ଼ିରେକ୍ଟୋରୀ '%s'କୁ ନିର୍ମାଣ ଏବଂ ପ୍ରାରମ୍ଭ କରିବାରେ ଅସମର୍ଥ।" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "ପ୍ରବେଶ ସଙ୍କେତଟି ପୂର୍ବରୁ ବ୍ଯବହୃତ ହେଉଛି। ଅନ୍ଯ ଗୋଟିଏ ପ୍ରବେଶ ସଙ୍କେତ ଚୟନ କରନ୍ତୁ।" @@ -550,31 +550,31 @@ msgstr[1] "ଚେତାବନୀ: ଆପଣଙ୍କ ପ୍ରବେଶ ସଙ msgid "Warning: your password will expire in %d days" msgstr "ଚେତାବନୀ: ଆପଣଙ୍କ ପ୍ରବେଶ ସଙ୍କେତ %d ଦିନରେ ଅକାମି ହୋଇଯିବ" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "NIS ପ୍ରବେଶ ସଙ୍କେତକୁ ବଦଳାଇ ହେଲା ନାହିଁ।" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "ଆପଣ ଗୋଟିଏ ଲମ୍ବା ପ୍ରବେଶ ସଙ୍କେତ ଚୟନ କରିବା ଉଚିତ" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "%s ପାଇଁ ପ୍ରବେଶ ସଙ୍କେତକୁ ବଦଳାଉଛି." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(ବର୍ତ୍ତମାନ ଥିବା) UNIX ପ୍ରବେଶ ସଙ୍କେତ: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "ପ୍ରବେଶ ସଙ୍କେତକୁ ବଦଳାଇବା ପାଇଁ ଆପଣ ଅଧିକ ସମୟ ଅପେକ୍ଷା କରିବା ଉଚିତ" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "ନୂତନ UNIX ପ୍ରବେଶ ସଙ୍କେତ ଭରଣ କରନ୍ତୁ: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "ନୂତନ UNIX ପ୍ରବେଶ ସଙ୍କେତକୁ ପୁନର୍ବାର ଟାଇପ କରନ୍ତୁ: " diff --git a/po/pa.po b/po/pa.po index dca95228..d247f95e 100644 --- a/po/pa.po +++ b/po/pa.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-08-30 12:55+0000\n" "Last-Translator: asaini \n" "Language-Team: Panjabi (Punjabi) \n" @@ -244,12 +244,12 @@ msgid "contains the user name in some form" msgstr "ਕੁਸੇ ਰੂਪ ਵਿੱਚ ਉਪਭੋਗੀ ਨਾਂ ਸ਼ਾਮਿਲ ਹੈ" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "ਕੋਈ ਪਾਸਵਰਡ ਨਹੀਂ ਦਿੱਤਾ ਗਿਆ" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "ਪਾਸਵਰਡ ਨਾ-ਤਬਦੀਲ ਹੈ" @@ -373,7 +373,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "ਡਾਇਰੈਕਟਰੀ '%s' ਨੂੰ ਬਣਾਉਣ ਅਤੇ ਸ਼ੁਰੂ ਕਰਨ ਵਿੱਚ ਅਸਮਰਥ।" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "ਪਾਸਵਰਡ ਪਹਿਲਾਂ ਵੀ ਵਰਤਿਆ ਗਿਆ ਹੈ। ਵੱਖਰਾ ਚੁਣੋ।" @@ -548,31 +548,31 @@ msgstr[1] "ਚੇਤਾਵਨੀ: ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਦੀ msgid "Warning: your password will expire in %d days" msgstr "ਚੇਤਾਵਨੀ: ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਦੀ ਮਿਆਦ %d ਦਿਨਾਂ ਵਿੱਚ ਪੁੱਗ ਜਾਵੇਗੀ" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "NIS ਪਾਸਵਰਡ ਤਬਦੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "ਤੁਹਾਨੂੰ ਲੰਮੇ ਪਾਸਵਰਡ ਦੀ ਚੋਣ ਕਰਨੀ ਚਾਹੀਦੀ ਹੈ" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "%s ਲਈ ਪਾਸਵਰਡ ਤਬਦੀਲ ਕਰ ਰਿਹਾ ਹੈ।" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(ਮੌਜੂਦਾ) UNIX ਪਾਸਵਰਡ: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "ਤੁਹਾਨੂੰ ਲੰਬੇ ਸਮੇਂ ਲਈ ਆਪਣੇ ਪਾਸਵਰਡ ਲਈ ਉਡੀਕ ਕਰਨੀ ਪਵੇਗੀ" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "ਨਵਾਂ ਯੂਨਿਕਸ ਪਾਸਵਰਡ ਦਿਓ: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "ਨਵਾਂ ਯੂਨਿਕਸ ਪਾਸਵਰਡ ਮੁੜ-ਲਿਖੋ: " diff --git a/po/pl.po b/po/pl.po index 731bed61..859ddfd7 100644 --- a/po/pl.po +++ b/po/pl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2012-12-12 19:19+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" @@ -246,12 +246,12 @@ msgid "contains the user name in some form" msgstr "zawiera nazwę użytkownika w pewnej formie" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "Nie podano hasła" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "Hasło nie zostało zmienione" @@ -380,7 +380,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "Nie można utworzyć i zainicjować katalogu \"%s\"." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "Hasło było już używane. Proszę wybrać inne." @@ -557,31 +557,31 @@ msgstr[2] "Ostrzeżenie: hasło wygaśnie za %d dni" msgid "Warning: your password will expire in %d days" msgstr "Ostrzeżenie: hasło wygaśnie za %d dni" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "Nie można zmienić hasła NIS." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "Należy wybrać dłuższe hasło" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "Zmienianie hasła dla %s." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(obecne) hasło UNIX:" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "Należy poczekać dłużej, aby zmienić hasło" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Proszę podać nowe hasło UNIX: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "Proszę ponownie podać hasło UNIX: " diff --git a/po/pt.po b/po/pt.po index d06b5ef2..458d01bb 100644 --- a/po/pt.po +++ b/po/pt.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-01-28 11:21+0000\n" "Last-Translator: Ricardo Pinto \n" "Language-Team: Portuguese \n" @@ -246,12 +246,12 @@ msgid "contains the user name in some form" msgstr "contém, de alguma forma, o nome do utilizador" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "Não foi fornecida uma senha" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "Senha inalterada" @@ -381,7 +381,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "Não foi possível criar e inicializar o directório '%s'." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "A senha já foi utilizada anteriormente. Escolha outra." @@ -557,31 +557,31 @@ msgstr[1] "Aviso: a sua senha expira em %d dias" msgid "Warning: your password will expire in %d days" msgstr "Aviso: a sua palavra passe expira em %d dias" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "A senha NIS não pode ser alterada." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "Deve escolher uma senha mais longa" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "A alterar senha para %s." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "senha UNIX (actual): " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "Tem de esperar mais antes de poder alterar a sua senha" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Digite a nova senha UNIX: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "Digite novamente a nova senha UNIX: " diff --git a/po/pt_BR.po b/po/pt_BR.po index 2813d874..1a71da94 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2014-07-03 17:41+0000\n" "Last-Translator: Daniel Lara \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/" @@ -248,12 +248,12 @@ msgid "contains the user name in some form" msgstr "contém o nome de usuário em algum formulário" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "Nenhuma senha informada" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "Senha inalterada" @@ -377,7 +377,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "Impossível criar e inicializar o diretório \"%s\"." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "A senha já foi usada. Escolha outra." @@ -552,31 +552,31 @@ msgstr[1] "Aviso: sua senha irá expirar em %d dias" msgid "Warning: your password will expire in %d days" msgstr "Aviso: sua senha irá expirar em %d dias" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "A senha NIS não pôde ser mudada." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "Escolha uma senha mais longa" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "Mudando senha para %s." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "Senha UNIX (atual):" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "Aguarde mais tempo para mudar a senha" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Digite a nova senha UNIX:" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "Redigite a nova senha UNIX:" diff --git a/po/ro.po b/po/ro.po index fd0e272e..b40c735e 100644 --- a/po/ro.po +++ b/po/ro.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2011-11-30 11:56+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/fedora/language/" @@ -243,12 +243,12 @@ msgid "contains the user name in some form" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "" @@ -373,7 +373,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "" @@ -545,31 +545,31 @@ msgstr[2] "" msgid "Warning: your password will expire in %d days" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "" diff --git a/po/ru.po b/po/ru.po index 242c5bff..65897372 100644 --- a/po/ru.po +++ b/po/ru.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-04-09 01:12+0000\n" "Last-Translator: Yulia \n" "Language-Team: Russian \n" @@ -248,12 +248,12 @@ msgid "contains the user name in some form" msgstr "содержит имя пользователя" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "Пароль не указан" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "Пароль не изменен" @@ -378,7 +378,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "Не удалось создать и инициализировать каталог %s." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "Этот пароль уже был использован. Выберите другой." @@ -560,31 +560,31 @@ msgstr[2] "Предупреждение: срок действия пароля msgid "Warning: your password will expire in %d days" msgstr "Предупреждение: срок действия пароля истекает через %d дн(я)(ей)" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "Пароль NIS изменить нельзя." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "Выберите пароль большей длины" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "Смена пароля для %s." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(текущий) пароль UNIX: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "До смены пароля должно пройти больше времени" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Введите новый пароль UNIX: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "Повторите ввод нового пароля UNIX: " diff --git a/po/si.po b/po/si.po index 80fcd06e..0286aee0 100644 --- a/po/si.po +++ b/po/si.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2011-11-30 12:01+0000\n" "Last-Translator: Tomáš Mráz \n" "Language-Team: Sinhala (http://www.transifex.net/projects/p/fedora/language/" @@ -243,12 +243,12 @@ msgid "contains the user name in some form" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "රහස්පදය සපයා නැත" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "රහස්පදය වෙනස් නොවිනි" @@ -372,7 +372,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "රහස්පදය දැනටමත් භාවිතා වේ. වෙනත් එකක් තෝරාගන්න." @@ -545,31 +545,31 @@ msgstr[1] "අවවාදයි: ඔබගේ රහස්පදය දින % msgid "Warning: your password will expire in %d days" msgstr "අවවාදයි: ඔබගේ රහස්පදය දින %d කින් කල්ඉකුත් වේ" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "NIS රහස්පදය වෙනස් කළ නොහැක." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "ඔබ විසින් දිගු රහස්පදයක් තෝරාගත යුතුම වේ" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(දැනට ඇති) UNIX රහස්පදය: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "ඔබගේ රහස්පදය වෙනස් කිරීමට බොහෝ වෙලාවක් රැදී සිටීය යුතුම වේ" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "නව UNIX රහස්පදය ඇතුළත් කරන්න:" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "නව UNIX රහස්පදය නැවත ඇතුළත් කරන්න:" diff --git a/po/sk.po b/po/sk.po index 44a23ae6..13f84d74 100644 --- a/po/sk.po +++ b/po/sk.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2014-10-07 08:54+0000\n" "Last-Translator: feonsu \n" "Language-Team: Slovak (http://www.transifex.com/projects/p/linux-pam/" @@ -246,12 +246,12 @@ msgid "contains the user name in some form" msgstr "obsahuje v nejakej forme používateľské meno" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "Heslo nezadané" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "Heslo nebolo zmenené" @@ -384,7 +384,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "Nedá sa vytvoriť a inicializovať priečinok '%s'." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "Heslo už bolo použité. Zvoľte si iné." @@ -562,31 +562,31 @@ msgstr[2] "Upozornenie: vaše heslo vyprší za %d dní" msgid "Warning: your password will expire in %d days" msgstr "Upozornenie: vaše heslo vyprší za %d dní" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "Nie je možné zmeniť NIS heslo." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "Musíte si zvoliť dlhšie heslo" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "Zmena hesla pre %s." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(aktuálne) UNIX heslo: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "Na zmenu svojho hesla musíte počkať dlhšie" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Zadajte nové UNIX heslo: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "Opakujte nové UNIX heslo: " diff --git a/po/sq.po b/po/sq.po index 7f0c2bd2..80585ec7 100644 --- a/po/sq.po +++ b/po/sq.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2011-11-30 11:56+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Albanian (http://www.transifex.com/projects/p/fedora/language/" @@ -242,12 +242,12 @@ msgid "contains the user name in some form" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "" @@ -371,7 +371,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "" @@ -542,31 +542,31 @@ msgstr[1] "" msgid "Warning: your password will expire in %d days" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "" diff --git a/po/sr.po b/po/sr.po index be81694f..e97c1faa 100644 --- a/po/sr.po +++ b/po/sr.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2014-11-16 23:51+0000\n" "Last-Translator: Momcilo Medic \n" "Language-Team: Serbian (http://www.transifex.com/projects/p/linux-pam/" @@ -248,12 +248,12 @@ msgid "contains the user name in some form" msgstr "садржи корисничко име у неком облику" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "Није понуђена лозинка" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "Лозинка није промењена" @@ -378,7 +378,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "Не могу да направим директоријум „%s“." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "Лозинка је већ у употреби. Изаберите другу." @@ -555,31 +555,31 @@ msgstr[2] "Упозорење: ваша лозинка ће истећи кро msgid "Warning: your password will expire in %d days" msgstr "Упозорење: ваша лозинка ће истећи кроз %d дана" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "NIS лозинка не може бити промењена." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "Морате изабрати дужу лозинку" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "Мењам лозинку за %s." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(тренутна) UNIX лозинка: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "Морате дуже сачекати на промену лозинке" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Унесите нову UNIX лозинку: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "Поново унесите нову UNIX лозинку: " diff --git a/po/sr@latin.po b/po/sr@latin.po index 1d6424db..2acdd47a 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2011-11-30 11:59+0000\n" "Last-Translator: Tomáš Mráz \n" "Language-Team: LANGUAGE \n" @@ -247,12 +247,12 @@ msgid "contains the user name in some form" msgstr "sadrži korisničko ime u nekom obliku" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "Nije ponuđena lozinka" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "Lozinka nije promenjena" @@ -377,7 +377,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "Ne mogu da napravim direktorijum „%s“." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "Lozinka je već u upotrebi. Izaberite drugu." @@ -555,32 +555,32 @@ msgstr[2] "Upozorenje: vaša lozinka će isteći kroz %d dana" msgid "Warning: your password will expire in %d days" msgstr "Upozorenje: vaša lozinka će isteći kroz %d dana" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "NIS lozinka ne može biti promenjena." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "Morate izabrati dužu lozinku" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "Menjam lozinku za %s." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(trenutna) UNIX lozinka: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "Morate duže sačekati na promenu lozinke" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Unesite novu UNIX lozinku: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "Ponovo unesite novu UNIX lozinku: " diff --git a/po/sv.po b/po/sv.po index f2ab514a..e17b7243 100644 --- a/po/sv.po +++ b/po/sv.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-04-29 08:28+0000\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/fedora/language/" @@ -245,12 +245,12 @@ msgid "contains the user name in some form" msgstr "innehåller användarnamnet i någon form" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "Inget lösenord angivet" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "Oförändrat lösenord" @@ -380,7 +380,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "Kunde inte skapa och initiera katalogen \"%s\"." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "Lösenordet har redan används. Välj ett annat." @@ -555,31 +555,31 @@ msgstr[1] "Varning: ditt lösenord går ut om %d dagar" msgid "Warning: your password will expire in %d days" msgstr "Varning: ditt lösenord går ut om %d dagar" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "NIS-lösenord kunde inte ändras." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "Du måste välja ett längre lösenord" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "Ändrar lösenord för %s." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(nuvarande) UNIX-lösenord: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "Du måste vänta längre innan du kan ändra lösenord" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Ange nytt UNIX-lösenord: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "Ange nytt UNIX-lösenord igen: " diff --git a/po/ta.po b/po/ta.po index cb57c5a5..1c7b74e9 100644 --- a/po/ta.po +++ b/po/ta.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-04-10 14:40+0000\n" "Last-Translator: shkumar \n" "Language-Team: Tamil \n" @@ -245,12 +245,12 @@ msgid "contains the user name in some form" msgstr "சில வடிவல் பயனர் பெயரை கொண்டுள்ளது" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "கடவுச்சொல் கொடுக்கப்படவில்லை" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "கடவுச்சொல் மாற்றப்படவில்லை" @@ -374,7 +374,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "அடைவு '%s'ஐ உருவாக்க மற்றும் துவக்க முடியவில்லை." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "கடவுச்சொல் ஏற்கனவே பயன்படுத்தப்பட்டது. வேறொன்றை பயன்படுத்தவும்." @@ -549,31 +549,31 @@ msgstr[1] "எச்சரிக்கை: கடவுச்சொல் %d ந msgid "Warning: your password will expire in %d days" msgstr "எச்சரிக்கை: கடவுச்சொல் %d நாட்களில் முடிவுறும்" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "NIS கடவுச்சொல்லை மாற்ற முடியாது." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "நீங்கள் நீண்ட கடவுச்சொல்லை தேர்ந்தெடுக்க வேண்டும்" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "%sக்கு கடவுச்சொல்லை மாற்றுகிறது." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(நடப்பு) UNIX கடவுச்சொல்: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "உங்கள் கடவுச்சொல்லை மாற்ற சிறிது காத்திருக்க வேண்டும்" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "புதிய UNIX கடவுச்சொல்லை உள்ளிடவும்: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "புதிய UNIX கடவுச்சொல்லை மீண்டும் உள்ளிடவும்: " diff --git a/po/te.po b/po/te.po index e1f4e8fd..1cfca416 100644 --- a/po/te.po +++ b/po/te.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-04-30 11:58+0000\n" "Last-Translator: sudheesh001 \n" "Language-Team: Telugu (http://www.transifex.com/projects/p/fedora/language/" @@ -244,12 +244,12 @@ msgid "contains the user name in some form" msgstr "ఒకరకంగా వినియోగదారి నామమును కలిగివుంది" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "ఎటువంటి సంకేతపదము యివ్వలేదు" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "సంకేతపదము మార్చలేదు" @@ -373,7 +373,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "డైరెక్టరీ %sను సృష్టించలేక పోయింది మరియు సిద్దీకరించలేక పోయింది." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "సంకేతపదము యిప్పటికే వుపయోగించబడింది. మరియొకదానిని యెంచుకొనుము." @@ -548,31 +548,31 @@ msgstr[1] "హెచ్చరిక: మీ సంకేతపదము %d ర msgid "Warning: your password will expire in %d days" msgstr "హెచ్చరిక: మీ సంకేతపదము %d రోజులలో కాలముతీరుతుంది" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "NIS సంకేతపదము మార్చబడ లేకపోయింది." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "మీరు తప్పక పొడవాటి సంకేతపదమును యెంచుకొనవలెను." -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "%s కొరకు సంకేతపదమును మార్చుతోంది" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(ప్రస్తుత) UNIX సంకేతపదము: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "మీ సంకేతపదమును మార్చుటకు మీరు ఎక్కువసేపు వేచివుండాలి" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "కొత్త UNIX సంకేతపదమును ప్రవేశపెట్టుము: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "కొత్త UNIX సంకేతపదమును తిరిగిటైపు చేయుము: " diff --git a/po/tg.po b/po/tg.po index ed9b853a..eeefc976 100644 --- a/po/tg.po +++ b/po/tg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2011-11-30 11:56+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Tajik (http://www.transifex.com/projects/p/fedora/language/" @@ -242,12 +242,12 @@ msgid "contains the user name in some form" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "" @@ -371,7 +371,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "" @@ -542,31 +542,31 @@ msgstr[1] "" msgid "Warning: your password will expire in %d days" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "" diff --git a/po/tr.po b/po/tr.po index e69260f9..9d070108 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2013-01-08 21:22+0000\n" "Last-Translator: ismail yenigül \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/fedora/language/" @@ -247,12 +247,12 @@ msgid "contains the user name in some form" msgstr "kullanıcı adını bir biçimde içeriyor" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "Parola girilmedi" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "Parola değiştirilmedi" @@ -379,7 +379,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "%s dizini oluşturulamadı." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "Parola kullanımda. Lütfen başka bir parola seçin." @@ -554,31 +554,31 @@ msgstr[1] "Uyarı: şifreniz %d gün içerisinde süresi dolacaktır." msgid "Warning: your password will expire in %d days" msgstr "Uyarı: Parolanız %d gün içinde geçerliliğini yitirecek" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "NIS parolası değiştirilemiyor" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "Daha uzun bir parola girmelisiniz" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "%s kullanıcısının parolası değiştiriliyor." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(geçerli) parola: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "Parolanızı değiştirmek için daha sonra denemelisiniz" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Yeni parolayı girin: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "Yeni parolayı tekrar girin: " diff --git a/po/uk.po b/po/uk.po index 5f1ade34..18124e8f 100644 --- a/po/uk.po +++ b/po/uk.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2012-12-12 17:39+0000\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" @@ -244,12 +244,12 @@ msgid "contains the user name in some form" msgstr "містить ім’я користувача з форми" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "Пароль не встановлено" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "Пароль не змінено" @@ -382,7 +382,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "Не вдалося створити і ініціалізувати каталог «%s»." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "Цей пароль вже використано. Виберіть інший." @@ -561,31 +561,31 @@ msgstr[2] "Попередження: ваш пароль застаріє за % msgid "Warning: your password will expire in %d days" msgstr "Попередження: ваш пароль застаріє за %d днів" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "Не вдалося змінити пароль NIS." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "Вам слід вибрати довший пароль" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "Зміна пароля %s." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(поточний) пароль UNIX: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "Ви повинні зачекати, щоб змінити ваш пароль" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Введіть новий пароль UNIX: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "Повторіть новий пароль UNIX: " diff --git a/po/ur.po b/po/ur.po index 3cb3ed23..143ebf40 100644 --- a/po/ur.po +++ b/po/ur.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2011-11-30 11:56+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Urdu \n" @@ -241,12 +241,12 @@ msgid "contains the user name in some form" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "" @@ -370,7 +370,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "" @@ -541,31 +541,31 @@ msgstr[1] "" msgid "Warning: your password will expire in %d days" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "" diff --git a/po/vi.po b/po/vi.po index 1b5ddb80..26e20310 100644 --- a/po/vi.po +++ b/po/vi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2012-11-30 11:03+0000\n" "Last-Translator: mattheu_9x \n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/fedora/" @@ -244,12 +244,12 @@ msgid "contains the user name in some form" msgstr "chứa tên user trong một số biểu mẫu" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "Không có mật khẩu được cung cấp" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "Chưa thay đổi mật khẩu" @@ -374,7 +374,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "Không thể khởi tạo thư mục '%s'." #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "Mật khẩu đã được dùng. Hãy chọn mật khẩu khác." @@ -551,32 +551,32 @@ msgstr[0] "Cảnh báo: mật khẩu của bạn sẽ hết hạn trong %d ngày msgid "Warning: your password will expire in %d days" msgstr "Cảnh báo: mật khẩu của bạn sẽ hết hạn trong %d ngày" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "NIS mật khẩu không thể được thay đổi." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "Bạn phải chọn mật khẩu dài hơn" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "Thay đổi mật khẩu cho %s." -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "hiện hành UNIX mật khẩu: " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "Bạn phải đợi thêm nữa, để thay đổi mật khẩu" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Nhập mật khẩu UNIX mới: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "Nhập lại mật khẩu UNIX mới: " diff --git a/po/zh_CN.po b/po/zh_CN.po index bb2b7756..00b783bc 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2012-12-24 06:31+0000\n" "Last-Translator: Christopher Meng \n" "Language-Team: Chinese (China) \n" @@ -245,12 +245,12 @@ msgid "contains the user name in some form" msgstr "以某些形式包含用户名" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "密码未提供" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "密码未更改" @@ -373,7 +373,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "无法创建和初始化目录 '%s'。" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "密码已使用。请选择其他密码。" @@ -546,31 +546,31 @@ msgstr[0] "警告:您的密码将在 %d 天后过期" msgid "Warning: your password will expire in %d days" msgstr "警告:您的密码将在 %d 天后过期" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "无法更改 NIS 密码。" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "必须选择更长的密码" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "为 %s 更改 STRESS 密码。" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(当前)UNIX 密码:" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "您必须等待更长时间以更改密码" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "输入新的 UNIX 密码:" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "重新输入新的 UNIX 密码:" diff --git a/po/zh_HK.po b/po/zh_HK.po index 90e9919b..154a524f 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2011-11-30 11:56+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Chinese (Hong Kong) \n" @@ -241,12 +241,12 @@ msgid "contains the user name in some form" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "" @@ -369,7 +369,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "" @@ -539,31 +539,31 @@ msgstr[0] "" msgid "Warning: your password will expire in %d days" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "" diff --git a/po/zh_TW.po b/po/zh_TW.po index a2d0adb7..4ccc8b2c 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2012-12-16 08:46+0000\n" "Last-Translator: Cheng-Chia Tseng \n" "Language-Team: Chinese (Taiwan) \n" @@ -242,12 +242,12 @@ msgid "contains the user name in some form" msgstr "包含了某些格式的用戶名稱" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "未提供密碼" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "密碼未變更" @@ -370,7 +370,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "無法建立和初始化「%s」目錄。" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "密碼已經由其他使用者使用。請選擇其他密碼。" @@ -544,31 +544,31 @@ msgstr[0] "警告:您的密碼將於 %d 天內過期" msgid "Warning: your password will expire in %d days" msgstr "警告:您的密碼將在 %d 天之後過期。" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "無法變更 NIS 密碼。" -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "您必須選擇更長的密碼" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "正在更改 %s 的 STRESS 密碼。" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "(目前的)UNIX 密碼:" -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "您必須久候,以更改您的密碼" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "輸入新的 UNIX 密碼:" -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "再次輸入新的 UNIX 密碼:" diff --git a/po/zu.po b/po/zu.po index 20424175..da8887ba 100644 --- a/po/zu.po +++ b/po/zu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2015-03-25 16:52+0100\n" +"POT-Creation-Date: 2015-06-22 14:16+0200\n" "PO-Revision-Date: 2011-11-30 11:57+0000\n" "Last-Translator: Tomáš Mráz \n" "Language-Team: LANGUAGE \n" @@ -241,12 +241,12 @@ msgid "contains the user name in some form" msgstr "" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "No password supplied" msgstr "Ayikho iphasiwedi enikeziwe" #: modules/pam_cracklib/pam_cracklib.c:701 -#: modules/pam_unix/pam_unix_passwd.c:494 +#: modules/pam_unix/pam_unix_passwd.c:501 msgid "Password unchanged" msgstr "Iphasiwedi ayishintshwanga" @@ -370,7 +370,7 @@ msgid "Unable to create and initialize directory '%s'." msgstr "" #: modules/pam_pwhistory/pam_pwhistory.c:217 -#: modules/pam_unix/pam_unix_passwd.c:515 +#: modules/pam_unix/pam_unix_passwd.c:522 msgid "Password has been already used. Choose another." msgstr "Le phasiwedi isetshenziswa ngothile. Khetha enye." @@ -550,31 +550,31 @@ msgstr[1] "" msgid "Warning: your password will expire in %d days" msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:396 +#: modules/pam_unix/pam_unix_passwd.c:403 msgid "NIS password could not be changed." msgstr "Iphasiwedi ye-NIS ayivumanga ukushintshwa." -#: modules/pam_unix/pam_unix_passwd.c:511 +#: modules/pam_unix/pam_unix_passwd.c:518 msgid "You must choose a longer password" msgstr "Kumelwe ukhethe iphasiwedi ethe ukuba yinjana" -#: modules/pam_unix/pam_unix_passwd.c:618 +#: modules/pam_unix/pam_unix_passwd.c:625 #, c-format msgid "Changing password for %s." msgstr "" -#: modules/pam_unix/pam_unix_passwd.c:629 +#: modules/pam_unix/pam_unix_passwd.c:636 msgid "(current) UNIX password: " msgstr "Iphasiwedi ye-UNIX (yamanje): " -#: modules/pam_unix/pam_unix_passwd.c:664 +#: modules/pam_unix/pam_unix_passwd.c:671 msgid "You must wait longer to change your password" msgstr "Kumelwe ulinde isikhashana ukuze ushintshe iphasiwedi yakho" -#: modules/pam_unix/pam_unix_passwd.c:724 +#: modules/pam_unix/pam_unix_passwd.c:731 msgid "Enter new UNIX password: " msgstr "Faka iphasiwedi entsha ye-UNIX: " -#: modules/pam_unix/pam_unix_passwd.c:725 +#: modules/pam_unix/pam_unix_passwd.c:732 msgid "Retype new UNIX password: " msgstr "Thayipha iphasiwedi entsha ye-UNIX: " diff --git a/xtests/tst-pam_pwhistory1.sh b/xtests/tst-pam_pwhistory1.sh old mode 100644 new mode 100755 -- cgit v1.2.3 From a684595c0bbd88df71285f43fb27630e3829121e Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Tue, 29 Mar 2016 14:14:03 +0200 Subject: Remove "--enable-static-modules" option and support from Linux-PAM. It was never official supported and was broken since years. * configure.ac: Remove --enable-static-modules option. * doc/man/pam_sm_acct_mgmt.3.xml: Remove PAM_EXTERN. * doc/man/pam_sm_authenticate.3.xml: Likewise. * doc/man/pam_sm_chauthtok.3.xml: Likewise. * doc/man/pam_sm_close_session.3.xml: Likewise. * doc/man/pam_sm_open_session.3.xml: Likewise. * doc/man/pam_sm_setcred.3.xml: Likewise. * libpam/Makefile.am: Remove STATIC_MODULES cases. * libpam/include/security/pam_modules.h: Remove PAM_STATIC parts. * libpam/pam_dynamic.c: Likewise. * libpam/pam_handlers.c: Likewise. * libpam/pam_private.h: Likewise. * libpam/pam_static.c: Remove file. * libpam/pam_static_modules.h: Remove header file. * modules/pam_access/pam_access.c: Remove PAM_EXTERN and PAM_STATIC parts. * modules/pam_cracklib/pam_cracklib.c: Likewise. * modules/pam_debug/pam_debug.c: Likewise. * modules/pam_deny/pam_deny.c: Likewise. * modules/pam_echo/pam_echo.c: Likewise. * modules/pam_env/pam_env.c: Likewise. * modules/pam_exec/pam_exec.c: Likewise. * modules/pam_faildelay/pam_faildelay.c: Likewise. * modules/pam_filter/pam_filter.c: Likewise. * modules/pam_ftp/pam_ftp.c: Likewise. * modules/pam_group/pam_group.c: Likewise. * modules/pam_issue/pam_issue.c: Likewise. * modules/pam_keyinit/pam_keyinit.c: Likewise. * modules/pam_lastlog/pam_lastlog.c: Likewise. * modules/pam_limits/pam_limits.c: Likewise. * modules/pam_listfile/pam_listfile.c: Likewise. * modules/pam_localuser/pam_localuser.c: Likewise. * modules/pam_loginuid/pam_loginuid.c: Likewise. * modules/pam_mail/pam_mail.c: Likewise. * modules/pam_mkhomedir/pam_mkhomedir.c: Likewise. * modules/pam_motd/pam_motd.c: Likewise. * modules/pam_namespace/pam_namespace.c: Likewise. * modules/pam_nologin/pam_nologin.c: Likewise. * modules/pam_permit/pam_permit.c: Likewise. * modules/pam_pwhistory/pam_pwhistory.c: Likewise. * modules/pam_rhosts/pam_rhosts.c: Likewise. * modules/pam_rootok/pam_rootok.c: Likewise. * modules/pam_securetty/pam_securetty.c: Likewise. * modules/pam_selinux/pam_selinux.c: Likewise. * modules/pam_sepermit/pam_sepermit.c: Likewise. * modules/pam_shells/pam_shells.c: Likewise. * modules/pam_stress/pam_stress.c: Likewise. * modules/pam_succeed_if/pam_succeed_if.c: Likewise. * modules/pam_tally/pam_tally.c: Likewise. * modules/pam_tally2/pam_tally2.c: Likewise. * modules/pam_time/pam_time.c: Likewise. * modules/pam_timestamp/pam_timestamp.c: Likewise. * modules/pam_tty_audit/pam_tty_audit.c: Likewise. * modules/pam_umask/pam_umask.c: Likewise. * modules/pam_userdb/pam_userdb.c: Likewise. * modules/pam_warn/pam_warn.c: Likewise. * modules/pam_wheel/pam_wheel.c: Likewise. * modules/pam_xauth/pam_xauth.c: Likewise. * modules/pam_unix/Makefile.am: Remove STATIC_MODULES part. * modules/pam_unix/pam_unix_acct.c: Remove PAM_STATIC part. * modules/pam_unix/pam_unix_auth.c: Likewise. * modules/pam_unix/pam_unix_passwd.c: Likewise. * modules/pam_unix/pam_unix_sess.c: Likewise. * modules/pam_unix/pam_unix_static.c: Removed. * modules/pam_unix/pam_unix_static.h: Removed. * po/POTFILES.in: Remove removed files. * tests/tst-dlopen.c: Remove PAM_STATIC part. --- configure.ac | 19 +--- doc/man/pam_sm_acct_mgmt.3.xml | 2 +- doc/man/pam_sm_authenticate.3.xml | 2 +- doc/man/pam_sm_chauthtok.3.xml | 2 +- doc/man/pam_sm_close_session.3.xml | 2 +- doc/man/pam_sm_open_session.3.xml | 2 +- doc/man/pam_sm_setcred.3.xml | 2 +- libpam/Makefile.am | 9 +- libpam/include/security/pam_modules.h | 78 +++-------------- libpam/pam_dynamic.c | 3 - libpam/pam_handlers.c | 53 +----------- libpam/pam_private.h | 12 --- libpam/pam_static.c | 127 --------------------------- libpam/pam_static_modules.h | 148 -------------------------------- modules/pam_access/pam_access.c | 27 ++---- modules/pam_cracklib/pam_cracklib.c | 17 +--- modules/pam_debug/pam_debug.c | 22 ----- modules/pam_deny/pam_deny.c | 25 ++---- modules/pam_echo/pam_echo.c | 15 ---- modules/pam_env/pam_env.c | 28 ++---- modules/pam_exec/pam_exec.c | 24 ++---- modules/pam_faildelay/pam_faildelay.c | 19 ---- modules/pam_filter/pam_filter.c | 40 +++------ modules/pam_ftp/pam_ftp.c | 21 +---- modules/pam_group/pam_group.c | 19 +--- modules/pam_issue/pam_issue.c | 20 +---- modules/pam_keyinit/pam_keyinit.c | 16 ---- modules/pam_lastlog/pam_lastlog.c | 26 ++---- modules/pam_limits/pam_limits.c | 19 +--- modules/pam_listfile/pam_listfile.c | 30 ++----- modules/pam_localuser/pam_localuser.c | 28 ++---- modules/pam_loginuid/pam_loginuid.c | 19 +--- modules/pam_mail/pam_mail.c | 21 +---- modules/pam_mkhomedir/pam_mkhomedir.c | 18 +--- modules/pam_motd/pam_motd.c | 20 +---- modules/pam_namespace/pam_namespace.c | 19 +--- modules/pam_nologin/pam_nologin.c | 23 +---- modules/pam_permit/pam_permit.c | 28 ++---- modules/pam_pwhistory/pam_pwhistory.c | 15 +--- modules/pam_rhosts/pam_rhosts.c | 19 +--- modules/pam_rootok/pam_rootok.c | 24 +----- modules/pam_securetty/pam_securetty.c | 22 +---- modules/pam_selinux/pam_selinux.c | 8 +- modules/pam_sepermit/pam_sepermit.c | 20 +---- modules/pam_shells/pam_shells.c | 19 ---- modules/pam_stress/pam_stress.c | 22 ----- modules/pam_succeed_if/pam_succeed_if.c | 25 ++---- modules/pam_tally/pam_tally.c | 33 +------ modules/pam_tally2/pam_tally2.c | 33 +------ modules/pam_time/pam_time.c | 17 +--- modules/pam_timestamp/pam_timestamp.c | 23 +---- modules/pam_tty_audit/pam_tty_audit.c | 13 --- modules/pam_umask/pam_umask.c | 20 +---- modules/pam_unix/Makefile.am | 6 +- modules/pam_unix/pam_unix_acct.c | 6 +- modules/pam_unix/pam_unix_auth.c | 6 +- modules/pam_unix/pam_unix_passwd.c | 6 +- modules/pam_unix/pam_unix_sess.c | 6 +- modules/pam_unix/pam_unix_static.c | 23 ----- modules/pam_unix/pam_unix_static.h | 6 -- modules/pam_userdb/pam_userdb.c | 23 +---- modules/pam_warn/pam_warn.c | 25 +----- modules/pam_wheel/pam_wheel.c | 22 +---- modules/pam_xauth/pam_xauth.c | 13 --- po/POTFILES.in | 1 - tests/tst-dlopen.c | 4 - 66 files changed, 152 insertions(+), 1313 deletions(-) delete mode 100644 libpam/pam_static.c delete mode 100644 libpam/pam_static_modules.h delete mode 100644 modules/pam_unix/pam_unix_static.c delete mode 100644 modules/pam_unix/pam_unix_static.h (limited to 'modules/pam_unix/pam_unix_passwd.c') diff --git a/configure.ac b/configure.ac index a20c5022..534194d4 100644 --- a/configure.ac +++ b/configure.ac @@ -61,23 +61,8 @@ dnl This should be called before any macros that run the C compiler. AC_USE_SYSTEM_EXTENSIONS LT_INIT([disable-static]) - -dnl -dnl check if we should link everything static into libpam -dnl -AC_ARG_ENABLE(static-modules,AS_HELP_STRING([--enable-static-modules], - [do not make the modules dynamically loadable]), - STATIC_MODULES=$enableval,STATIC_MODULES=no) -if test "$STATIC_MODULES" != "no" ; then - CFLAGS="$CFLAGS -DPAM_STATIC" - AC_ENABLE_STATIC([yes]) - AC_ENABLE_SHARED([no]) -else -# per default don't build static libraries - AC_ENABLE_STATIC([no]) - AC_ENABLE_SHARED([yes]) -fi -AM_CONDITIONAL([STATIC_MODULES], [test "$STATIC_MODULES" != "no"]) +AC_ENABLE_STATIC([no]) +AC_ENABLE_SHARED([yes]) dnl Checks for programs. AC_PROG_CC diff --git a/doc/man/pam_sm_acct_mgmt.3.xml b/doc/man/pam_sm_acct_mgmt.3.xml index 35aa28a8..ff998676 100644 --- a/doc/man/pam_sm_acct_mgmt.3.xml +++ b/doc/man/pam_sm_acct_mgmt.3.xml @@ -20,7 +20,7 @@ #define PAM_SM_ACCOUNT #include <security/pam_modules.h> - PAM_EXTERN int pam_sm_acct_mgmt + int pam_sm_acct_mgmt pam_handle_t *pamh int flags int argc diff --git a/doc/man/pam_sm_authenticate.3.xml b/doc/man/pam_sm_authenticate.3.xml index 9121aed2..42997265 100644 --- a/doc/man/pam_sm_authenticate.3.xml +++ b/doc/man/pam_sm_authenticate.3.xml @@ -20,7 +20,7 @@ #define PAM_SM_AUTH #include <security/pam_modules.h> - PAM_EXTERN int pam_sm_authenticate + int pam_sm_authenticate pam_handle_t *pamh int flags int argc diff --git a/doc/man/pam_sm_chauthtok.3.xml b/doc/man/pam_sm_chauthtok.3.xml index d6d3093c..d8f36d69 100644 --- a/doc/man/pam_sm_chauthtok.3.xml +++ b/doc/man/pam_sm_chauthtok.3.xml @@ -20,7 +20,7 @@ #define PAM_SM_PASSWORD #include <security/pam_modules.h> - PAM_EXTERN int pam_sm_chauthtok + int pam_sm_chauthtok pam_handle_t *pamh int flags int argc diff --git a/doc/man/pam_sm_close_session.3.xml b/doc/man/pam_sm_close_session.3.xml index f2e67185..db579ffa 100644 --- a/doc/man/pam_sm_close_session.3.xml +++ b/doc/man/pam_sm_close_session.3.xml @@ -20,7 +20,7 @@ #define PAM_SM_SESSION #include <security/pam_modules.h> - PAM_EXTERN int pam_sm_close_session + int pam_sm_close_session pam_handle_t *pamh int flags int argc diff --git a/doc/man/pam_sm_open_session.3.xml b/doc/man/pam_sm_open_session.3.xml index 0851c345..0c9ec77f 100644 --- a/doc/man/pam_sm_open_session.3.xml +++ b/doc/man/pam_sm_open_session.3.xml @@ -20,7 +20,7 @@ #define PAM_SM_SESSION #include <security/pam_modules.h> - PAM_EXTERN int pam_sm_open_session + int pam_sm_open_session pam_handle_t *pamh int flags int argc diff --git a/doc/man/pam_sm_setcred.3.xml b/doc/man/pam_sm_setcred.3.xml index e557000c..5cfe899f 100644 --- a/doc/man/pam_sm_setcred.3.xml +++ b/doc/man/pam_sm_setcred.3.xml @@ -20,7 +20,7 @@ #define PAM_SM_AUTH #include <security/pam_modules.h> - PAM_EXTERN int pam_sm_setcred + int pam_sm_setcred pam_handle_t *pamh int flags int argc diff --git a/libpam/Makefile.am b/libpam/Makefile.am index ac2a1fbf..04a8df0f 100644 --- a/libpam/Makefile.am +++ b/libpam/Makefile.am @@ -18,16 +18,11 @@ include_HEADERS = include/security/_pam_compat.h \ include/security/pam_ext.h include/security/pam_modutil.h noinst_HEADERS = pam_prelude.h pam_private.h pam_tokens.h \ - pam_modutil_private.h pam_static_modules.h + pam_modutil_private.h libpam_la_LDFLAGS = -no-undefined -version-info 84:1:84 libpam_la_LIBADD = @LIBAUDIT@ $(LIBPRELUDE_LIBS) @LIBDL@ -if STATIC_MODULES - libpam_la_LIBADD += $(shell ls ../modules/pam_*/*.lo) \ - @LIBDB@ @LIBCRYPT@ $(NIS_LIBS) @LIBCRACK@ -lutil - AM_CFLAGS += $(NIS_CFLAGS) -endif if HAVE_VERSIONING libpam_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libpam.map endif @@ -38,7 +33,7 @@ libpam_la_SOURCES = pam_account.c pam_auth.c pam_data.c pam_delay.c \ pam_dispatch.c pam_end.c pam_env.c pam_get_authtok.c \ pam_handlers.c pam_item.c \ pam_misc.c pam_password.c pam_prelude.c \ - pam_session.c pam_start.c pam_static.c pam_strerror.c \ + pam_session.c pam_start.c pam_strerror.c \ pam_vprompt.c pam_syslog.c pam_dynamic.c pam_audit.c \ pam_modutil_cleanup.c pam_modutil_getpwnam.c pam_modutil_ioloop.c \ pam_modutil_getgrgid.c pam_modutil_getpwuid.c pam_modutil_getgrnam.c \ diff --git a/libpam/include/security/pam_modules.h b/libpam/include/security/pam_modules.h index 5c516c4e..37568e99 100644 --- a/libpam/include/security/pam_modules.h +++ b/libpam/include/security/pam_modules.h @@ -30,80 +30,26 @@ pam_get_data(const pam_handle_t *pamh, const char *module_data_name, extern int PAM_NONNULL((1,2)) pam_get_user(pam_handle_t *pamh, const char **user, const char *prompt); -#ifdef PAM_STATIC - -#define PAM_EXTERN static - -struct pam_module { - const char *name; /* Name of the module */ - - /* These are function pointers to the module's key functions. */ - - int (*pam_sm_authenticate)(pam_handle_t *pamh, int flags, - int argc, const char **argv); - int (*pam_sm_setcred)(pam_handle_t *pamh, int flags, - int argc, const char **argv); - int (*pam_sm_acct_mgmt)(pam_handle_t *pamh, int flags, - int argc, const char **argv); - int (*pam_sm_open_session)(pam_handle_t *pamh, int flags, - int argc, const char **argv); - int (*pam_sm_close_session)(pam_handle_t *pamh, int flags, - int argc, const char **argv); - int (*pam_sm_chauthtok)(pam_handle_t *pamh, int flags, - int argc, const char **argv); -}; - -#else /* !PAM_STATIC */ - -#define PAM_EXTERN extern - -#endif /* PAM_STATIC */ - -/* Lots of files include pam_modules.h that don't need these - * declared. However, when they are declared static, they - * need to be defined later. So we have to protect C files - * that include these without wanting these functions defined.. */ - -#if (defined(PAM_STATIC) && defined(PAM_SM_AUTH)) || !defined(PAM_STATIC) - /* Authentication API's */ -PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, - int argc, const char **argv); -PAM_EXTERN int pam_sm_setcred(pam_handle_t *pamh, int flags, - int argc, const char **argv); - -#endif /*(defined(PAM_STATIC) && defined(PAM_SM_AUTH)) - || !defined(PAM_STATIC)*/ - -#if (defined(PAM_STATIC) && defined(PAM_SM_ACCOUNT)) || !defined(PAM_STATIC) +int pam_sm_authenticate(pam_handle_t *pamh, int flags, + int argc, const char **argv); +int pam_sm_setcred(pam_handle_t *pamh, int flags, + int argc, const char **argv); /* Account Management API's */ -PAM_EXTERN int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, - int argc, const char **argv); - -#endif /*(defined(PAM_STATIC) && defined(PAM_SM_ACCOUNT)) - || !defined(PAM_STATIC)*/ - -#if (defined(PAM_STATIC) && defined(PAM_SM_SESSION)) || !defined(PAM_STATIC) +int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, + int argc, const char **argv); /* Session Management API's */ -PAM_EXTERN int pam_sm_open_session(pam_handle_t *pamh, int flags, - int argc, const char **argv); - -PAM_EXTERN int pam_sm_close_session(pam_handle_t *pamh, int flags, - int argc, const char **argv); +int pam_sm_open_session(pam_handle_t *pamh, int flags, + int argc, const char **argv); -#endif /*(defined(PAM_STATIC) && defined(PAM_SM_SESSION)) - || !defined(PAM_STATIC)*/ - -#if (defined(PAM_STATIC) && defined(PAM_SM_PASSWORD)) || !defined(PAM_STATIC) +int pam_sm_close_session(pam_handle_t *pamh, int flags, + int argc, const char **argv); /* Password Management API's */ -PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags, - int argc, const char **argv); - -#endif /*(defined(PAM_STATIC) && defined(PAM_SM_PASSWORD)) - || !defined(PAM_STATIC)*/ +int pam_sm_chauthtok(pam_handle_t *pamh, int flags, + int argc, const char **argv); /* The following two flags are for use across the Linux-PAM/module * interface only. The Application is not permitted to use these diff --git a/libpam/pam_dynamic.c b/libpam/pam_dynamic.c index e1155e50..50bfd792 100644 --- a/libpam/pam_dynamic.c +++ b/libpam/pam_dynamic.c @@ -33,8 +33,6 @@ #include "pam_private.h" -#ifndef PAM_STATIC - #ifdef PAM_SHL # include #elif defined(PAM_DYLD) @@ -139,4 +137,3 @@ _pam_dlerror (void) #endif } -#endif diff --git a/libpam/pam_handlers.c b/libpam/pam_handlers.c index bc3fd9d8..91cccadc 100644 --- a/libpam/pam_handlers.c +++ b/libpam/pam_handlers.c @@ -665,9 +665,7 @@ _pam_load_module(pam_handle_t *pamh, const char *mod_path, int handler_type) { int x = 0; int success; -#ifndef PAM_STATIC char *mod_full_isa_path=NULL, *isa=NULL; -#endif struct loaded_module *mod; D(("_pam_load_module: loading module `%s'", mod_path)); @@ -701,27 +699,6 @@ _pam_load_module(pam_handle_t *pamh, const char *mod_path, int handler_type) /* Be pessimistic... */ success = PAM_ABORT; -#ifdef PAM_STATIC - /* Only load static function if function was not found dynamically. - * This code should work even if no dynamic loading is available. */ - if (success != PAM_SUCCESS) { - D(("_pam_load_module: open static handler %s", mod_path)); - mod->dl_handle = _pam_open_static_handler(pamh, mod_path); - if (mod->dl_handle == NULL) { - D(("_pam_load_module: unable to find static handler %s", - mod_path)); - if (handler_type != PAM_HT_SILENT_MODULE) - pam_syslog(pamh, LOG_ERR, - "unable to open static handler %s", mod_path); - /* Didn't find module in dynamic or static..will mark bad */ - } else { - D(("static module added successfully")); - success = PAM_SUCCESS; - mod->type = PAM_MT_STATIC_MOD; - pamh->handlers.modules_used++; - } - } -#else D(("_pam_load_module: _pam_dlopen(%s)", mod_path)); mod->dl_handle = _pam_dlopen(mod_path); D(("_pam_load_module: _pam_dlopen'ed")); @@ -758,7 +735,6 @@ _pam_load_module(pam_handle_t *pamh, const char *mod_path, int handler_type) mod->type = PAM_MT_DYNAMIC_MOD; pamh->handlers.modules_used++; } -#endif if (success != PAM_SUCCESS) { /* add a malformed module */ mod->dl_handle = NULL; @@ -869,16 +845,8 @@ int _pam_add_handler(pam_handle_t *pamh } /* are the modules reliable? */ - if ( -#ifdef PAM_STATIC - mod_type != PAM_MT_STATIC_MOD - && -#else - mod_type != PAM_MT_DYNAMIC_MOD - && -#endif - mod_type != PAM_MT_FAULTY_MOD - ) { + if (mod_type != PAM_MT_DYNAMIC_MOD && + mod_type != PAM_MT_FAULTY_MOD) { D(("_pam_add_handlers: illegal module library type; %d", mod_type)); pam_syslog(pamh, LOG_ERR, "internal error: module library type not known: %s;%d", @@ -888,30 +856,15 @@ int _pam_add_handler(pam_handle_t *pamh /* now identify this module's functions - for non-faulty modules */ -#ifdef PAM_STATIC - if ((mod_type == PAM_MT_STATIC_MOD) && - (func = (servicefn)_pam_get_static_sym(mod->dl_handle, sym)) == NULL) { - pam_syslog(pamh, LOG_ERR, "unable to resolve static symbol: %s", sym); - } -#else if ((mod_type == PAM_MT_DYNAMIC_MOD) && !(func = _pam_dlsym(mod->dl_handle, sym)) ) { pam_syslog(pamh, LOG_ERR, "unable to resolve symbol: %s", sym); } -#endif if (sym2) { -#ifdef PAM_STATIC - if ((mod_type == PAM_MT_STATIC_MOD) && - (func2 = (servicefn)_pam_get_static_sym(mod->dl_handle, sym2)) - == NULL) { - pam_syslog(pamh, LOG_ERR, "unable to resolve symbol: %s", sym2); - } -#else if ((mod_type == PAM_MT_DYNAMIC_MOD) && !(func2 = _pam_dlsym(mod->dl_handle, sym2)) ) { pam_syslog(pamh, LOG_ERR, "unable to resolve symbol: %s", sym2); } -#endif } /* here func (and perhaps func2) point to the appropriate functions */ @@ -994,11 +947,9 @@ int _pam_free_handlers(pam_handle_t *pamh) while (pamh->handlers.modules_used) { D(("_pam_free_handlers: dlclose(%s)", mod->name)); free(mod->name); -#ifndef PAM_STATIC if (mod->type == PAM_MT_DYNAMIC_MOD) { _pam_dlclose(mod->dl_handle); } -#endif mod++; pamh->handlers.modules_used--; } diff --git a/libpam/pam_private.h b/libpam/pam_private.h index 11382774..7ff9f758 100644 --- a/libpam/pam_private.h +++ b/libpam/pam_private.h @@ -241,22 +241,10 @@ void _pam_await_timer(pam_handle_t *pamh, int status); typedef void (*voidfunc(void))(void); typedef int (*servicefn)(pam_handle_t *, int, int, char **); -#ifdef PAM_STATIC -/* The next two in ../modules/_pam_static/pam_static.c */ - -/* Return pointer to data structure used to define a static module */ -struct pam_module * _pam_open_static_handler (pam_handle_t *pamh, - const char *path); - -/* Return pointer to function requested from static module */ - -voidfunc *_pam_get_static_sym(struct pam_module *mod, const char *symname); -#else void *_pam_dlopen (const char *mod_path); servicefn _pam_dlsym (void *handle, const char *symbol); void _pam_dlclose (void *handle); const char *_pam_dlerror (void); -#endif /* For now we just use a stack and linear search for module data. */ /* If it becomes apparent that there is a lot of data, it should */ diff --git a/libpam/pam_static.c b/libpam/pam_static.c deleted file mode 100644 index 511026d4..00000000 --- a/libpam/pam_static.c +++ /dev/null @@ -1,127 +0,0 @@ -/* - * pam_static.c -- static module loading helper functions - * - * created by Michael K. Johnson, johnsonm@redhat.com - */ - -/* This whole file is only used for PAM_STATIC */ - -#ifdef PAM_STATIC - -#include -#include -#include - -#include "pam_private.h" - -#include "pam_static_modules.h" - -/* - * and now for the functions - */ - -/* Return pointer to data structure used to define a static module */ -struct pam_module * -_pam_open_static_handler (pam_handle_t *pamh, const char *path) -{ - int i; - const char *clpath = path; - char *lpath, *end; - - if (strchr(clpath, '/')) { - /* ignore path and leading "/" */ - clpath = strrchr(path, '/') + 1; - } - /* create copy to muck with (must free before return) */ - lpath = _pam_strdup(clpath); - /* chop .so off copy if it exists (or other extension on other - platform...) */ - end = strstr(lpath, ".so"); - if (end) { - *end = '\0'; - } - - /* now go find the module */ - for (i = 0; static_modules[i] != NULL; i++) { - D(("%s=?%s\n", lpath, static_modules[i]->name)); - if (static_modules[i]->name && - ! strcmp(static_modules[i]->name, lpath)) { - break; - } - } - - if (static_modules[i] == NULL) { - pam_syslog (pamh, LOG_ERR, "no static module named %s", lpath); - } - - free(lpath); - return (static_modules[i]); -} - -/* Return pointer to function requested from static module - * Can't just return void *, because ANSI C disallows casting a - * pointer to a function to a void *... - * This definition means: - * _pam_get_static_sym is a function taking two arguments and - * returning a pointer to a function which takes no arguments - * and returns void... */ -voidfunc *_pam_get_static_sym(struct pam_module *mod, const char *symname) { - - if (! strcmp(symname, "pam_sm_authenticate")) { - return ((voidfunc *)mod->pam_sm_authenticate); - } else if (! strcmp(symname, "pam_sm_setcred")) { - return ((voidfunc *)mod->pam_sm_setcred); - } else if (! strcmp(symname, "pam_sm_acct_mgmt")) { - return ((voidfunc *)mod->pam_sm_acct_mgmt); - } else if (! strcmp(symname, "pam_sm_open_session")) { - return ((voidfunc *)mod->pam_sm_open_session); - } else if (! strcmp(symname, "pam_sm_close_session")) { - return ((voidfunc *)mod->pam_sm_close_session); - } else if (! strcmp(symname, "pam_sm_chauthtok")) { - return ((voidfunc *)mod->pam_sm_chauthtok); - } - /* getting to this point is an error */ - return ((voidfunc *)NULL); -} - -#else /* ! PAM_STATIC */ - -typedef int blarg; - -#endif /* ! PAM_STATIC */ - -/* - * Copyright (C) 1995 by Red Hat Software, Michael K. Johnson - * All rights reserved - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, and the entire permission notice in its entirety, - * including the disclaimer of warranties. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior - * written permission. - * - * ALTERNATIVELY, this product may be distributed under the terms of - * the GNU Public License, in which case the provisions of the GPL are - * required INSTEAD OF the above restrictions. (This clause is - * necessary due to a potential bad interaction between the GPL and - * the restrictions contained in a BSD-style copyright.) - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ diff --git a/libpam/pam_static_modules.h b/libpam/pam_static_modules.h deleted file mode 100644 index 698989bd..00000000 --- a/libpam/pam_static_modules.h +++ /dev/null @@ -1,148 +0,0 @@ -/* - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, and the entire permission notice in its entirety, - * including the disclaimer of warranties. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior - * written permission. - * - * ALTERNATIVELY, this product may be distributed under the terms of - * the GNU Public License, in which case the provisions of the GPL are - * required INSTEAD OF the above restrictions. (This clause is - * necessary due to a potential bad interaction between the GPL and - * the restrictions contained in a BSD-style copyright.) - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* Pointers to static module data. */ - -extern struct pam_module _pam_access_modstruct; -extern struct pam_module _pam_cracklib_modstruct; -extern struct pam_module _pam_debug_modstruct; -extern struct pam_module _pam_deny_modstruct; -extern struct pam_module _pam_echo_modstruct; -extern struct pam_module _pam_env_modstruct; -extern struct pam_module _pam_exec_modstruct; -extern struct pam_module _pam_faildelay_modstruct; -extern struct pam_module _pam_filter_modstruct; -extern struct pam_module _pam_ftp_modstruct; -extern struct pam_module _pam_group_modstruct; -extern struct pam_module _pam_issue_modstruct; -#ifdef HAVE_KEY_MANAGEMENT -extern struct pam_module _pam_keyinit_modstruct; -#endif -extern struct pam_module _pam_lastlog_modstruct; -extern struct pam_module _pam_limits_modstruct; -extern struct pam_module _pam_listfile_modstruct; -extern struct pam_module _pam_localuser_modstruct; -extern struct pam_module _pam_loginuid_modstruct; -extern struct pam_module _pam_mail_modstruct; -extern struct pam_module _pam_mkhomedir_modstruct; -extern struct pam_module _pam_motd_modstruct; -#ifdef HAVE_UNSHARE -extern struct pam_module _pam_namespace_modstruct; -#endif -extern struct pam_module _pam_nologin_modstruct; -extern struct pam_module _pam_permit_modstruct; -extern struct pam_module _pam_pwhistory_modstruct; -extern struct pam_module _pam_rhosts_modstruct; -extern struct pam_module _pam_rootok_modstruct; -extern struct pam_module _pam_securetty_modstruct; -#ifdef WITH_SELINUX -extern struct pam_module _pam_selinux_modstruct; -extern struct pam_module _pam_sepermit_modstruct; -#endif -extern struct pam_module _pam_shells_modstruct; -extern struct pam_module _pam_stress_modstruct; -extern struct pam_module _pam_succeed_if_modstruct; -extern struct pam_module _pam_tally_modstruct; -extern struct pam_module _pam_tally2_modstruct; -extern struct pam_module _pam_time_modstruct; -extern struct pam_module _pam_timestamp_modstruct; -#ifdef HAVE_AUDIT_TTY_STATUS -extern struct pam_module _pam_tty_audit_modstruct; -#endif -extern struct pam_module _pam_umask_modstruct; -extern struct pam_module _pam_unix_modstruct; -extern struct pam_module _pam_userdb_modstruct; -extern struct pam_module _pam_warn_modstruct; -extern struct pam_module _pam_wheel_modstruct; -extern struct pam_module _pam_xauth_modstruct; - -/* and here is a structure that connects libpam to the above static - modules. */ - -static struct pam_module *static_modules[] = { - &_pam_access_modstruct, -#ifdef HAVE_LIBCRACK - &_pam_cracklib_modstruct, -#endif - &_pam_debug_modstruct, - &_pam_deny_modstruct, - &_pam_echo_modstruct, - &_pam_env_modstruct, - &_pam_exec_modstruct, - &_pam_faildelay_modstruct, - &_pam_filter_modstruct, - &_pam_ftp_modstruct, - &_pam_group_modstruct, - &_pam_issue_modstruct, -#ifdef HAVE_KEY_MANAGEMENT - &_pam_keyinit_modstruct, -#endif - &_pam_lastlog_modstruct, - &_pam_limits_modstruct, - &_pam_listfile_modstruct, - &_pam_localuser_modstruct, - &_pam_loginuid_modstruct, - &_pam_mail_modstruct, - &_pam_mkhomedir_modstruct, - &_pam_motd_modstruct, -#ifdef HAVE_UNSHARE - &_pam_namespace_modstruct, -#endif - &_pam_nologin_modstruct, - &_pam_permit_modstruct, - &_pam_pwhistory_modstruct, - &_pam_rhosts_modstruct, - &_pam_rootok_modstruct, - &_pam_securetty_modstruct, -#ifdef WITH_SELINUX - &_pam_selinux_modstruct, - &_pam_sepermit_modstruct, -#endif - &_pam_shells_modstruct, - &_pam_stress_modstruct, - &_pam_succeed_if_modstruct, - &_pam_tally_modstruct, - &_pam_tally2_modstruct, - &_pam_time_modstruct, - &_pam_timestamp_modstruct, -#ifdef HAVE_AUDIT_TTY_STATUS - &_pam_tty_audit_modstruct, -#endif - &_pam_umask_modstruct, - &_pam_unix_modstruct, - &_pam_userdb_modstruct, - &_pam_warn_modstruct, - &_pam_wheel_modstruct, - &_pam_xauth_modstruct, - NULL -}; diff --git a/modules/pam_access/pam_access.c b/modules/pam_access/pam_access.c index d4c847a0..3ac1ad00 100644 --- a/modules/pam_access/pam_access.c +++ b/modules/pam_access/pam_access.c @@ -792,7 +792,7 @@ network_netmask_match (pam_handle_t *pamh, /* --- public PAM management functions --- */ -PAM_EXTERN int +int pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -904,35 +904,35 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, } } -PAM_EXTERN int +int pam_sm_setcred (pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { return PAM_IGNORE; } -PAM_EXTERN int +int pam_sm_acct_mgmt (pam_handle_t *pamh, int flags, int argc, const char **argv) { return pam_sm_authenticate (pamh, flags, argc, argv); } -PAM_EXTERN int +int pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) { return pam_sm_authenticate(pamh, flags, argc, argv); } -PAM_EXTERN int +int pam_sm_close_session(pam_handle_t *pamh, int flags, int argc, const char **argv) { return pam_sm_authenticate(pamh, flags, argc, argv); } -PAM_EXTERN int +int pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) { @@ -940,18 +940,3 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, } /* end of module definition */ - -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_access_modstruct = { - "pam_access", - pam_sm_authenticate, - pam_sm_setcred, - pam_sm_acct_mgmt, - pam_sm_open_session, - pam_sm_close_session, - pam_sm_chauthtok -}; -#endif diff --git a/modules/pam_cracklib/pam_cracklib.c b/modules/pam_cracklib/pam_cracklib.c index 5eefd0ba..16549319 100644 --- a/modules/pam_cracklib/pam_cracklib.c +++ b/modules/pam_cracklib/pam_cracklib.c @@ -728,8 +728,8 @@ static int _pam_unix_approve_pass(pam_handle_t *pamh, /* The Main Thing (by Cristian Gafton, CEO at this module :-) * (stolen from http://home.netscape.com) */ -PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags, - int argc, const char **argv) +int +pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) { unsigned int ctrl; struct cracklib_options options; @@ -858,19 +858,6 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags, -#ifdef PAM_STATIC -/* static module data */ -struct pam_module _pam_cracklib_modstruct = { - "pam_cracklib", - NULL, - NULL, - NULL, - NULL, - NULL, - pam_sm_chauthtok -}; -#endif - /* * Copyright (c) Cristian Gafton , 1996. * All rights reserved diff --git a/modules/pam_debug/pam_debug.c b/modules/pam_debug/pam_debug.c index a65d1bf2..9b68d382 100644 --- a/modules/pam_debug/pam_debug.c +++ b/modules/pam_debug/pam_debug.c @@ -75,7 +75,6 @@ static int parse_args(int retval, const char *event, return retval; } -PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -103,7 +102,6 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags UNUSED, return retval; } -PAM_EXTERN int pam_sm_setcred(pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -112,7 +110,6 @@ int pam_sm_setcred(pam_handle_t *pamh, int flags UNUSED, /* --- account management functions --- */ -PAM_EXTERN int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -121,7 +118,6 @@ int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags UNUSED, /* --- password management --- */ -PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -134,14 +130,12 @@ int pam_sm_chauthtok(pam_handle_t *pamh, int flags UNUSED, /* --- session management --- */ -PAM_EXTERN int pam_sm_open_session(pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { return parse_args(PAM_SUCCESS, "open_session", pamh, argc, argv); } -PAM_EXTERN int pam_sm_close_session(pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -149,19 +143,3 @@ int pam_sm_close_session(pam_handle_t *pamh, int flags UNUSED, } /* end of module definition */ - -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_debug_modstruct = { - "pam_debug", - pam_sm_authenticate, - pam_sm_setcred, - pam_sm_acct_mgmt, - pam_sm_open_session, - pam_sm_close_session, - pam_sm_chauthtok -}; - -#endif diff --git a/modules/pam_deny/pam_deny.c b/modules/pam_deny/pam_deny.c index 544c5bdb..155a1f5d 100644 --- a/modules/pam_deny/pam_deny.c +++ b/modules/pam_deny/pam_deny.c @@ -25,14 +25,14 @@ /* --- authentication management functions --- */ -PAM_EXTERN int +int pam_sm_authenticate(pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { return PAM_AUTH_ERR; } -PAM_EXTERN int +int pam_sm_setcred(pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { @@ -41,7 +41,7 @@ pam_sm_setcred(pam_handle_t *pamh UNUSED, int flags UNUSED, /* --- account management functions --- */ -PAM_EXTERN int +int pam_sm_acct_mgmt(pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { @@ -50,7 +50,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh UNUSED, int flags UNUSED, /* --- password management --- */ -PAM_EXTERN int +int pam_sm_chauthtok(pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { @@ -59,14 +59,14 @@ pam_sm_chauthtok(pam_handle_t *pamh UNUSED, int flags UNUSED, /* --- session management --- */ -PAM_EXTERN int +int pam_sm_open_session(pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { return PAM_SESSION_ERR; } -PAM_EXTERN int +int pam_sm_close_session(pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { @@ -74,16 +74,3 @@ pam_sm_close_session(pam_handle_t *pamh UNUSED, int flags UNUSED, } /* end of module definition */ - -/* static module data */ -#ifdef PAM_STATIC -struct pam_module _pam_deny_modstruct = { - "pam_deny", - pam_sm_authenticate, - pam_sm_setcred, - pam_sm_acct_mgmt, - pam_sm_open_session, - pam_sm_close_session, - pam_sm_chauthtok -}; -#endif diff --git a/modules/pam_echo/pam_echo.c b/modules/pam_echo/pam_echo.c index d0879fbf..860ff0af 100644 --- a/modules/pam_echo/pam_echo.c +++ b/modules/pam_echo/pam_echo.c @@ -262,18 +262,3 @@ pam_sm_chauthtok (pam_handle_t *pamh, int flags, int argc, return PAM_IGNORE; } -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_echo_modstruct = { - "pam_echo", - pam_sm_authenticate, - pam_sm_setcred, - pam_sm_acct_mgmt, - pam_sm_open_session, - pam_sm_close_session, - pam_sm_chauthtok, -}; - -#endif diff --git a/modules/pam_env/pam_env.c b/modules/pam_env/pam_env.c index 1bfdf089..0b8002f8 100644 --- a/modules/pam_env/pam_env.c +++ b/modules/pam_env/pam_env.c @@ -768,7 +768,7 @@ static void _clean_var(VAR *var) /* --- authentication management functions (only) --- */ -PAM_EXTERN int +int pam_sm_authenticate (pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { @@ -839,7 +839,7 @@ handle_env (pam_handle_t *pamh, int argc, const char **argv) return retval; } -PAM_EXTERN int +int pam_sm_acct_mgmt (pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { @@ -847,7 +847,7 @@ pam_sm_acct_mgmt (pam_handle_t *pamh UNUSED, int flags UNUSED, return PAM_SERVICE_ERR; } -PAM_EXTERN int +int pam_sm_setcred (pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -855,7 +855,7 @@ pam_sm_setcred (pam_handle_t *pamh, int flags UNUSED, return handle_env (pamh, argc, argv); } -PAM_EXTERN int +int pam_sm_open_session (pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -863,7 +863,7 @@ pam_sm_open_session (pam_handle_t *pamh, int flags UNUSED, return handle_env (pamh, argc, argv); } -PAM_EXTERN int +int pam_sm_close_session (pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { @@ -871,7 +871,7 @@ pam_sm_close_session (pam_handle_t *pamh UNUSED, int flags UNUSED, return PAM_SUCCESS; } -PAM_EXTERN int +int pam_sm_chauthtok (pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { @@ -879,20 +879,4 @@ pam_sm_chauthtok (pam_handle_t *pamh UNUSED, int flags UNUSED, return PAM_SERVICE_ERR; } -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_env_modstruct = { - "pam_env", - pam_sm_authenticate, - pam_sm_setcred, - pam_sm_acct_mgmt, - pam_sm_open_session, - pam_sm_close_session, - pam_sm_chauthtok, -}; - -#endif - /* end of module definition */ diff --git a/modules/pam_exec/pam_exec.c b/modules/pam_exec/pam_exec.c index 17ba6ca2..0ab65489 100644 --- a/modules/pam_exec/pam_exec.c +++ b/modules/pam_exec/pam_exec.c @@ -467,14 +467,14 @@ call_exec (const char *pam_type, pam_handle_t *pamh, return PAM_SYSTEM_ERR; /* will never be reached. */ } -PAM_EXTERN int +int pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { return call_exec ("auth", pamh, argc, argv); } -PAM_EXTERN int +int pam_sm_setcred (pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { @@ -483,7 +483,7 @@ pam_sm_setcred (pam_handle_t *pamh UNUSED, int flags UNUSED, /* password updating functions */ -PAM_EXTERN int +int pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) { @@ -492,35 +492,23 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, return call_exec ("password", pamh, argc, argv); } -PAM_EXTERN int +int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { return call_exec ("account", pamh, argc, argv); } -PAM_EXTERN int +int pam_sm_open_session(pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { return call_exec ("open_session", pamh, argc, argv); } -PAM_EXTERN int +int pam_sm_close_session(pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { return call_exec ("close_session", pamh, argc, argv); } - -#ifdef PAM_STATIC -struct pam_module _pam_exec_modstruct = { - "pam_exec", - pam_sm_authenticate, - pam_sm_setcred, - pam_sm_acct_mgmt, - pam_sm_open_session, - pam_sm_close_session, - pam_sm_chauthtok, -}; -#endif diff --git a/modules/pam_faildelay/pam_faildelay.c b/modules/pam_faildelay/pam_faildelay.c index 072b7dd3..7ea8f837 100644 --- a/modules/pam_faildelay/pam_faildelay.c +++ b/modules/pam_faildelay/pam_faildelay.c @@ -152,7 +152,6 @@ search_key (const char *filename) /* --- authentication management functions (only) --- */ -PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -204,28 +203,10 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags UNUSED, return i; } -PAM_EXTERN int pam_sm_setcred(pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { return PAM_IGNORE; } - -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_faildelay_modstruct = { - "pam_faildelay", - pam_sm_authenticate, - pam_sm_setcred, - NULL, - NULL, - NULL, - NULL, -}; - -#endif - /* end of module definition */ diff --git a/modules/pam_filter/pam_filter.c b/modules/pam_filter/pam_filter.c index 9935d994..6e6a0cf7 100644 --- a/modules/pam_filter/pam_filter.c +++ b/modules/pam_filter/pam_filter.c @@ -663,23 +663,23 @@ static int need_a_filter(pam_handle_t *pamh /* ------------------ authentication ----------------- */ -PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh - , int flags, int argc, const char **argv) +int pam_sm_authenticate(pam_handle_t *pamh, + int flags, int argc, const char **argv) { return need_a_filter(pamh, flags, argc, argv , "authenticate", FILTER_RUN1); } -PAM_EXTERN int pam_sm_setcred(pam_handle_t *pamh, int flags - , int argc, const char **argv) +int pam_sm_setcred(pam_handle_t *pamh, int flags, + int argc, const char **argv) { return need_a_filter(pamh, flags, argc, argv, "setcred", FILTER_RUN2); } /* --------------- account management ---------------- */ -PAM_EXTERN int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc, - const char **argv) +int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc, + const char **argv) { return need_a_filter(pamh, flags, argc, argv , "setcred", FILTER_RUN1|FILTER_RUN2 ); @@ -687,15 +687,15 @@ PAM_EXTERN int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc, /* --------------- session management ---------------- */ -PAM_EXTERN int pam_sm_open_session(pam_handle_t *pamh, int flags - , int argc, const char **argv) +int pam_sm_open_session(pam_handle_t *pamh, int flags, + int argc, const char **argv) { return need_a_filter(pamh, flags, argc, argv , "open_session", FILTER_RUN1); } -PAM_EXTERN int pam_sm_close_session(pam_handle_t *pamh, int flags - , int argc, const char **argv) +int pam_sm_close_session(pam_handle_t *pamh, int flags, + int argc, const char **argv) { return need_a_filter(pamh, flags, argc, argv , "close_session", FILTER_RUN2); @@ -704,8 +704,8 @@ PAM_EXTERN int pam_sm_close_session(pam_handle_t *pamh, int flags /* --------- updating authentication tokens --------- */ -PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags - , int argc, const char **argv) +int pam_sm_chauthtok(pam_handle_t *pamh, int flags, + int argc, const char **argv) { int runN; @@ -720,19 +720,3 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags return need_a_filter(pamh, flags, argc, argv, "chauthtok", runN); } - -#ifdef PAM_STATIC - -/* ------------ stuff for static modules ------------ */ - -struct pam_module _pam_filter_modstruct = { - "pam_filter", - pam_sm_authenticate, - pam_sm_setcred, - pam_sm_acct_mgmt, - pam_sm_open_session, - pam_sm_close_session, - pam_sm_chauthtok, -}; - -#endif diff --git a/modules/pam_ftp/pam_ftp.c b/modules/pam_ftp/pam_ftp.c index 221d8f87..6b6cf2a0 100644 --- a/modules/pam_ftp/pam_ftp.c +++ b/modules/pam_ftp/pam_ftp.c @@ -111,7 +111,7 @@ static int lookup(const char *name, const char *list, const char **_user) /* --- authentication management functions (only) --- */ -PAM_EXTERN int +int pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -210,28 +210,11 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, } } -PAM_EXTERN int +int pam_sm_setcred (pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { return PAM_IGNORE; } - -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_ftp_modstruct = { - "pam_ftp", - pam_sm_authenticate, - pam_sm_setcred, - NULL, - NULL, - NULL, - NULL, -}; - -#endif - /* end of module definition */ diff --git a/modules/pam_group/pam_group.c b/modules/pam_group/pam_group.c index be5f20f3..da8237f1 100644 --- a/modules/pam_group/pam_group.c +++ b/modules/pam_group/pam_group.c @@ -739,14 +739,14 @@ static int check_account(pam_handle_t *pamh, const char *service, /* --- public authentication management functions --- */ -PAM_EXTERN int +int pam_sm_authenticate (pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { return PAM_IGNORE; } -PAM_EXTERN int +int pam_sm_setcred (pam_handle_t *pamh, int flags, int argc UNUSED, const char **argv UNUSED) { @@ -817,18 +817,3 @@ pam_sm_setcred (pam_handle_t *pamh, int flags, } /* end of module definition */ - -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_group_modstruct = { - "pam_group", - pam_sm_authenticate, - pam_sm_setcred, - NULL, - NULL, - NULL, - NULL -}; -#endif diff --git a/modules/pam_issue/pam_issue.c b/modules/pam_issue/pam_issue.c index 060baada..5b5ee416 100644 --- a/modules/pam_issue/pam_issue.c +++ b/modules/pam_issue/pam_issue.c @@ -42,7 +42,7 @@ static int read_issue_quoted(pam_handle_t *pamh, FILE *fp, char **prompt); /* --- authentication management functions (only) --- */ -PAM_EXTERN int +int pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -120,7 +120,7 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, return (retval == PAM_SUCCESS) ? PAM_IGNORE : retval; } -PAM_EXTERN int +int pam_sm_setcred (pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { @@ -291,20 +291,4 @@ read_issue_quoted(pam_handle_t *pamh, FILE *fp, char **prompt) return PAM_SUCCESS; } -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_issue_modstruct = { - "pam_issue", - pam_sm_authenticate, - pam_sm_setcred, - NULL, - NULL, - NULL, - NULL, -}; - -#endif - /* end of module definition */ diff --git a/modules/pam_keyinit/pam_keyinit.c b/modules/pam_keyinit/pam_keyinit.c index f82eead2..5dd7b06b 100644 --- a/modules/pam_keyinit/pam_keyinit.c +++ b/modules/pam_keyinit/pam_keyinit.c @@ -165,7 +165,6 @@ static void kill_keyrings(pam_handle_t *pamh) /* * open a PAM session by making sure there's a session keyring */ -PAM_EXTERN int pam_sm_open_session(pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -238,7 +237,6 @@ int pam_sm_open_session(pam_handle_t *pamh, int flags UNUSED, /* * close a PAM session by revoking the session keyring if requested */ -PAM_EXTERN int pam_sm_close_session(pam_handle_t *pamh, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { @@ -253,17 +251,3 @@ int pam_sm_close_session(pam_handle_t *pamh, int flags UNUSED, return PAM_SUCCESS; } -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_keyinit_modstruct = { - "pam_keyinit", - NULL, - NULL, - NULL, - pam_sm_open_session, - pam_sm_close_session, - NULL -}; -#endif diff --git a/modules/pam_lastlog/pam_lastlog.c b/modules/pam_lastlog/pam_lastlog.c index 76a33e41..1e2f08d2 100644 --- a/modules/pam_lastlog/pam_lastlog.c +++ b/modules/pam_lastlog/pam_lastlog.c @@ -566,7 +566,7 @@ cleanup: } /* --- authentication (locking out inactive users) functions --- */ -PAM_EXTERN int +int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) { @@ -636,14 +636,14 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, return PAM_SUCCESS; } -PAM_EXTERN int +int pam_sm_setcred(pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { return PAM_SUCCESS; } -PAM_EXTERN int +int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc, const char **argv) { @@ -652,7 +652,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, /* --- session management functions --- */ -PAM_EXTERN int +int pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) { @@ -702,7 +702,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags, return retval; } -PAM_EXTERN int +int pam_sm_close_session (pam_handle_t *pamh, int flags, int argc, const char **argv) { @@ -719,20 +719,4 @@ pam_sm_close_session (pam_handle_t *pamh, int flags, return PAM_SUCCESS; } -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_lastlog_modstruct = { - "pam_lastlog", - pam_sm_authenticate, - pam_sm_setcred, - pam_sm_acct_mgmt, - pam_sm_open_session, - pam_sm_close_session, - NULL, -}; - -#endif - /* end of module definition */ diff --git a/modules/pam_limits/pam_limits.c b/modules/pam_limits/pam_limits.c index eabc8567..d63c683e 100644 --- a/modules/pam_limits/pam_limits.c +++ b/modules/pam_limits/pam_limits.c @@ -1002,7 +1002,7 @@ static int setup_limits(pam_handle_t *pamh, } /* now the session stuff */ -PAM_EXTERN int +int pam_sm_open_session (pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -1096,7 +1096,7 @@ out: return PAM_SUCCESS; } -PAM_EXTERN int +int pam_sm_close_session (pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { @@ -1104,21 +1104,6 @@ pam_sm_close_session (pam_handle_t *pamh UNUSED, int flags UNUSED, return PAM_SUCCESS; } -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_limits_modstruct = { - "pam_limits", - NULL, - NULL, - NULL, - pam_sm_open_session, - pam_sm_close_session, - NULL -}; -#endif - /* * Copyright (c) Cristian Gafton, 1996-1997, * All rights reserved. diff --git a/modules/pam_listfile/pam_listfile.c b/modules/pam_listfile/pam_listfile.c index 2af2afd8..c2364065 100644 --- a/modules/pam_listfile/pam_listfile.c +++ b/modules/pam_listfile/pam_listfile.c @@ -53,7 +53,7 @@ #define LESSER(a, b) ((a) < (b) ? (a) : (b)) -PAM_EXTERN int +int pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -370,55 +370,37 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, } } -PAM_EXTERN int +int pam_sm_setcred (pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { return PAM_SUCCESS; } -PAM_EXTERN int +int pam_sm_acct_mgmt (pam_handle_t *pamh, int flags, int argc, const char **argv) { return pam_sm_authenticate(pamh, flags, argc, argv); } -PAM_EXTERN int +int pam_sm_open_session (pam_handle_t *pamh, int flags, int argc, const char **argv) { return pam_sm_authenticate(pamh, flags, argc, argv); } -PAM_EXTERN int +int pam_sm_close_session (pam_handle_t *pamh, int flags, int argc, const char **argv) { return pam_sm_authenticate(pamh, flags, argc, argv); } -PAM_EXTERN int +int pam_sm_chauthtok (pam_handle_t *pamh, int flags, int argc, const char **argv) { return pam_sm_authenticate(pamh, flags, argc, argv); } - -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_listfile_modstruct = { - "pam_listfile", - pam_sm_authenticate, - pam_sm_setcred, - pam_sm_acct_mgmt, - pam_sm_open_session, - pam_sm_close_session, - pam_sm_chauthtok, -}; - -#endif /* PAM_STATIC */ - -/* end of module definition */ diff --git a/modules/pam_localuser/pam_localuser.c b/modules/pam_localuser/pam_localuser.c index aa43bc4c..e32ea6d7 100644 --- a/modules/pam_localuser/pam_localuser.c +++ b/modules/pam_localuser/pam_localuser.c @@ -55,7 +55,7 @@ #define MODULE_NAME "pam_localuser" -PAM_EXTERN int +int pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -123,52 +123,36 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, return ret; } -PAM_EXTERN int +int pam_sm_setcred (pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { return PAM_SUCCESS; } -PAM_EXTERN int +int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc, const char **argv) { return pam_sm_authenticate(pamh, flags, argc, argv); } -PAM_EXTERN int +int pam_sm_open_session (pam_handle_t *pamh, int flags, int argc, const char **argv) { return pam_sm_authenticate(pamh, flags, argc, argv); } -PAM_EXTERN int +int pam_sm_close_session (pam_handle_t *pamh, int flags, int argc, const char **argv) { return pam_sm_authenticate(pamh, flags, argc, argv); } -PAM_EXTERN int +int pam_sm_chauthtok (pam_handle_t *pamh, int flags, int argc, const char **argv) { return pam_sm_authenticate(pamh, flags, argc, argv); } - -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_localuser_modstruct = { - "pam_localuser", - pam_sm_authenticate, - pam_sm_setcred, - pam_sm_acct_mgmt, - pam_sm_open_session, - pam_sm_close_session, - pam_sm_chauthtok -}; - -#endif diff --git a/modules/pam_loginuid/pam_loginuid.c b/modules/pam_loginuid/pam_loginuid.c index 9a1589e5..96bfd98e 100644 --- a/modules/pam_loginuid/pam_loginuid.c +++ b/modules/pam_loginuid/pam_loginuid.c @@ -247,34 +247,21 @@ _pam_loginuid(pam_handle_t *pamh, int flags UNUSED, * * This is here for vsftpd which doesn't seem to run the session stack */ -PAM_EXTERN int +int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc, const char **argv) { return _pam_loginuid(pamh, flags, argc, argv); } -PAM_EXTERN int +int pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) { return _pam_loginuid(pamh, flags, argc, argv); } -PAM_EXTERN int +int pam_sm_close_session(pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { return PAM_SUCCESS; } - -/* static module data */ -#ifdef PAM_STATIC -struct pam_module _pam_loginuid_modstruct = { - "pam_loginuid", - NULL, - NULL, - pam_sm_acct_mgmt, - pam_sm_open_session, - pam_sm_close_session, - NULL -}; -#endif diff --git a/modules/pam_mail/pam_mail.c b/modules/pam_mail/pam_mail.c index f5ba1733..0022f6d6 100644 --- a/modules/pam_mail/pam_mail.c +++ b/modules/pam_mail/pam_mail.c @@ -338,7 +338,7 @@ static int _do_mail(pam_handle_t *, int, int, const char **, int); /* --- authentication functions --- */ -PAM_EXTERN int +int pam_sm_authenticate (pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { @@ -346,7 +346,6 @@ pam_sm_authenticate (pam_handle_t *pamh UNUSED, int flags UNUSED, } /* Checking mail as part of authentication */ -PAM_EXTERN int pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) { @@ -357,7 +356,6 @@ int pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, /* --- session management functions --- */ -PAM_EXTERN int pam_sm_close_session(pam_handle_t *pamh,int flags,int argc ,const char **argv) { @@ -365,7 +363,6 @@ int pam_sm_close_session(pam_handle_t *pamh,int flags,int argc } /* Checking mail as part of the session management */ -PAM_EXTERN int pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) { @@ -475,20 +472,4 @@ static int _do_mail(pam_handle_t *pamh, int flags, int argc, return retval; } -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_mail_modstruct = { - "pam_mail", - pam_sm_authenticate, - pam_sm_setcred, - NULL, - pam_sm_open_session, - pam_sm_close_session, - NULL, -}; - -#endif - /* end of module definition */ diff --git a/modules/pam_mkhomedir/pam_mkhomedir.c b/modules/pam_mkhomedir/pam_mkhomedir.c index c9220897..daed63ae 100644 --- a/modules/pam_mkhomedir/pam_mkhomedir.c +++ b/modules/pam_mkhomedir/pam_mkhomedir.c @@ -183,7 +183,7 @@ create_homedir (pam_handle_t *pamh, options_t *opt, /* --- authentication management functions (only) --- */ -PAM_EXTERN int +int pam_sm_open_session (pam_handle_t *pamh, int flags, int argc, const char **argv) { @@ -227,25 +227,9 @@ pam_sm_open_session (pam_handle_t *pamh, int flags, int argc, } /* Ignore */ -PAM_EXTERN int pam_sm_close_session (pam_handle_t * pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { return PAM_SUCCESS; } -#ifdef PAM_STATIC - -/* static module data */ -struct pam_module _pam_mkhomedir_modstruct = -{ - "pam_mkhomedir", - NULL, - NULL, - NULL, - pam_sm_open_session, - pam_sm_close_session, - NULL, -}; - -#endif diff --git a/modules/pam_motd/pam_motd.c b/modules/pam_motd/pam_motd.c index ff9b1690..11c7b565 100644 --- a/modules/pam_motd/pam_motd.c +++ b/modules/pam_motd/pam_motd.c @@ -39,7 +39,7 @@ /* --- session management functions (only) --- */ -PAM_EXTERN int +int pam_sm_close_session (pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { @@ -48,7 +48,6 @@ pam_sm_close_session (pam_handle_t *pamh UNUSED, int flags UNUSED, static char default_motd[] = DEFAULT_MOTD; -PAM_EXTERN int pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) { @@ -110,21 +109,4 @@ int pam_sm_open_session(pam_handle_t *pamh, int flags, return retval; } - -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_motd_modstruct = { - "pam_motd", - NULL, - NULL, - NULL, - pam_sm_open_session, - pam_sm_close_session, - NULL, -}; - -#endif - /* end of module definition */ diff --git a/modules/pam_namespace/pam_namespace.c b/modules/pam_namespace/pam_namespace.c index 92883f56..d02ea09e 100644 --- a/modules/pam_namespace/pam_namespace.c +++ b/modules/pam_namespace/pam_namespace.c @@ -2008,7 +2008,7 @@ static int get_user_data(struct instance_data *idata) /* * Entry point from pam_open_session call. */ -PAM_EXTERN int pam_sm_open_session(pam_handle_t *pamh, int flags UNUSED, +int pam_sm_open_session(pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { int i, retval; @@ -2104,7 +2104,7 @@ PAM_EXTERN int pam_sm_open_session(pam_handle_t *pamh, int flags UNUSED, /* * Entry point from pam_close_session call. */ -PAM_EXTERN int pam_sm_close_session(pam_handle_t *pamh, int flags UNUSED, +int pam_sm_close_session(pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { int i, retval; @@ -2183,18 +2183,3 @@ PAM_EXTERN int pam_sm_close_session(pam_handle_t *pamh, int flags UNUSED, return PAM_SUCCESS; } - -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_namespace_modstruct = { - "pam_namespace", - NULL, - NULL, - NULL, - pam_sm_open_session, - pam_sm_close_session, - NULL -}; -#endif diff --git a/modules/pam_nologin/pam_nologin.c b/modules/pam_nologin/pam_nologin.c index f047c324..9fd91fdb 100644 --- a/modules/pam_nologin/pam_nologin.c +++ b/modules/pam_nologin/pam_nologin.c @@ -135,7 +135,7 @@ static int perform_check(pam_handle_t *pamh, struct opt_s *opts) /* --- authentication management functions --- */ -PAM_EXTERN int +int pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -146,7 +146,7 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, return perform_check(pamh, &opts); } -PAM_EXTERN int +int pam_sm_setcred (pam_handle_t *pamh UNUSED, int flags UNUSED, int argc, const char **argv) { @@ -159,7 +159,7 @@ pam_sm_setcred (pam_handle_t *pamh UNUSED, int flags UNUSED, /* --- account management function --- */ -PAM_EXTERN int +int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -170,21 +170,4 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags UNUSED, return perform_check(pamh, &opts); } - -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_nologin_modstruct = { - "pam_nologin", - pam_sm_authenticate, - pam_sm_setcred, - pam_sm_acct_mgmt, - NULL, - NULL, - NULL, -}; - -#endif /* PAM_STATIC */ - /* end of module definition */ diff --git a/modules/pam_permit/pam_permit.c b/modules/pam_permit/pam_permit.c index e4539b03..c773087a 100644 --- a/modules/pam_permit/pam_permit.c +++ b/modules/pam_permit/pam_permit.c @@ -30,7 +30,7 @@ /* --- authentication management functions --- */ -PAM_EXTERN int +int pam_sm_authenticate(pam_handle_t *pamh, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { @@ -56,7 +56,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags UNUSED, return PAM_SUCCESS; } -PAM_EXTERN int +int pam_sm_setcred(pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { @@ -65,7 +65,7 @@ pam_sm_setcred(pam_handle_t *pamh UNUSED, int flags UNUSED, /* --- account management functions --- */ -PAM_EXTERN int +int pam_sm_acct_mgmt(pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { @@ -74,7 +74,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh UNUSED, int flags UNUSED, /* --- password management --- */ -PAM_EXTERN int +int pam_sm_chauthtok(pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { @@ -83,14 +83,14 @@ pam_sm_chauthtok(pam_handle_t *pamh UNUSED, int flags UNUSED, /* --- session management --- */ -PAM_EXTERN int +int pam_sm_open_session(pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { return PAM_SUCCESS; } -PAM_EXTERN int +int pam_sm_close_session(pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { @@ -98,19 +98,3 @@ pam_sm_close_session(pam_handle_t *pamh UNUSED, int flags UNUSED, } /* end of module definition */ - -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_permit_modstruct = { - "pam_permit", - pam_sm_authenticate, - pam_sm_setcred, - pam_sm_acct_mgmt, - pam_sm_open_session, - pam_sm_close_session, - pam_sm_chauthtok -}; - -#endif diff --git a/modules/pam_pwhistory/pam_pwhistory.c b/modules/pam_pwhistory/pam_pwhistory.c index 654edd39..0c07dc18 100644 --- a/modules/pam_pwhistory/pam_pwhistory.c +++ b/modules/pam_pwhistory/pam_pwhistory.c @@ -106,7 +106,7 @@ parse_option (pam_handle_t *pamh, const char *argv, options_t *options) /* This module saves the current crypted password in /etc/security/opasswd and then compares the new password with all entries in this file. */ -PAM_EXTERN int +int pam_sm_chauthtok (pam_handle_t *pamh, int flags, int argc, const char **argv) { struct passwd *pwd; @@ -235,16 +235,3 @@ pam_sm_chauthtok (pam_handle_t *pamh, int flags, int argc, const char **argv) return PAM_SUCCESS; } - -#ifdef PAM_STATIC -/* static module data */ -struct pam_module _pam_pwhistory_modstruct = { - "pam_pwhistory", - NULL, - NULL, - NULL, - NULL, - NULL, - pam_sm_chauthtok -}; -#endif diff --git a/modules/pam_rhosts/pam_rhosts.c b/modules/pam_rhosts/pam_rhosts.c index bc9e76f7..d6e70300 100644 --- a/modules/pam_rhosts/pam_rhosts.c +++ b/modules/pam_rhosts/pam_rhosts.c @@ -43,7 +43,6 @@ #include #include -PAM_EXTERN int pam_sm_authenticate (pam_handle_t *pamh, int flags, int argc, const char **argv) { @@ -130,26 +129,10 @@ int pam_sm_authenticate (pam_handle_t *pamh, int flags, int argc, } -PAM_EXTERN int +int pam_sm_setcred (pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { return PAM_SUCCESS; } - -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_rhosts_modstruct = { - "pam_rhosts", - pam_sm_authenticate, - pam_sm_setcred, - NULL, - NULL, - NULL, - NULL, -}; - -#endif diff --git a/modules/pam_rootok/pam_rootok.c b/modules/pam_rootok/pam_rootok.c index 88bed0c9..17baabe4 100644 --- a/modules/pam_rootok/pam_rootok.c +++ b/modules/pam_rootok/pam_rootok.c @@ -135,7 +135,7 @@ check_for_root (pam_handle_t *pamh, int ctrl) /* --- management functions --- */ -PAM_EXTERN int +int pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -146,14 +146,14 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, return check_for_root (pamh, ctrl); } -PAM_EXTERN int +int pam_sm_setcred (pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { return PAM_SUCCESS; } -PAM_EXTERN int +int pam_sm_acct_mgmt (pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -164,7 +164,7 @@ pam_sm_acct_mgmt (pam_handle_t *pamh, int flags UNUSED, return check_for_root (pamh, ctrl); } -PAM_EXTERN int +int pam_sm_chauthtok (pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -175,20 +175,4 @@ pam_sm_chauthtok (pam_handle_t *pamh, int flags UNUSED, return check_for_root (pamh, ctrl); } -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_rootok_modstruct = { - "pam_rootok", - pam_sm_authenticate, - pam_sm_setcred, - pam_sm_acct_mgmt, - NULL, - NULL, - pam_sm_chauthtok, -}; - -#endif - /* end of module definition */ diff --git a/modules/pam_securetty/pam_securetty.c b/modules/pam_securetty/pam_securetty.c index 04741309..e279efac 100644 --- a/modules/pam_securetty/pam_securetty.c +++ b/modules/pam_securetty/pam_securetty.c @@ -235,7 +235,6 @@ securetty_perform_check (pam_handle_t *pamh, int ctrl, /* --- authentication management functions --- */ -PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -247,7 +246,7 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags UNUSED, int argc, return securetty_perform_check(pamh, ctrl, __FUNCTION__); } -PAM_EXTERN int +int pam_sm_setcred (pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { @@ -256,7 +255,7 @@ pam_sm_setcred (pam_handle_t *pamh UNUSED, int flags UNUSED, /* --- account management functions --- */ -PAM_EXTERN int +int pam_sm_acct_mgmt (pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -269,21 +268,4 @@ pam_sm_acct_mgmt (pam_handle_t *pamh, int flags UNUSED, return securetty_perform_check(pamh, ctrl, __FUNCTION__); } - -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_securetty_modstruct = { - "pam_securetty", - pam_sm_authenticate, - pam_sm_setcred, - pam_sm_acct_mgmt, - NULL, - NULL, - NULL, -}; - -#endif /* PAM_STATIC */ - /* end of module definition */ diff --git a/modules/pam_selinux/pam_selinux.c b/modules/pam_selinux/pam_selinux.c index b2a75e02..6daba1ed 100644 --- a/modules/pam_selinux/pam_selinux.c +++ b/modules/pam_selinux/pam_selinux.c @@ -757,7 +757,7 @@ create_context(pam_handle_t *pamh, int argc, const char **argv, return set_context(pamh, data, debug, verbose); } -PAM_EXTERN int +int pam_sm_authenticate(pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { @@ -765,14 +765,14 @@ pam_sm_authenticate(pam_handle_t *pamh UNUSED, int flags UNUSED, return PAM_AUTH_ERR; } -PAM_EXTERN int +int pam_sm_setcred(pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { return PAM_SUCCESS; } -PAM_EXTERN int +int pam_sm_open_session(pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -813,7 +813,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags UNUSED, create_context(pamh, argc, argv, debug, verbose); } -PAM_EXTERN int +int pam_sm_close_session(pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { diff --git a/modules/pam_sepermit/pam_sepermit.c b/modules/pam_sepermit/pam_sepermit.c index 8af1266a..0b90a39c 100644 --- a/modules/pam_sepermit/pam_sepermit.c +++ b/modules/pam_sepermit/pam_sepermit.c @@ -363,7 +363,7 @@ sepermit_match(pam_handle_t *pamh, const char *cfgfile, const char *user, return -1; } -PAM_EXTERN int +int pam_sm_authenticate(pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -430,31 +430,17 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags UNUSED, return rv; } -PAM_EXTERN int +int pam_sm_setcred (pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { return PAM_IGNORE; } -PAM_EXTERN int +int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc, const char **argv) { return pam_sm_authenticate(pamh, flags, argc, argv); } -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_sepermit_modstruct = { - "pam_sepermit", - pam_sm_authenticate, - pam_sm_setcred, - pam_sm_acct_mgmt, - NULL, - NULL, - NULL -}; -#endif diff --git a/modules/pam_shells/pam_shells.c b/modules/pam_shells/pam_shells.c index 68bd6074..c8acb9e2 100644 --- a/modules/pam_shells/pam_shells.c +++ b/modules/pam_shells/pam_shells.c @@ -104,14 +104,12 @@ static int perform_check(pam_handle_t *pamh) /* --- authentication management functions (only) --- */ -PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { return perform_check(pamh); } -PAM_EXTERN int pam_sm_setcred(pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { @@ -120,27 +118,10 @@ int pam_sm_setcred(pam_handle_t *pamh UNUSED, int flags UNUSED, /* --- account management functions (only) --- */ -PAM_EXTERN int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { return perform_check(pamh); } -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_shells_modstruct = { - "pam_shells", - pam_sm_authenticate, - pam_sm_setcred, - pam_sm_acct_mgmt, - NULL, - NULL, - NULL, -}; - -#endif /* PAM_STATIC */ - /* end of module definition */ diff --git a/modules/pam_stress/pam_stress.c b/modules/pam_stress/pam_stress.c index c1695d7f..44c3a304 100644 --- a/modules/pam_stress/pam_stress.c +++ b/modules/pam_stress/pam_stress.c @@ -213,7 +213,6 @@ wipe_up (pam_handle_t *pamh UNUSED, void *data, int error UNUSED) free(data); } -PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) { @@ -281,7 +280,6 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags, return retval; } -PAM_EXTERN int pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) { @@ -299,7 +297,6 @@ int pam_sm_setcred(pam_handle_t *pamh, int flags, /* account management functions */ -PAM_EXTERN int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc, const char **argv) { @@ -334,7 +331,6 @@ int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, return PAM_SUCCESS; } -PAM_EXTERN int pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) { @@ -362,7 +358,6 @@ int pam_sm_open_session(pam_handle_t *pamh, int flags, return PAM_SUCCESS; } -PAM_EXTERN int pam_sm_close_session(pam_handle_t *pamh, int flags, int argc, const char **argv) { @@ -390,7 +385,6 @@ int pam_sm_close_session(pam_handle_t *pamh, int flags, return PAM_SUCCESS; } -PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) { @@ -552,19 +546,3 @@ int pam_sm_chauthtok(pam_handle_t *pamh, int flags, return retval; } - -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_stress_modstruct = { - "pam_stress", - pam_sm_authenticate, - pam_sm_setcred, - pam_sm_acct_mgmt, - pam_sm_open_session, - pam_sm_close_session, - pam_sm_chauthtok -}; - -#endif diff --git a/modules/pam_succeed_if/pam_succeed_if.c b/modules/pam_succeed_if/pam_succeed_if.c index aa828fcc..c39b1cb1 100644 --- a/modules/pam_succeed_if/pam_succeed_if.c +++ b/modules/pam_succeed_if/pam_succeed_if.c @@ -400,7 +400,7 @@ evaluate(pam_handle_t *pamh, int debug, return PAM_SERVICE_ERR; } -PAM_EXTERN int +int pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -544,46 +544,33 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, return ret; } -PAM_EXTERN int +int pam_sm_setcred(pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { return PAM_IGNORE; } -PAM_EXTERN int +int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc, const char **argv) { return pam_sm_authenticate(pamh, flags, argc, argv); } -PAM_EXTERN int +int pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv) { return pam_sm_authenticate(pamh, flags, argc, argv); } -PAM_EXTERN int +int pam_sm_close_session(pam_handle_t *pamh, int flags, int argc, const char **argv) { return pam_sm_authenticate(pamh, flags, argc, argv); } -PAM_EXTERN int +int pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) { return pam_sm_authenticate(pamh, flags, argc, argv); } - -/* static module data */ -#ifdef PAM_STATIC -struct pam_module _pam_succeed_if_modstruct = { - "pam_succeed_if", - pam_sm_authenticate, - pam_sm_setcred, - pam_sm_acct_mgmt, - pam_sm_open_session, - pam_sm_close_session, - pam_sm_chauthtok -}; -#endif diff --git a/modules/pam_tally/pam_tally.c b/modules/pam_tally/pam_tally.c index c7128857..66a515c2 100644 --- a/modules/pam_tally/pam_tally.c +++ b/modules/pam_tally/pam_tally.c @@ -615,7 +615,7 @@ tally_reset (pam_handle_t *pamh, uid_t uid, struct tally_options *opts) #ifdef PAM_SM_AUTH -PAM_EXTERN int +int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) { @@ -649,7 +649,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, return rvcheck != PAM_SUCCESS ? rvcheck : rvbump; } -PAM_EXTERN int +int pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) { @@ -694,7 +694,7 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, /* To reset failcount of user on successfull login */ -PAM_EXTERN int +int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc, const char **argv) { @@ -733,33 +733,6 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, /*-----------------------------------------------------------------------*/ -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_tally_modstruct = { - MODULE_NAME, -#ifdef PAM_SM_AUTH - pam_sm_authenticate, - pam_sm_setcred, -#else - NULL, - NULL, -#endif -#ifdef PAM_SM_ACCOUNT - pam_sm_acct_mgmt, -#else - NULL, -#endif - NULL, - NULL, - NULL, -}; - -#endif /* #ifdef PAM_STATIC */ - -/*-----------------------------------------------------------------------*/ - #else /* #ifndef MAIN */ static const char *cline_filename = DEFAULT_LOGFILE; diff --git a/modules/pam_tally2/pam_tally2.c b/modules/pam_tally2/pam_tally2.c index 9187cbfd..9f3bebeb 100644 --- a/modules/pam_tally2/pam_tally2.c +++ b/modules/pam_tally2/pam_tally2.c @@ -737,7 +737,7 @@ tally_reset (pam_handle_t *pamh, uid_t uid, struct tally_options *opts, int old_ /* --- authentication management functions (only) --- */ -PAM_EXTERN int +int pam_sm_authenticate(pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -770,7 +770,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags UNUSED, return rv; } -PAM_EXTERN int +int pam_sm_setcred(pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -810,7 +810,7 @@ pam_sm_setcred(pam_handle_t *pamh, int flags UNUSED, /* To reset failcount of user on successfull login */ -PAM_EXTERN int +int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -846,33 +846,6 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags UNUSED, /*-----------------------------------------------------------------------*/ -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_tally2_modstruct = { - MODULE_NAME, -#ifdef PAM_SM_AUTH - pam_sm_authenticate, - pam_sm_setcred, -#else - NULL, - NULL, -#endif -#ifdef PAM_SM_ACCOUNT - pam_sm_acct_mgmt, -#else - NULL, -#endif - NULL, - NULL, - NULL, -}; - -#endif /* #ifdef PAM_STATIC */ - -/*-----------------------------------------------------------------------*/ - #else /* #ifndef MAIN */ static const char *cline_filename = DEFAULT_LOGFILE; diff --git a/modules/pam_time/pam_time.c b/modules/pam_time/pam_time.c index c94737ca..75d08645 100644 --- a/modules/pam_time/pam_time.c +++ b/modules/pam_time/pam_time.c @@ -588,7 +588,7 @@ check_account(pam_handle_t *pamh, const char *service, /* --- public account management functions --- */ -PAM_EXTERN int +int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -663,18 +663,3 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags UNUSED, } /* end of module definition */ - -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_time_modstruct = { - "pam_time", - NULL, - NULL, - pam_sm_acct_mgmt, - NULL, - NULL, - NULL -}; -#endif diff --git a/modules/pam_timestamp/pam_timestamp.c b/modules/pam_timestamp/pam_timestamp.c index 1bf0e84b..b18efdfd 100644 --- a/modules/pam_timestamp/pam_timestamp.c +++ b/modules/pam_timestamp/pam_timestamp.c @@ -357,7 +357,7 @@ verbose_success(pam_handle_t *pamh, long diff) pam_info(pamh, _("Access granted (last access was %ld seconds ago)."), diff); } -PAM_EXTERN int +int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) { struct stat st; @@ -547,13 +547,13 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) return PAM_AUTH_ERR; } -PAM_EXTERN int +int pam_sm_setcred(pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { return PAM_SUCCESS; } -PAM_EXTERN int +int pam_sm_open_session(pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { char path[BUFLEN], subdir[BUFLEN], *text, *p; @@ -670,27 +670,12 @@ pam_sm_open_session(pam_handle_t *pamh, int flags UNUSED, int argc, const char * return PAM_SUCCESS; } -PAM_EXTERN int +int pam_sm_close_session(pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { return PAM_SUCCESS; } -#ifdef PAM_STATIC -/* static module data */ - -struct pam_module _pam_timestamp_modstruct = { - "pam_timestamp", - pam_sm_authenticate, - pam_sm_setcred, - NULL, - pam_sm_open_session, - pam_sm_close_session, - NULL -}; -#endif - - #else /* PAM_TIMESTAMP_MAIN */ #define USAGE "Usage: %s [[-k] | [-d]] [target user]\n" diff --git a/modules/pam_tty_audit/pam_tty_audit.c b/modules/pam_tty_audit/pam_tty_audit.c index 6003f4e6..bce3ab77 100644 --- a/modules/pam_tty_audit/pam_tty_audit.c +++ b/modules/pam_tty_audit/pam_tty_audit.c @@ -360,16 +360,3 @@ pam_sm_close_session (pam_handle_t *pamh, int flags, int argc, } return PAM_SUCCESS; } - -/* static module data */ -#ifdef PAM_STATIC -struct pam_module _pam_tty_audit_modstruct = { - "pam_tty_audit", - NULL, - NULL, - NULL, - pam_sm_open_session, - pam_sm_close_session, - NULL -}; -#endif diff --git a/modules/pam_umask/pam_umask.c b/modules/pam_umask/pam_umask.c index 863f0387..ab490645 100644 --- a/modules/pam_umask/pam_umask.c +++ b/modules/pam_umask/pam_umask.c @@ -249,7 +249,7 @@ setup_limits_from_gecos (pam_handle_t *pamh, options_t *options, } -PAM_EXTERN int +int pam_sm_open_session (pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -297,27 +297,11 @@ pam_sm_open_session (pam_handle_t *pamh, int flags UNUSED, return retval; } -PAM_EXTERN int +int pam_sm_close_session (pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { return PAM_SUCCESS; } -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_umask_modstruct = { - "pam_umask", - NULL, - NULL, - NULL, - pam_sm_open_session, - pam_sm_close_session, - NULL -}; - -#endif - /* end of module definition */ diff --git a/modules/pam_unix/Makefile.am b/modules/pam_unix/Makefile.am index 88e6125d..56df1782 100644 --- a/modules/pam_unix/Makefile.am +++ b/modules/pam_unix/Makefile.am @@ -34,8 +34,7 @@ pam_unix_la_LIBADD = $(top_builddir)/libpam/libpam.la \ securelib_LTLIBRARIES = pam_unix.la -noinst_HEADERS = md5.h support.h yppasswd.h bigcrypt.h passverify.h \ - pam_unix_static.h +noinst_HEADERS = md5.h support.h yppasswd.h bigcrypt.h passverify.h sbin_PROGRAMS = unix_chkpwd unix_update @@ -44,9 +43,6 @@ noinst_PROGRAMS = bigcrypt pam_unix_la_SOURCES = bigcrypt.c pam_unix_acct.c \ pam_unix_auth.c pam_unix_passwd.c pam_unix_sess.c support.c \ passverify.c yppasswd_xdr.c md5_good.c md5_broken.c -if STATIC_MODULES -pam_unix_la_SOURCES += pam_unix_static.c -endif bigcrypt_SOURCES = bigcrypt.c bigcrypt_main.c bigcrypt_CFLAGS = $(AM_CFLAGS) diff --git a/modules/pam_unix/pam_unix_acct.c b/modules/pam_unix/pam_unix_acct.c index f8b39c91..17a0890f 100644 --- a/modules/pam_unix/pam_unix_acct.c +++ b/modules/pam_unix/pam_unix_acct.c @@ -53,11 +53,7 @@ /* indicate that the following groups are defined */ -#ifdef PAM_STATIC -# include "pam_unix_static.h" -#else -# define PAM_SM_ACCOUNT -#endif +#define PAM_SM_ACCOUNT #include #include diff --git a/modules/pam_unix/pam_unix_auth.c b/modules/pam_unix/pam_unix_auth.c index 9a547b3a..9f66c5d6 100644 --- a/modules/pam_unix/pam_unix_auth.c +++ b/modules/pam_unix/pam_unix_auth.c @@ -50,11 +50,7 @@ /* indicate the following groups are defined */ -#ifdef PAM_STATIC -# include "pam_unix_static.h" -#else -# define PAM_SM_AUTH -#endif +#define PAM_SM_AUTH #define _PAM_EXTERN_FUNCTIONS #include diff --git a/modules/pam_unix/pam_unix_passwd.c b/modules/pam_unix/pam_unix_passwd.c index c2e5de5e..e3d32096 100644 --- a/modules/pam_unix/pam_unix_passwd.c +++ b/modules/pam_unix/pam_unix_passwd.c @@ -64,11 +64,7 @@ /* indicate the following groups are defined */ -#ifdef PAM_STATIC -# include "pam_unix_static.h" -#else -# define PAM_SM_PASSWORD -#endif +#define PAM_SM_PASSWORD #include #include diff --git a/modules/pam_unix/pam_unix_sess.c b/modules/pam_unix/pam_unix_sess.c index 5d001816..dbc62983 100644 --- a/modules/pam_unix/pam_unix_sess.c +++ b/modules/pam_unix/pam_unix_sess.c @@ -49,11 +49,7 @@ /* indicate the following groups are defined */ -#ifdef PAM_STATIC -# include "pam_unix_static.h" -#else -# define PAM_SM_SESSION -#endif +#define PAM_SM_SESSION #include #include diff --git a/modules/pam_unix/pam_unix_static.c b/modules/pam_unix/pam_unix_static.c deleted file mode 100644 index 160268c9..00000000 --- a/modules/pam_unix/pam_unix_static.c +++ /dev/null @@ -1,23 +0,0 @@ -#include "config.h" - -#ifdef PAM_STATIC - -#define static extern -#define PAM_SM_ACCOUNT -#define PAM_SM_AUTH -#define PAM_SM_PASSWORD -#define PAM_SM_SESSION -#include "pam_unix_static.h" -#include - -struct pam_module _pam_unix_modstruct = { - "pam_unix", - pam_sm_authenticate, - pam_sm_setcred, - pam_sm_acct_mgmt, - pam_sm_open_session, - pam_sm_close_session, - pam_sm_chauthtok, -}; - -#endif diff --git a/modules/pam_unix/pam_unix_static.h b/modules/pam_unix/pam_unix_static.h deleted file mode 100644 index 39b05efe..00000000 --- a/modules/pam_unix/pam_unix_static.h +++ /dev/null @@ -1,6 +0,0 @@ -#define pam_sm_acct_mgmt _pam_unix_sm_acct_mgmt -#define pam_sm_authenticate _pam_unix_sm_authenticate -#define pam_sm_setcred _pam_unix_sm_setcred -#define pam_sm_chauthtok _pam_unix_sm_chauthtok -#define pam_sm_open_session _pam_unix_sm_open_session -#define pam_sm_close_session _pam_unix_sm_close_session diff --git a/modules/pam_userdb/pam_userdb.c b/modules/pam_userdb/pam_userdb.c index 8df1a40c..09ab8d33 100644 --- a/modules/pam_userdb/pam_userdb.c +++ b/modules/pam_userdb/pam_userdb.c @@ -334,7 +334,7 @@ user_lookup (pam_handle_t *pamh, const char *database, const char *cryptmode, /* --- authentication management functions (only) --- */ -PAM_EXTERN int +int pam_sm_authenticate(pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -423,14 +423,14 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags UNUSED, return PAM_IGNORE; } -PAM_EXTERN int +int pam_sm_setcred(pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { return PAM_SUCCESS; } -PAM_EXTERN int +int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -475,23 +475,6 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags UNUSED, return PAM_SUCCESS; } - -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_userdb_modstruct = { - "pam_userdb", - pam_sm_authenticate, - pam_sm_setcred, - pam_sm_acct_mgmt, - NULL, - NULL, - NULL, -}; - -#endif - /* * Copyright (c) Cristian Gafton , 1999 * All rights reserved diff --git a/modules/pam_warn/pam_warn.c b/modules/pam_warn/pam_warn.c index a26c48d7..1d196ad3 100644 --- a/modules/pam_warn/pam_warn.c +++ b/modules/pam_warn/pam_warn.c @@ -54,7 +54,6 @@ static void log_items(pam_handle_t *pamh, const char *function, int flags) /* --- authentication management functions (only) --- */ -PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc UNUSED, const char **argv UNUSED) { @@ -62,7 +61,6 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags, return PAM_IGNORE; } -PAM_EXTERN int pam_sm_setcred(pam_handle_t *pamh, int flags, int argc UNUSED, const char **argv UNUSED) { @@ -72,7 +70,6 @@ int pam_sm_setcred(pam_handle_t *pamh, int flags, /* password updating functions */ -PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc UNUSED, const char **argv UNUSED) { @@ -80,7 +77,7 @@ int pam_sm_chauthtok(pam_handle_t *pamh, int flags, return PAM_IGNORE; } -PAM_EXTERN int +int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc UNUSED, const char **argv UNUSED) { @@ -88,7 +85,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, return PAM_IGNORE; } -PAM_EXTERN int +int pam_sm_open_session(pam_handle_t *pamh, int flags, int argc UNUSED, const char **argv UNUSED) { @@ -96,7 +93,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags, return PAM_IGNORE; } -PAM_EXTERN int +int pam_sm_close_session(pam_handle_t *pamh, int flags, int argc UNUSED, const char **argv UNUSED) { @@ -104,20 +101,4 @@ pam_sm_close_session(pam_handle_t *pamh, int flags, return PAM_IGNORE; } -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_warn_modstruct = { - "pam_warn", - pam_sm_authenticate, - pam_sm_setcred, - pam_sm_acct_mgmt, - pam_sm_open_session, - pam_sm_close_session, - pam_sm_chauthtok, -}; - -#endif - /* end of module definition */ diff --git a/modules/pam_wheel/pam_wheel.c b/modules/pam_wheel/pam_wheel.c index d7d8096e..6ea7b847 100644 --- a/modules/pam_wheel/pam_wheel.c +++ b/modules/pam_wheel/pam_wheel.c @@ -232,7 +232,7 @@ perform_check (pam_handle_t *pamh, int ctrl, const char *use_group) /* --- authentication management functions --- */ -PAM_EXTERN int +int pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -244,14 +244,14 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, return perform_check(pamh, ctrl, use_group); } -PAM_EXTERN int +int pam_sm_setcred (pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { return PAM_SUCCESS; } -PAM_EXTERN int +int pam_sm_acct_mgmt (pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -263,22 +263,6 @@ pam_sm_acct_mgmt (pam_handle_t *pamh, int flags UNUSED, return perform_check(pamh, ctrl, use_group); } -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_wheel_modstruct = { - "pam_wheel", - pam_sm_authenticate, - pam_sm_setcred, - pam_sm_acct_mgmt, - NULL, - NULL, - NULL -}; - -#endif /* PAM_STATIC */ - /* * Copyright (c) Cristian Gafton , 1996, 1997 * All rights reserved diff --git a/modules/pam_xauth/pam_xauth.c b/modules/pam_xauth/pam_xauth.c index 2be43513..6778aa84 100644 --- a/modules/pam_xauth/pam_xauth.c +++ b/modules/pam_xauth/pam_xauth.c @@ -798,16 +798,3 @@ pam_sm_close_session (pam_handle_t *pamh, int flags UNUSED, return PAM_SUCCESS; } - -/* static module data */ -#ifdef PAM_STATIC -struct pam_module _pam_xauth_modstruct = { - "pam_xauth", - NULL, - NULL, - NULL, - pam_sm_open_session, - pam_sm_close_session, - NULL -}; -#endif diff --git a/po/POTFILES.in b/po/POTFILES.in index 76d9640c..fcec3d83 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -29,7 +29,6 @@ ./libpam/pam_prelude.c ./libpam/pam_session.c ./libpam/pam_start.c -./libpam/pam_static.c ./libpam/pam_strerror.c ./libpam/pam_syslog.c ./libpam/pam_vprompt.c diff --git a/tests/tst-dlopen.c b/tests/tst-dlopen.c index 3000055c..70927163 100644 --- a/tests/tst-dlopen.c +++ b/tests/tst-dlopen.c @@ -19,9 +19,6 @@ /* Simple program to see if dlopen() would succeed. */ int main(int argc, char **argv) { -#ifdef PAM_STATIC - return 77; -#else int i; struct stat st; char buf[PATH_MAX]; @@ -43,5 +40,4 @@ int main(int argc, char **argv) } } return 0; -#endif } -- cgit v1.2.3 From 549aef483c9f1852e1fbefabc4ebbbe72e00c243 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Fri, 1 Apr 2016 15:28:09 +0200 Subject: Use TI-RPC functions if we compile and link against libtirpc. The old SunRPC functions don't work with IPv6. * configure.ac: Set and restore CPPFLAGS * modules/pam_unix/pam_unix_passwd.c: Replace getrpcport with rpcb_getaddr if available. --- configure.ac | 4 +++ modules/pam_unix/pam_unix_passwd.c | 73 +++++++++++++++++++++++++++++++++++++- 2 files changed, 76 insertions(+), 1 deletion(-) (limited to 'modules/pam_unix/pam_unix_passwd.c') diff --git a/configure.ac b/configure.ac index 534194d4..20f6ba35 100644 --- a/configure.ac +++ b/configure.ac @@ -451,18 +451,21 @@ AC_ARG_ENABLE([nis], AS_IF([test "x$enable_nis" != "xno"], [ old_CFLAGS=$CFLAGS + old_CPPFLAGS=$CPPFLAGS old_LIBS=$LIBS dnl if there's libtirpc available, prefer that over the system dnl implementation. PKG_CHECK_MODULES([TIRPC], [libtirpc], [ CFLAGS="$CFLAGS $TIRPC_CFLAGS" + CPPFLAGS="$CPPFLAGS $TIRPC_CFLAGS" LIBS="$LIBS $TIRPC_LIBS" ], [:;]) PKG_CHECK_MODULES([NSL], [libnsl], [], [AC_CHECK_LIB([nsl],[yp_match],[NSL_LIBS="-lnsl"],[NSL_LIBS=""])]) CFLAGS="$CFLAGS $NSL_CFLAGS" + CPPFLAGS="$CPPFLAGS $NSL_CFLAGS" LIBS="$LIBS $NSL_LIBS" AC_CHECK_FUNCS([yp_get_default_domain yperr_string yp_master yp_bind yp_match yp_unbind]) @@ -475,6 +478,7 @@ AS_IF([test "x$enable_nis" != "xno"], [ ]) CFLAGS="$old_CFLAGS" + CPPFLAGS="$old_CPPFLAGS" LIBS="$old_LIBS" ]) diff --git a/modules/pam_unix/pam_unix_passwd.c b/modules/pam_unix/pam_unix_passwd.c index e3d32096..fa293278 100644 --- a/modules/pam_unix/pam_unix_passwd.c +++ b/modules/pam_unix/pam_unix_passwd.c @@ -92,7 +92,7 @@ # include "yppasswd.h" -# if !HAVE_DECL_GETRPCPORT +# if !HAVE_DECL_GETRPCPORT &&!HAVE_RPCB_GETADDR extern int getrpcport(const char *host, unsigned long prognum, unsigned long versnum, unsigned int proto); # endif /* GNU libc 2.1 */ @@ -114,11 +114,48 @@ extern int getrpcport(const char *host, unsigned long prognum, #define MAX_PASSWD_TRIES 3 #ifdef HAVE_NIS +#ifdef HAVE_RPCB_GETADDR +static unsigned short +__taddr2port (const struct netconfig *nconf, const struct netbuf *nbuf) +{ + unsigned short port = 0; + struct __rpc_sockinfo si; + struct sockaddr_in *sin; + struct sockaddr_in6 *sin6; + if (!__rpc_nconf2sockinfo(nconf, &si)) + return 0; + + switch (si.si_af) + { + case AF_INET: + sin = nbuf->buf; + port = sin->sin_port; + break; + case AF_INET6: + sin6 = nbuf->buf; + port = sin6->sin6_port; + break; + default: + break; + } + + return htons (port); +} +#endif + static char *getNISserver(pam_handle_t *pamh, unsigned int ctrl) { char *master; char *domainname; int port, err; +#if defined(HAVE_RPCB_GETADDR) + struct netconfig *nconf; + struct netbuf svcaddr; + char addrbuf[INET6_ADDRSTRLEN]; + void *handle; + int found; +#endif + #ifdef HAVE_YP_GET_DEFAULT_DOMAIN if ((err = yp_get_default_domain(&domainname)) != 0) { @@ -146,7 +183,41 @@ static char *getNISserver(pam_handle_t *pamh, unsigned int ctrl) yperr_string(err)); return NULL; } +#ifdef HAVE_RPCB_GETADDR + svcaddr.len = 0; + svcaddr.maxlen = sizeof (addrbuf); + svcaddr.buf = addrbuf; + port = 0; + found = 0; + + handle = setnetconfig(); + while ((nconf = getnetconfig(handle)) != NULL) { + if (!strcmp(nconf->nc_proto, "udp")) { + if (rpcb_getaddr(YPPASSWDPROG, YPPASSWDPROC_UPDATE, + nconf, &svcaddr, master)) { + port = __taddr2port (nconf, &svcaddr); + endnetconfig (handle); + found=1; + break; + } + + if (rpc_createerr.cf_stat != RPC_UNKNOWNHOST) { + clnt_pcreateerror (master); + pam_syslog (pamh, LOG_ERR, + "rpcb_getaddr (%s) failed!", master); + return NULL; + } + } + } + + if (!found) { + pam_syslog (pamh, LOG_ERR, + "Cannot find suitable transport for protocol 'udp'"); + return NULL; + } +#else port = getrpcport(master, YPPASSWDPROG, YPPASSWDPROC_UPDATE, IPPROTO_UDP); +#endif if (port == 0) { pam_syslog(pamh, LOG_WARNING, "yppasswdd not running on NIS master host"); -- cgit v1.2.3 From 7e09188c5dc4d0372ac7016f682cf63c686afe4a Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Wed, 6 Apr 2016 14:27:07 +0200 Subject: pam_unix: Use pam_get_authtok() instead of direct pam_prompt() calls. We have to drop support for not_set_pass option which is not much useful anyway. Instead we get proper support for authtok_type option. * modules/pam_unix/pam_unix.8.xml: Removed not_set_pass option, added authtok_ty pe option. * modules/pam_unix/pam_unix_auth.c (pam_sm_authenticate): Replace _unix_read_pas sword() call with equivalent pam_get_authtok() call. * modules/pam_unix/pam_unix_passwd.c (pam_sm_chauthtok): Likewise and also drop support for not_set_pass. * modules/pam_unix/support.c (_unix_read_password): Remove. * modules/pam_unix/support.h: Remove UNIX_NOT_SET_PASS add UNIX_AUTHTOK_TYPE. --- modules/pam_unix/pam_unix.8.xml | 8 +- modules/pam_unix/pam_unix_auth.c | 5 +- modules/pam_unix/pam_unix_passwd.c | 58 ++++---------- modules/pam_unix/support.c | 154 ------------------------------------- modules/pam_unix/support.h | 6 +- 5 files changed, 23 insertions(+), 208 deletions(-) (limited to 'modules/pam_unix/pam_unix_passwd.c') diff --git a/modules/pam_unix/pam_unix.8.xml b/modules/pam_unix/pam_unix.8.xml index 6d8e4ba0..60d90979 100644 --- a/modules/pam_unix/pam_unix.8.xml +++ b/modules/pam_unix/pam_unix.8.xml @@ -217,13 +217,13 @@ - + - This argument is used to inform the module that it is not to - pay attention to/make available the old or new passwords from/to - other (stacked) password modules. + This argument can be used to modify the password prompt + when changing passwords to include the type of the password. + Empty by default. diff --git a/modules/pam_unix/pam_unix_auth.c b/modules/pam_unix/pam_unix_auth.c index 9f66c5d6..673861e4 100644 --- a/modules/pam_unix/pam_unix_auth.c +++ b/modules/pam_unix/pam_unix_auth.c @@ -103,7 +103,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) unsigned int ctrl; int retval, *ret_data = NULL; const char *name; - const void *p; + const char *p; D(("called.")); @@ -151,8 +151,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) } /* get this user's authentication token */ - retval = _unix_read_password(pamh, ctrl, NULL, _("Password: "), NULL - ,_UNIX_AUTHTOK, &p); + retval = pam_get_authtok(pamh, PAM_AUTHTOK, &p , NULL); if (retval != PAM_SUCCESS) { if (retval != PAM_CONV_AGAIN) { pam_syslog(pamh, LOG_CRIT, diff --git a/modules/pam_unix/pam_unix_passwd.c b/modules/pam_unix/pam_unix_passwd.c index fa293278..c2e43423 100644 --- a/modules/pam_unix/pam_unix_passwd.c +++ b/modules/pam_unix/pam_unix_passwd.c @@ -612,7 +612,8 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) /* */ const char *user; - const void *pass_old, *pass_new; + const void *item; + const char *pass_old, *pass_new; /* */ D(("called.")); @@ -680,8 +681,6 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) * obtain and verify the current password (OLDAUTHTOK) for * the user. */ - char *Announce; - D(("prelim check")); if (_unix_blankpasswd(pamh, ctrl, user)) { @@ -689,22 +688,12 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) } else if (off(UNIX__IAMROOT, ctrl) || (on(UNIX_NIS, ctrl) && _unix_comesfromsource(pamh, user, 0, 1))) { /* instruct user what is happening */ - if (asprintf(&Announce, _("Changing password for %s."), - user) < 0) { - pam_syslog(pamh, LOG_CRIT, - "password - out of memory"); - return PAM_BUF_ERR; + if (off(UNIX__QUIET, ctrl)) { + retval = pam_info(pamh, _("Changing password for %s."), user); + if (retval != PAM_SUCCESS) + return retval; } - - lctrl = ctrl; - set(UNIX__OLD_PASSWD, lctrl); - retval = _unix_read_password(pamh, lctrl - ,Announce - ,_("(current) UNIX password: ") - ,NULL - ,_UNIX_OLD_AUTHTOK - ,&pass_old); - free(Announce); + retval = pam_get_authtok(pamh, PAM_OLDAUTHTOK, &pass_old, NULL); if (retval != PAM_SUCCESS) { pam_syslog(pamh, LOG_NOTICE, @@ -725,12 +714,7 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) pass_old = NULL; return retval; } - retval = pam_set_item(pamh, PAM_OLDAUTHTOK, (const void *) pass_old); pass_old = NULL; - if (retval != PAM_SUCCESS) { - pam_syslog(pamh, LOG_CRIT, - "failed to set PAM_OLDAUTHTOK"); - } retval = _unix_verify_shadow(pamh,user, ctrl); if (retval == PAM_AUTHTOK_ERR) { if (off(UNIX__IAMROOT, ctrl)) @@ -760,23 +744,14 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) * previous call to this function]. */ - if (off(UNIX_NOT_SET_PASS, ctrl)) { - retval = pam_get_item(pamh, PAM_OLDAUTHTOK - ,&pass_old); - } else { - retval = pam_get_data(pamh, _UNIX_OLD_AUTHTOK - ,&pass_old); - if (retval == PAM_NO_MODULE_DATA) { - retval = PAM_SUCCESS; - pass_old = NULL; - } - } - D(("pass_old [%s]", pass_old)); + retval = pam_get_item(pamh, PAM_OLDAUTHTOK, &item); if (retval != PAM_SUCCESS) { pam_syslog(pamh, LOG_NOTICE, "user not authenticated"); return retval; } + pass_old = item; + D(("pass_old [%s]", pass_old)); D(("get new password now")); @@ -785,7 +760,9 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) if (on(UNIX_USE_AUTHTOK, lctrl)) { set(UNIX_USE_FIRST_PASS, lctrl); } - retry = 0; + if (on(UNIX_USE_FIRST_PASS, lctrl)) { + retry = MAX_PASSWD_TRIES-1; + } retval = PAM_AUTHTOK_ERR; while ((retval != PAM_SUCCESS) && (retry++ < MAX_PASSWD_TRIES)) { /* @@ -793,12 +770,7 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) * password -- needed for pluggable password strength checking */ - retval = _unix_read_password(pamh, lctrl - ,NULL - ,_("Enter new UNIX password: ") - ,_("Retype new UNIX password: ") - ,_UNIX_NEW_AUTHTOK - ,&pass_new); + retval = pam_get_authtok(pamh, PAM_AUTHTOK, &pass_new, NULL); if (retval != PAM_SUCCESS) { if (on(UNIX_DEBUG, ctrl)) { @@ -822,7 +794,7 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv) retval = _pam_unix_approve_pass(pamh, ctrl, pass_old, pass_new, pass_min_len); - if (retval != PAM_SUCCESS && off(UNIX_NOT_SET_PASS, ctrl)) { + if (retval != PAM_SUCCESS) { pam_set_item(pamh, PAM_AUTHTOK, NULL); } } diff --git a/modules/pam_unix/support.c b/modules/pam_unix/support.c index 0fd1dba4..fc8595e9 100644 --- a/modules/pam_unix/support.c +++ b/modules/pam_unix/support.c @@ -853,160 +853,6 @@ cleanup: return retval; } -/* - * obtain a password from the user - */ - -int _unix_read_password(pam_handle_t * pamh - ,unsigned int ctrl - ,const char *comment - ,const char *prompt1 - ,const char *prompt2 - ,const char *data_name - ,const void **pass) -{ - int authtok_flag; - int retval = PAM_SUCCESS; - char *token; - - D(("called")); - - /* - * make sure nothing inappropriate gets returned - */ - - *pass = token = NULL; - - /* - * which authentication token are we getting? - */ - - authtok_flag = on(UNIX__OLD_PASSWD, ctrl) ? PAM_OLDAUTHTOK : PAM_AUTHTOK; - - /* - * should we obtain the password from a PAM item ? - */ - - if (on(UNIX_TRY_FIRST_PASS, ctrl) || on(UNIX_USE_FIRST_PASS, ctrl)) { - retval = pam_get_item(pamh, authtok_flag, pass); - if (retval != PAM_SUCCESS) { - /* very strange. */ - pam_syslog(pamh, LOG_ALERT, - "pam_get_item returned error to unix-read-password" - ); - return retval; - } else if (*pass != NULL) { /* we have a password! */ - return PAM_SUCCESS; - } else if (on(UNIX_USE_AUTHTOK, ctrl) - && off(UNIX__OLD_PASSWD, ctrl)) { - return PAM_AUTHTOK_ERR; - } else if (on(UNIX_USE_FIRST_PASS, ctrl)) { - return PAM_AUTHTOK_RECOVERY_ERR; /* didn't work */ - } - } - /* - * getting here implies we will have to get the password from the - * user directly. - */ - - { - int replies=1; - char *resp[2] = { NULL, NULL }; - - if (comment != NULL && off(UNIX__QUIET, ctrl)) { - retval = pam_info(pamh, "%s", comment); - } - - if (retval == PAM_SUCCESS) { - retval = pam_prompt(pamh, PAM_PROMPT_ECHO_OFF, - &resp[0], "%s", prompt1); - - if (retval == PAM_SUCCESS && prompt2 != NULL) { - retval = pam_prompt(pamh, PAM_PROMPT_ECHO_OFF, - &resp[1], "%s", prompt2); - ++replies; - } - } - - if (resp[0] != NULL && resp[replies-1] != NULL) { - /* interpret the response */ - - if (retval == PAM_SUCCESS) { /* a good conversation */ - - token = resp[0]; - if (token != NULL) { - if (replies == 2) { - /* verify that password entered correctly */ - if (strcmp(token, resp[replies - 1])) { - /* mistyped */ - retval = PAM_AUTHTOK_RECOVERY_ERR; - _make_remark(pamh, ctrl, - PAM_ERROR_MSG, MISTYPED_PASS); - } - } - } else { - pam_syslog(pamh, LOG_NOTICE, - "could not recover authentication token"); - } - - } - - } else { - retval = (retval == PAM_SUCCESS) - ? PAM_AUTHTOK_RECOVERY_ERR : retval; - } - - resp[0] = NULL; - if (replies > 1) - _pam_delete(resp[1]); - } - - if (retval != PAM_SUCCESS) { - _pam_delete(token); - - if (on(UNIX_DEBUG, ctrl)) - pam_syslog(pamh, LOG_DEBUG, - "unable to obtain a password"); - return retval; - } - /* 'token' is the entered password */ - - if (off(UNIX_NOT_SET_PASS, ctrl)) { - - /* we store this password as an item */ - - retval = pam_set_item(pamh, authtok_flag, token); - _pam_delete(token); /* clean it up */ - if (retval != PAM_SUCCESS - || (retval = pam_get_item(pamh, authtok_flag, pass)) - != PAM_SUCCESS) { - - *pass = NULL; - pam_syslog(pamh, LOG_CRIT, "error manipulating password"); - return retval; - - } - } else { - /* - * then store it as data specific to this module. pam_end() - * will arrange to clean it up. - */ - - retval = pam_set_data(pamh, data_name, (void *) token, _cleanup); - if (retval != PAM_SUCCESS) { - pam_syslog(pamh, LOG_CRIT, - "error manipulating password data [%s]", - pam_strerror(pamh, retval)); - _pam_delete(token); - return retval; - } - *pass = token; - token = NULL; /* break link to password */ - } - - return PAM_SUCCESS; -} - /* ****************************************************************** * * Copyright (c) Jan Rêkorajski 1999. * Copyright (c) Andrew G. Morgan 1996-8. diff --git a/modules/pam_unix/support.h b/modules/pam_unix/support.h index b767c265..b4c279c3 100644 --- a/modules/pam_unix/support.h +++ b/modules/pam_unix/support.h @@ -18,8 +18,6 @@ * typed were not the same. */ -#define MISTYPED_PASS "Sorry, passwords do not match" - /* type definition for the control options */ typedef struct { @@ -72,7 +70,7 @@ typedef struct { some information may be sensitive */ #define UNIX_USE_FIRST_PASS 4 #define UNIX_TRY_FIRST_PASS 5 -#define UNIX_NOT_SET_PASS 6 /* don't set the AUTHTOK items */ +#define UNIX_AUTHTOK_TYPE 6 /* TYPE for pam_get_authtok() */ #define UNIX__PRELIM 7 /* internal */ #define UNIX__UPDATE 8 /* internal */ @@ -116,7 +114,7 @@ static const UNIX_Ctrls unix_args[UNIX_CTRLS_] = /* UNIX_AUDIT */ {"audit", _ALL_ON_, 010, 0}, /* UNIX_USE_FIRST_PASS */ {"use_first_pass", _ALL_ON_^(060), 020, 0}, /* UNIX_TRY_FIRST_PASS */ {"try_first_pass", _ALL_ON_^(060), 040, 0}, -/* UNIX_NOT_SET_PASS */ {"not_set_pass", _ALL_ON_, 0100, 0}, +/* UNIX_AUTHTOK_TYPE */ {"authtok_type=", _ALL_ON_, 0100, 0}, /* UNIX__PRELIM */ {NULL, _ALL_ON_^(0600), 0200, 0}, /* UNIX__UPDATE */ {NULL, _ALL_ON_^(0600), 0400, 0}, /* UNIX__NONULL */ {NULL, _ALL_ON_, 01000, 0}, -- cgit v1.2.3