[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-51-g96820f8

[Stefan Metzmacher]

The branch, v3-2-test has been updated
       via  96820f8d8f6522fc264efda0f069e2f6a420ac2e (commit)
       via  d20c2fa274297e9577ed28b8ed04806a425bdc57 (commit)
      from  f4c0961a16a84dcdfe6e2faafb75c76983e6d466 (commit)

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


- Log -----------------------------------------------------------------
commit 96820f8d8f6522fc264efda0f069e2f6a420ac2e
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Oct 15 15:42:13 2007 +0200

    rename getsmbpass -> rep_getpass and provide the function prototype
    
    metze

commit d20c2fa274297e9577ed28b8ed04806a425bdc57
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Oct 15 15:41:06 2007 +0200

    use "system/*.h" to get the system includes
    
    metze

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

Summary of changes:
 source/lib/replace/getpass.c       |   20 ++++----------------
 source/lib/replace/system/passwd.h |    3 ++-
 2 files changed, 6 insertions(+), 17 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/replace/getpass.c b/source/lib/replace/getpass.c
index 4b21849..1d13461 100644
--- a/source/lib/replace/getpass.c
+++ b/source/lib/replace/getpass.c
@@ -18,21 +18,9 @@ not, see <http://www.gnu.org/licenses/>.  */
 /* Modified to use with samba by Jeremy Allison, 8th July 1995. */
 
 #include "replace.h"
-
-#if defined(HAVE_TERMIOS_H)
-/* POSIX terminal handling. */
-#include <termios.h>
-#elif defined(HAVE_TERMIO_H)
-/* Older SYSV terminal handling - don't use if we can avoid it. */
-#include <termio.h>
-#elif defined(HAVE_SYS_TERMIO_H)
-/* Older SYSV terminal handling - don't use if we can avoid it. */
-#include <sys/termio.h>
-#endif
-
-#ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
+#include "system/filesys.h"
+#include "system/wait.h"
+#include "system/terminal.h"
 
 /*
  * Define additional missing types
@@ -150,7 +138,7 @@ static void gotintr_sig(void)
 	in_fd = -1;
 }
 
-char *getsmbpass(const char *prompt)
+char *rep_getpass(const char *prompt)
 {
 	FILE *in, *out;
 	int echo_off;
diff --git a/source/lib/replace/system/passwd.h b/source/lib/replace/system/passwd.h
index 4e858fc..53d35e7 100644
--- a/source/lib/replace/system/passwd.h
+++ b/source/lib/replace/system/passwd.h
@@ -65,7 +65,8 @@
 #endif
 
 #ifdef REPLACE_GETPASS
-#define getpass(prompt) getsmbpass((prompt))
+#define getpass(prompt) rep_getpass(prompt)
+char *rep_getpass(const char *prompt);
 #endif
 
 #ifndef NGROUPS_MAX


-- 
Samba Shared Repository