GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-10-13 18:12:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

print proper message when changing password in PAM.

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2013-07-05 11:52:45 +02:00
parent c55b5a9c68
commit 4b065b8150
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pam.c
+6 -1
View File
@@ -50,6 +50,7 @@ struct pam_ctx_st {
struct pam_conv dc; struct pam_conv dc;
coroutine_t cr; coroutine_t cr;
int cr_ret; int cr_ret;
unsigned changing; /* whether we are entering a new password */
str_st msg; str_st msg;
unsigned sent_msg; unsigned sent_msg;
struct pam_response *replies; /* for safety */ struct pam_response *replies; /* for safety */
@@ -122,6 +123,7 @@ int pret;
/* change password */ /* change password */
syslog(LOG_INFO, "Password for user '%s' is expired. Attempting to update...", pctx->username); syslog(LOG_INFO, "Password for user '%s' is expired. Attempting to update...", pctx->username);
pctx->changing = 1;
pret = pam_chauthtok(pctx->ph, PAM_CHANGE_EXPIRED_AUTHTOK); pret = pam_chauthtok(pctx->ph, PAM_CHANGE_EXPIRED_AUTHTOK);
} }
@@ -204,7 +206,10 @@ int size;
if (msg != NULL) { if (msg != NULL) {
if (pctx->msg.length == 0) if (pctx->msg.length == 0)
snprintf(msg, msg_size, "Please enter your password"); if (pctx->changing)
snprintf(msg, msg_size, "Please enter the new password");
else
snprintf(msg, msg_size, "Please enter your password");
else { else {
size = MIN(msg_size-1, pctx->msg.length); size = MIN(msg_size-1, pctx->msg.length);
memcpy(msg, pctx->msg.data, size); memcpy(msg, pctx->msg.data, size);