From: Volker Lendecke <vl@samba.org>
Date: Wed, 27 Nov 2019 07:36:59 +0000 (+0100)
Subject: lib: Remove duplicate get_pass() prototypes
X-Git-Tag: ldb-2.1.0~486
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6ab4b87a7e61d5af6e7980380c0f307bc310e5f0;p=thirdparty%2Fsamba.git

lib: Remove duplicate get_pass() prototypes

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Martin Schwenke <martins@samba.org>
---

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 4eaca065902..7d81038c670 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -909,10 +909,6 @@ NTSTATUS sessionid_traverse_read(int (*fn)(const char *key,
 					   void *private_data),
 				 void *private_data);
 
-/* The following definitions come from utils/passwd_util.c  */
-
-char *get_pass( const char *prompt, bool stdin_get);
-
 /* The following definitions come from lib/avahi.c */
 
 struct AvahiPoll *tevent_avahi_poll(TALLOC_CTX *mem_ctx,
diff --git a/source3/utils/net.c b/source3/utils/net.c
index 71b9b07d7d7..683b46794e4 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -51,6 +51,7 @@
 #include "cmdline_contexts.h"
 #include "lib/gencache.h"
 #include "auth/credentials/credentials.h"
+#include "source3/utils/passwd_proto.h"
 
 #ifdef WITH_FAKE_KASERVER
 #include "utils/net_afs.h"
diff --git a/source3/utils/net_proto.h b/source3/utils/net_proto.h
index d67aafa9440..d5387f50e46 100644
--- a/source3/utils/net_proto.h
+++ b/source3/utils/net_proto.h
@@ -439,10 +439,6 @@ NTSTATUS net_lookup_name_from_sid(struct net_context *c,
 NTSTATUS net_lookup_sid_from_name(struct net_context *c, TALLOC_CTX *ctx,
 				  const char *full_name, struct dom_sid *pret_sid);
 
-/* The following definitions come from utils/passwd_util.c  */
-
-char *get_pass( const char *prompt, bool stdin_get);
-
 /* The following definitions come from utils/net_g_lock.c  */
 int net_g_lock(struct net_context *c, int argc, const char **argv);
 
diff --git a/source3/utils/passwd_util.c b/source3/utils/passwd_util.c
index 8edc6cf38d7..edd2c52e242 100644
--- a/source3/utils/passwd_util.c
+++ b/source3/utils/passwd_util.c
@@ -25,6 +25,7 @@
 */
 
 #include "includes.h"
+#include "passwd_proto.h"
 
 /*************************************************************
  Utility function to prompt for passwords from stdin. Each
diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index b6ee806e190..e0645a67423 100644
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -26,6 +26,7 @@
 #include "../libcli/security/security.h"
 #include "passdb.h"
 #include "cmdline_contexts.h"
+#include "passwd_proto.h"
 
 #define BIT_BACKEND	0x00000004
 #define BIT_VERBOSE	0x00000008
diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index 858689b3012..40131205265 100644
--- a/source3/utils/smbpasswd.c
+++ b/source3/utils/smbpasswd.c
@@ -24,6 +24,7 @@
 #include "libsmb/proto.h"
 #include "passdb.h"
 #include "cmdline_contexts.h"
+#include "passwd_proto.h"
 
 /*
  * Next two lines needed for SunOS and don't