Changeset 262 for branches

Timestamp:

Jun 12, 2009, 4:08:50 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

password prompt fix (by diver) in 3.3 branch

Location:

branches/samba-3.3.x/source/lib/replace

Files:

• getpass.c (modified) (1 diff)
• system/passwd.h (modified) (1 diff)

branches/samba-3.3.x/source/lib/replace/getpass.c

@@ -153 +153 @@
         /* Try to write to and read from the terminal if we can.
                 If we can't open the terminal, use stderr and stdin.  */
-#ifndef __OS2__
         in = fopen ("/dev/tty", "w+");
-#else
-        in = NULL;
-#endif
         if (in == NULL) {
                 in = stdin;

branches/samba-3.3.x/source/lib/replace/system/passwd.h

@@ -68 +68 @@
 #endif
 
-#ifdef REPLACE_GETPASS
+#if defined(REPLACE_GETPASS) && !defined(__OS2__)
 #if defined(REPLACE_GETPASS_BY_GETPASSPHRASE)
 #define getpass(prompt) getpassphrase(prompt)