* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <errno.h>
#include <unistd.h>
#include <sys/wait.h>
char pppd_version[] = VERSION;
static char promptprog[PATH_MAX+1];
+static int promptprog_refused = 0;
static option_t options[] = {
{ "promptprog", o_string, promptprog,
int readgood, wstat;
ssize_t red;
- if (promptprog[0] == 0 || access(promptprog, X_OK) < 0)
+ if (promptprog_refused || promptprog[0] == 0 || access(promptprog, X_OK) < 0)
return -1; /* sorry, can't help */
if (!passwd)
if (red == 0)
break;
if (red < 0) {
- if (errno == EINTR)
+ if (errno == EINTR && !got_sigterm)
continue;
error("Can't read secret from %s: %m", promptprog);
readgood = -1;
}
readgood += red;
} while (readgood < MAXSECRETLEN - 1);
- passwd[readgood] = 0;
close(p[0]);
/* now wait for child to exit */
while (waitpid(kid, &wstat, 0) < 0) {
- if (errno != EINTR) {
+ if (errno != EINTR || got_sigterm) {
warn("error waiting for %s: %m", promptprog);
break;
}
if (readgood < 0)
return 0;
+ passwd[readgood] = 0;
if (!WIFEXITED(wstat))
warn("%s terminated abnormally", promptprog);
- if (WEXITSTATUS(wstat))
- warn("%s exited with code %d", promptprog, WEXITSTATUS(status));
-
+ if (WEXITSTATUS(wstat)) {
+ warn("%s exited with code %d", promptprog, WEXITSTATUS(wstat));
+ /* code when cancel was hit in the prompt prog */
+ if (WEXITSTATUS(wstat) == 128) {
+ promptprog_refused = 1;
+ }
+ return -1;
+ }
return 1;
}
{
add_options(options);
pap_passwd_hook = promptpass;
+#ifdef USE_EAPTLS
+ eaptls_passwd_hook = promptpass;
+#endif
}