Changeset 272 for branches/samba-3.2.x/source/lib

Timestamp:

Jun 16, 2009, 5:52:30 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 to 3.2.12

Location:

branches/samba-3.2.x/source/lib

Files:

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

branches/samba-3.2.x/source/lib/ldb/common/ldb.c

@@ -788 +788 @@
         if (ret != LDB_SUCCESS) {
                 talloc_free(res);
+                res = NULL;
         }
 

branches/samba-3.2.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.  */
-
         in = fopen ("/dev/tty", "w+");
         if (in == NULL) {

branches/samba-3.2.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)