r24868: Don't use callbacks for prompting when stdout is not a tty.

(This used to be commit 9b02a39c156862f9e9258dcdb9b8b86715022fc1)

diff --git a/source4/lib/cmdline/credentials.c b/source4/lib/cmdline/credentials.c
index 36e0504021b4fd8b46ee317d325e92161a7040e0..2e5c6fd94ab33fe0df96761e2398689bd57c1b9b 100644 (file)
--- a/source4/lib/cmdline/credentials.c
+++ b/source4/lib/cmdline/credentials.c
@@ -38,7 +38,12 @@ static const char *cmdline_get_userpassword(struct cli_credentials *credentials)
        return ret;
 }
 
        return ret;
 }
 

-void cli_credentials_set_cmdline_callbacks(struct cli_credentials *cred)
+bool cli_credentials_set_cmdline_callbacks(struct cli_credentials *cred)

 {
 {

-       cli_credentials_set_password_callback(cred, cmdline_get_userpassword);
+       if (isatty(fileno(stdout))) {
+               cli_credentials_set_password_callback(cred, cmdline_get_userpassword);
+               return true;
+       }
+
+       return false;

 }
 }

diff --git a/source4/lib/replace/libreplace.m4 b/source4/lib/replace/libreplace.m4
index f06d7f83dc3564cc30135818fce7dc6ee3103be6..c42d5bcf38129582a3307968746224589fe072b3 100644 (file)
--- a/source4/lib/replace/libreplace.m4
+++ b/source4/lib/replace/libreplace.m4
@@ -152,6 +152,7 @@ AC_CHECK_FUNCS(seteuid setresuid setegid setresgid chroot bzero strerror)
 AC_CHECK_FUNCS(vsyslog setlinebuf mktime ftruncate chsize rename)
 AC_CHECK_FUNCS(waitpid strlcpy strlcat initgroups memmove strdup)
 AC_CHECK_FUNCS(pread pwrite strndup strcasestr strtok_r mkdtemp socketpair)
 AC_CHECK_FUNCS(vsyslog setlinebuf mktime ftruncate chsize rename)
 AC_CHECK_FUNCS(waitpid strlcpy strlcat initgroups memmove strdup)
 AC_CHECK_FUNCS(pread pwrite strndup strcasestr strtok_r mkdtemp socketpair)

+AC_CHECK_FUNCS(isatty)

 AC_HAVE_DECL(setresuid, [#include <unistd.h>])
 AC_HAVE_DECL(setresgid, [#include <unistd.h>])
 AC_HAVE_DECL(errno, [#include <errno.h>])
 AC_HAVE_DECL(setresuid, [#include <unistd.h>])
 AC_HAVE_DECL(setresgid, [#include <unistd.h>])
 AC_HAVE_DECL(errno, [#include <errno.h>])