[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2378-ge54c719

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  e54c71954ae484fe4a4e195db33440490e78e256 (commit)
      from  4221937b68e2414295279b27c5f12a80f826ed4b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit e54c71954ae484fe4a4e195db33440490e78e256
Author: Jeremy Allison <jra at samba.org>
Date:   Fri May 9 14:51:45 2008 -0700

    Fix replacement getpass. If we ^C at the prompt echo was left off.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/lib/replace/getpass.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/replace/getpass.c b/source/lib/replace/getpass.c
index 73333b9..0be618f 100644
--- a/source/lib/replace/getpass.c
+++ b/source/lib/replace/getpass.c
@@ -187,10 +187,6 @@ char *rep_getpass(const char *prompt)
 		in_fd = fileno(in);
 		if (fgets(buf, bufsize, in) == NULL) {
 			buf[0] = 0;
-			if (in && in != stdin) {
-				fclose(in);
-			}
-			return buf;
 		}
 	}
 	nread = strlen(buf);
@@ -201,8 +197,9 @@ char *rep_getpass(const char *prompt)
 
 	/* Restore echoing.  */
 	if (echo_off) {
-		if (gotintr && in_fd == -1)
+		if (gotintr && in_fd == -1) {
 			in = fopen ("/dev/tty", "w+");
+		}
 		if (in != NULL)
 			tcsetattr (fileno (in), TCSANOW, &t);
 	}


-- 
Samba Shared Repository