Merge remote branch 'gregkh/master'

diff --git a/ChangeLog b/ChangeLog
index 6552ce30ab8ce2a34737a8d7585fcd8e118bd34c..2da39c65d5a2b7c4e5c6c16eb0984d3d40df1fa0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+Summary of changes from v023 to v024
+============================================
+
+Ben Boeckel (1):
+      Disable echo when reading the password
+
+Greg Kroah-Hartman (7):
+      fix compiler warning about fprintf
+      clean up some trailing whitespace
+      more coding style cleanups
+      don't free an array on the stack
+      fix crash when --debug is set
+      fix up some compiler warnings in read_password
+      use "quiet" mode of building if present.
+
+Marvin Vek (1):
+      Add laconica group support
+
+gregor herrmann (1):
+      BTI should not display password while user types it
+
 Summary of changes from v022 to v023
 ============================================
 

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 512e9a1163e7676e6fb714dd22eef1db5c773de9..74a0698aab01c55bcf6114653dc549922345c551 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,8 @@
+bti 024
+=============
+laconica group support from Marvin Vek
+password handling changes from Gregor Herrmann and Ben Boeckel
+
 bti 023
 =============
 verbose mode for timestamps

diff --git a/bti.c b/bti.c
index 2c2f4bee5f490688418e4962e4398452d8971bd1..41d2d9bd5ac2b7bd992cb8b87f8ba61658b7f2fa 100644 (file)
--- a/bti.c
+++ b/bti.c
@@ -659,9 +659,10 @@ static char *get_string_from_stdin(void)
        return string;
 }
 
-void read_password(char *buf, size_t len)
+static void read_password(char *buf, size_t len)
 {
        char pwd[80];
+       int retval;
        struct termios old;
        struct termios tp;
 
@@ -673,7 +674,9 @@ void read_password(char *buf, size_t len)
 
        fprintf(stdout, "Enter password: ");
        fflush(stdout);
-       scanf("%79s", pwd);
+       tcflow(0, TCOOFF);
+       retval = scanf("%79s", pwd);
+       tcflow(0, TCOON);
        fprintf(stdout, "\n");
 
        tcsetattr(0, TCSANOW, &old);

diff --git a/configure.ac b/configure.ac
index dee52d55cf479d6800b23a73d5ddddb1e45dbeff..e45785cfbfe2655141f3bc271b62df3f554cca15 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,11 @@
-AC_INIT([bti], [023], [greg@kroah.com])
+AC_INIT([bti], [024], [greg@kroah.com])
 AC_PREREQ(2.60)
 
-AM_INIT_AUTOMAKE(bti, 023)
+AM_INIT_AUTOMAKE(bti, 024)
 dnl AM_CONFIG_HEADER([check-news foreign 1.9 dist-bzip2])
 
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
 AC_PROG_CC
 AC_PROG_INSTALL