summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-11-24 20:18:44 +0000
committerJeremy Allison <jra@samba.org>2003-11-24 20:18:44 +0000
commit9ce8270a8699e36e81fbb02666e24c57454de7e3 (patch)
tree4fa2dc01a52955c04c2c3d4978fdafc4c6b7bfb9 /source3/smbd
parent3500dfdcdc4b0e1a1f5071597fff98369dc122d0 (diff)
downloadsamba-9ce8270a8699e36e81fbb02666e24c57454de7e3.tar.gz
samba-9ce8270a8699e36e81fbb02666e24c57454de7e3.tar.bz2
samba-9ce8270a8699e36e81fbb02666e24c57454de7e3.zip
Added "passwd chat timeout" parameter. Docs to follow.
Jeremy. (This used to be commit 4d49fb806db6868f97069a603a28a85dc31cfe21)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/chgpasswd.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c
index d99570ff7c..5caf78e41a 100644
--- a/source3/smbd/chgpasswd.c
+++ b/source3/smbd/chgpasswd.c
@@ -245,7 +245,8 @@ static int expect(int master, char *issue, char *expected)
if (strequal(expected, "."))
return True;
- timeout = 2000;
+ /* Initial timeout. */
+ timeout = lp_passwd_chat_timeout() * 1000;
nread = 0;
buffer[nread] = 0;
@@ -261,8 +262,10 @@ static int expect(int master, char *issue, char *expected)
pstrcpy( str, buffer);
trim_char( str, ' ', ' ');
- if ((match = (unix_wild_match(expected, str) == 0)))
- timeout = 200;
+ if ((match = (unix_wild_match(expected, str) == 0))) {
+ /* Now data has started to return, lower timeout. */
+ timeout = lp_passwd_chat_timeout() * 100;
+ }
}
}