summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-05-09 21:14:41 +0000
committerJeremy Allison <jra@samba.org>2001-05-09 21:14:41 +0000
commit5db15a0d682cb04047f28a076b0c8c6d95144c38 (patch)
tree9b5470997d45b750160111ae6a5585d36d3ec17d
parentf874646136270eddc54227796356e2d2fc7e4e67 (diff)
downloadsamba-5db15a0d682cb04047f28a076b0c8c6d95144c38.tar.gz
samba-5db15a0d682cb04047f28a076b0c8c6d95144c38.tar.bz2
samba-5db15a0d682cb04047f28a076b0c8c6d95144c38.zip
Fixed up the oldpw prompts. Made the matching case insensitive.
Jeremy. (This used to be commit 70bdf8e76135e96fabcedeffbfd5892a564985e0)
-rw-r--r--source3/auth/pampass.c29
-rw-r--r--source3/passdb/pampass.c29
2 files changed, 48 insertions, 10 deletions
diff --git a/source3/auth/pampass.c b/source3/auth/pampass.c
index 2d7bdcdf6a..e27e15f24f 100644
--- a/source3/auth/pampass.c
+++ b/source3/auth/pampass.c
@@ -177,8 +177,10 @@ static int smb_pam_passchange_conv(int num_msg,
{
int replies = 0;
struct pam_response *reply = NULL;
+ fstring oldpw_prompt;
fstring newpw_prompt;
fstring repeatpw_prompt;
+ fstring prompt_ret;
char *p = lp_passwd_chat();
struct smb_pam_userdata *udp = (struct smb_pam_userdata *)appdata_ptr;
@@ -197,12 +199,17 @@ static int smb_pam_passchange_conv(int num_msg,
return PAM_CONV_ERR;
}
- /* Get the prompts. We're running as root so we only get 2 prompts. */
+ /* Get the prompts. */
+ if (!next_token(&p, oldpw_prompt, NULL, sizeof(fstring)))
+ return PAM_CONV_ERR;
+ strlower(oldpw_prompt);
if (!next_token(&p, newpw_prompt, NULL, sizeof(fstring)))
return PAM_CONV_ERR;
+ strlower(newpw_prompt);
if (!next_token(&p, repeatpw_prompt, NULL, sizeof(fstring)))
return PAM_CONV_ERR;
+ strlower(repeatpw_prompt);
reply = malloc(sizeof(struct pam_response) * num_msg);
if (!reply)
@@ -219,15 +226,27 @@ static int smb_pam_passchange_conv(int num_msg,
case PAM_PROMPT_ECHO_OFF:
reply[replies].resp_retcode = PAM_SUCCESS;
+ if (!msg[replies]->msg) {
+ free(reply);
+ reply = NULL;
+ return PAM_CONV_ERR;
+ }
+
DEBUG(10,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_OFF: Replied: %s\n", msg[replies]->msg));
- if (ms_fnmatch( newpw_prompt, msg[replies]->msg) == 0) {
+
+ fstrcpy(prompt_ret, msg[replies]->msg);
+ strlower(prompt_ret);
+
+ if (ms_fnmatch( oldpw_prompt, prompt_ret) == 0) {
+ reply[replies].resp = COPY_STRING(udp->PAM_password);
+ } else if (ms_fnmatch( newpw_prompt, prompt_ret) == 0) {
reply[replies].resp = COPY_STRING(udp->PAM_newpassword);
- } else if (ms_fnmatch(repeatpw_prompt, msg[replies]->msg) == 0) {
+ } else if (ms_fnmatch(repeatpw_prompt, prompt_ret) == 0) {
reply[replies].resp = COPY_STRING(udp->PAM_newpassword);
} else {
DEBUG(3,("smb_pam_passchange_conv: Could not find reply for PAM prompt: %s\n",msg[replies]->msg));
- DEBUG(5,("smb_pam_passchange_conv: Prompts available:\n NewPW: \"%s\"\n \
-RepeatPW: \"%s\"\n",newpw_prompt,repeatpw_prompt));
+ DEBUG(5,("smb_pam_passchange_conv: Prompts available:\n OldPW: \"%s\"\nNewPW: \"%s\"\n \
+RepeatPW: \"%s\"\n",oldpw_prompt, newpw_prompt,repeatpw_prompt));
free(reply);
reply = NULL;
return PAM_CONV_ERR;
diff --git a/source3/passdb/pampass.c b/source3/passdb/pampass.c
index 2d7bdcdf6a..e27e15f24f 100644
--- a/source3/passdb/pampass.c
+++ b/source3/passdb/pampass.c
@@ -177,8 +177,10 @@ static int smb_pam_passchange_conv(int num_msg,
{
int replies = 0;
struct pam_response *reply = NULL;
+ fstring oldpw_prompt;
fstring newpw_prompt;
fstring repeatpw_prompt;
+ fstring prompt_ret;
char *p = lp_passwd_chat();
struct smb_pam_userdata *udp = (struct smb_pam_userdata *)appdata_ptr;
@@ -197,12 +199,17 @@ static int smb_pam_passchange_conv(int num_msg,
return PAM_CONV_ERR;
}
- /* Get the prompts. We're running as root so we only get 2 prompts. */
+ /* Get the prompts. */
+ if (!next_token(&p, oldpw_prompt, NULL, sizeof(fstring)))
+ return PAM_CONV_ERR;
+ strlower(oldpw_prompt);
if (!next_token(&p, newpw_prompt, NULL, sizeof(fstring)))
return PAM_CONV_ERR;
+ strlower(newpw_prompt);
if (!next_token(&p, repeatpw_prompt, NULL, sizeof(fstring)))
return PAM_CONV_ERR;
+ strlower(repeatpw_prompt);
reply = malloc(sizeof(struct pam_response) * num_msg);
if (!reply)
@@ -219,15 +226,27 @@ static int smb_pam_passchange_conv(int num_msg,
case PAM_PROMPT_ECHO_OFF:
reply[replies].resp_retcode = PAM_SUCCESS;
+ if (!msg[replies]->msg) {
+ free(reply);
+ reply = NULL;
+ return PAM_CONV_ERR;
+ }
+
DEBUG(10,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_OFF: Replied: %s\n", msg[replies]->msg));
- if (ms_fnmatch( newpw_prompt, msg[replies]->msg) == 0) {
+
+ fstrcpy(prompt_ret, msg[replies]->msg);
+ strlower(prompt_ret);
+
+ if (ms_fnmatch( oldpw_prompt, prompt_ret) == 0) {
+ reply[replies].resp = COPY_STRING(udp->PAM_password);
+ } else if (ms_fnmatch( newpw_prompt, prompt_ret) == 0) {
reply[replies].resp = COPY_STRING(udp->PAM_newpassword);
- } else if (ms_fnmatch(repeatpw_prompt, msg[replies]->msg) == 0) {
+ } else if (ms_fnmatch(repeatpw_prompt, prompt_ret) == 0) {
reply[replies].resp = COPY_STRING(udp->PAM_newpassword);
} else {
DEBUG(3,("smb_pam_passchange_conv: Could not find reply for PAM prompt: %s\n",msg[replies]->msg));
- DEBUG(5,("smb_pam_passchange_conv: Prompts available:\n NewPW: \"%s\"\n \
-RepeatPW: \"%s\"\n",newpw_prompt,repeatpw_prompt));
+ DEBUG(5,("smb_pam_passchange_conv: Prompts available:\n OldPW: \"%s\"\nNewPW: \"%s\"\n \
+RepeatPW: \"%s\"\n",oldpw_prompt, newpw_prompt,repeatpw_prompt));
free(reply);
reply = NULL;
return PAM_CONV_ERR;