s3-popt: Only include popt-common.h when needed.

diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c
index 0369d40145b7a6529e45b1ae022b22ed03e313c4..b986a437e0f94554f9fe2be2f9ed60d42c1b68cf 100644 (file)
--- a/nsswitch/wbinfo.c
+++ b/nsswitch/wbinfo.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 #include "winbind_client.h"
 #include "libwbclient/wbclient.h"
 #include "lib/popt/popt.h"

diff --git a/source3/client/client.c b/source3/client/client.c
index d4395818a790a9b129ee210040ec2ae34ac38525..8716f7433fed6812e19fa00274c42f6ca84d28fb 100644 (file)
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 #include "client/client_proto.h"
 #include "../librpc/gen_ndr/cli_srvsvc.h"
 

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 318c747d53fcfedb7ce5c62c0b57adb8c0792293..fcc6fe0dccd3fa1e73516ee03ba5fb71a8bbb67c 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -659,7 +659,6 @@ struct ntlmssp_state;
 #include "client.h"
 
 #include "session.h"
-#include "popt.h"
 #include "mangle.h"
 #include "module.h"
 #include "nsswitch/winbind_client.h"

diff --git a/source3/include/popt_common.h b/source3/include/popt_common.h
index a6e43d265984a5872e2530e05310cd664afec9d1..040fae9b2171123ee9a56952f1d1399b3c5ff534 100644 (file)
--- a/source3/include/popt_common.h
+++ b/source3/include/popt_common.h
@@ -58,4 +58,6 @@ struct user_auth_info {
        bool use_ccache;
 };
 
+void popt_common_set_auth_info(struct user_auth_info *auth_info);
+
 #endif /* _POPT_COMMON_H */

diff --git a/source3/include/proto.h b/source3/include/proto.h
index fe977262b6ba42903d1eb8cbab3f774d4909f9d9..2e081aa09ac2cd219d7b552c42fc017196890999 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -655,10 +655,6 @@ pid_t pidfile_pid(const char *name);
 void pidfile_create(const char *program_name);
 void pidfile_unlink(void);
 
-/* The following definitions come from lib/popt_common.c  */
-
-void popt_common_set_auth_info(struct user_auth_info *auth_info);
-
 /* The following definitions come from lib/privileges.c  */
 
 bool get_privileges_for_sids(SE_PRIV *privileges, struct dom_sid *slist, int scount);

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 53228ba97969559944dd028d4f1929320d1cd8e7..ca7124554781059a4a6d33ffc5b360a9f0603bbe 100644 (file)
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1859,8 +1859,6 @@ struct unix_error_map {
 
 #define DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH 14
 
-#include "popt_common.h"
-
 #define PORT_NONE      0
 #ifndef LDAP_PORT
 #define LDAP_PORT      389

diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c
index 3a624bf7e8d453970cb2ea81d48b68670af5e5ae..630c74e8d54f13a6a3514fd87181a4fe0f7e6b85 100644 (file)
--- a/source3/lib/netapi/cm.c
+++ b/source3/lib/netapi/cm.c
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "popt_common.h"
 
 #include "lib/netapi/netapi.h"
 #include "lib/netapi/netapi_private.h"

diff --git a/source3/lib/popt_common.c b/source3/lib/popt_common.c
index 060382b930a13581d988c46710ecf0f3eaffbe26..9dd438b7f79fe1822dacccdcb7ba135b306ff7ae 100644 (file)
--- a/source3/lib/popt_common.c
+++ b/source3/lib/popt_common.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 
 /* Handle command line options:
  *             -d,--debuglevel 

diff --git a/source3/lib/smbconf/testsuite.c b/source3/lib/smbconf/testsuite.c
index 42ef76df11e69e9d3ea1ee375c8b9c9790ac69f0..2c6fedc4ca77db7a7bf2a52522738bec3366b602 100644 (file)
--- a/source3/lib/smbconf/testsuite.c
+++ b/source3/lib/smbconf/testsuite.c
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "popt_common.h"
 #include "lib/smbconf/smbconf.h"
 #include "lib/smbconf/smbconf_init.h"
 #include "lib/smbconf/smbconf_reg.h"

diff --git a/source3/lib/util.c b/source3/lib/util.c
index 6770a715d8893dc0fea289db07be20981e75b520..8bea36b870eccb58c4399d4403328de76ca90c9f 100644 (file)
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 #include "secrets.h"
 
 extern char *global_clobber_region_function;

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index a0f8f282b32300b93601dc6b6c37fb357abc2cac..9d84585398f0b372e4dcef05ea3955eebf1b9f53 100644 (file)
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../libcli/auth/spnego.h"
 #include "smb_krb5.h"

diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c
index 6d3da1cd7798f09222b3376150af9c017db470c7..7661ecf2f8a6250eda414cb07d86c9d8c5a3f899 100644 (file)
--- a/source3/libsmb/libsmb_dir.c
+++ b/source3/libsmb/libsmb_dir.c
@@ -23,6 +23,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 #include "libsmbclient.h"
 #include "libsmb_internal.h"
 #include "../librpc/gen_ndr/cli_srvsvc.h"

diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index dd42675cc60107cbede0f399ea1cb4b3f83256b4..16a4d7d81669e668a2b78574268cc131815b02bc 100644 (file)
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 #include "librpc/gen_ndr/messaging.h"
 
 int ClientNMB       = -1;

diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 565aaa82880f5adfc12e0c4d5441ab11b410736e..4ea2b743847d1fa63858c1508758a7e81642b46a 100644 (file)
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 #include "rpcclient.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/cli_lsa.h"

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index dba5204326d7db982755d6c93afccb135d5a45df..82f2f48440071972b2927f3ec0c57a60adf4962d 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 #include "smbd/globals.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "registry.h"

diff --git a/source3/torture/pdbtest.c b/source3/torture/pdbtest.c
index 950177c3ca97a636af2f964981f49d8b67ed0422..a775791cf53d059d505595cfb08d2d2c413f4af6 100644 (file)
--- a/source3/torture/pdbtest.c
+++ b/source3/torture/pdbtest.c
@@ -21,6 +21,7 @@
 
 
 #include "includes.h"
+#include "popt_common.h"
 
 static bool samu_correct(struct samu *s1, struct samu *s2)
 {

diff --git a/source3/torture/smbiconv.c b/source3/torture/smbiconv.c
index 47353d2a94320019061f3cb1ecf06a0d40dd4fcd..d5d580c30be0ec21b614a50269ce564aaf8d7c2d 100644 (file)
--- a/source3/torture/smbiconv.c
+++ b/source3/torture/smbiconv.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 #undef realloc
 
 static int

diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c
index ea18bb395e220fcfcec46421c6b982894a669d91..75feff83c3f4634a653f8f2ee18e1b4ff7b8db96 100644 (file)
--- a/source3/torture/vfstest.c
+++ b/source3/torture/vfstest.c
@@ -24,6 +24,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 #include "vfstest.h"
 
 /* List to hold groups of commands */

diff --git a/source3/utils/dbwrap_torture.c b/source3/utils/dbwrap_torture.c
index 04e17946c2984fcb91bf45b90d80d80a1e6be1d3..14301618586019c46fbee0bb7cad3d7d136f5e74 100644 (file)
--- a/source3/utils/dbwrap_torture.c
+++ b/source3/utils/dbwrap_torture.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 
 #if 0
 #include "lib/events/events.h"

diff --git a/source3/utils/log2pcaphex.c b/source3/utils/log2pcaphex.c
index 5b946913d251a67ece4e4dc49af65181b6b0cbb8..0b1230efe7992b58a86c1c585cfd493e4258d2a2 100644 (file)
--- a/source3/utils/log2pcaphex.c
+++ b/source3/utils/log2pcaphex.c
@@ -51,6 +51,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 
 /* We don't care about the paranoid malloc checker in this standalone
    program */

diff --git a/source3/utils/net.c b/source3/utils/net.c
index 1c342858ee3f2e00c7c530a215b7d7e6955648d5..d9a1bf6912db5c125df2319dd7ec2467f251f386 100644 (file)
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -41,6 +41,7 @@
 /*****************************************************/
 
 #include "includes.h"
+#include "popt_common.h"
 #include "utils/net.h"
 #include "secrets.h"
 

diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c
index 08142357a9d4dac683f3648a1bd0bc19402bf92f..cfc2a7ed8a91611afd9924e722876afc022812bc 100644 (file)
--- a/source3/utils/net_rpc_registry.c
+++ b/source3/utils/net_rpc_registry.c
@@ -18,6 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
  
 #include "includes.h"
+#include "popt_common.h"
 #include "registry.h"
 #include "utils/net.h"
 #include "utils/net_registry_util.h"

diff --git a/source3/utils/net_rpc_sh_acct.c b/source3/utils/net_rpc_sh_acct.c
index 3e93fc503c7a57e5277403f15c5a57a351f4286b..435af091e300bb67e2109178fa421194fce1edc9 100644 (file)
--- a/source3/utils/net_rpc_sh_acct.c
+++ b/source3/utils/net_rpc_sh_acct.c
@@ -17,6 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "includes.h"
+#include "popt_common.h"
 #include "utils/net.h"
 #include "../librpc/gen_ndr/cli_samr.h"
 

diff --git a/source3/utils/net_rpc_shell.c b/source3/utils/net_rpc_shell.c
index b1de4d24c50d8a426d5fc0dc2ae68435113c8018..b04e6bd5b1f8a2c2a43ae2411efc075bbc778d31 100644 (file)
--- a/source3/utils/net_rpc_shell.c
+++ b/source3/utils/net_rpc_shell.c
@@ -19,6 +19,7 @@
 
 
 #include "includes.h"
+#include "popt_common.h"
 #include "utils/net.h"
 #include "../librpc/gen_ndr/ndr_samr.h"
 

diff --git a/source3/utils/nmblookup.c b/source3/utils/nmblookup.c
index 63c9a34dd88c7576b963f1296da6141584bd5bd0..1187c96d7361a0ffa82d11fc90f09636e0effc8d 100644 (file)
--- a/source3/utils/nmblookup.c
+++ b/source3/utils/nmblookup.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 
 extern bool AllowDebugChange;
 

diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index 1ddc94b8f7070568d813da5edd53d644a011ebc6..d234a3cd05553f35f9f329cfca7592193a75d7b7 100644 (file)
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -24,6 +24,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 #include "utils/ntlm_auth.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../libcli/auth/spnego.h"

diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index c6ccbc86a294b936b9b054ebf61c029d93bc720d..b3c6d14a96e430588b9c57413fb396614524f96b 100644 (file)
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 
 #define BIT_BACKEND    0x00000004
 #define BIT_VERBOSE    0x00000008

diff --git a/source3/utils/profiles.c b/source3/utils/profiles.c
index ce330a8b1692e6dfd4896a7c7b686cf02bc42016..f6f500a2aaef74912e0803a80997aae05f6ec344 100644 (file)
--- a/source3/utils/profiles.c
+++ b/source3/utils/profiles.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 #include "registry/reg_objects.h"
 #include "regfio.h"
 

diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c
index a29995b87bfb553ae5af759562ffb6079d127db3..79078b234ab86f2f3e56e81676795eda340b4692 100644 (file)
--- a/source3/utils/sharesec.c
+++ b/source3/utils/sharesec.c
@@ -23,6 +23,7 @@
 
 
 #include "includes.h"
+#include "popt_common.h"
 
 static TALLOC_CTX *ctx;
 

diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 46361add764c4aa0dabc1784eb16fb2c5427e518..65fec1041b54e9661cc9210b126eaefef3caa305 100644 (file)
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 #include "../librpc/gen_ndr/ndr_lsa.h"
 #include "rpc_client/cli_lsarpc.h"
 

diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 58e03fb6b2a8ebe4c12dc39d6fadf2d6056922e0..09f4f3146fb8480c3b9cf1916f128030c2b80571 100644 (file)
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -24,6 +24,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "librpc/gen_ndr/spoolss.h"
 #include "nt_printing.h"

diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c
index 3f98b1250319d63dffd59ce23c0bea8ea6dc5c67..f575872b0dc0352f4a9970f44b7c54c4a14532a9 100644 (file)
--- a/source3/utils/smbcquotas.c
+++ b/source3/utils/smbcquotas.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 #include "../librpc/gen_ndr/ndr_lsa.h"
 #include "rpc_client/cli_lsarpc.h"
 

diff --git a/source3/utils/smbget.c b/source3/utils/smbget.c
index 8b88a0fef30d9239bf5a442fb3a9cd56f727f4fa..62ecb34c9e177b120bf9ddd35ce36e0c3abf7201 100644 (file)
--- a/source3/utils/smbget.c
+++ b/source3/utils/smbget.c
@@ -17,6 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "includes.h"
+#include "popt_common.h"
 #include "libsmbclient.h"
 
 #if _FILE_OFFSET_BITS==64

diff --git a/source3/utils/smbtree.c b/source3/utils/smbtree.c
index d7ba1234ede21d10440bea6a0c09dc4c47dc80e7..f27011cdea0be48d405a61304df3613e4ff5cc10 100644 (file)
--- a/source3/utils/smbtree.c
+++ b/source3/utils/smbtree.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 #include "../librpc/gen_ndr/cli_srvsvc.h"
 
 static int use_bcast;

diff --git a/source3/utils/status.c b/source3/utils/status.c
index d2b10c1810a861a8e8755faec2fc022b0f6f8b5d..fb23789d0eea202c781f0dd68b2dc49a2144d885 100644 (file)
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -31,6 +31,7 @@
  */
 
 #include "includes.h"
+#include "popt_common.h"
 
 #define SMB_MAXPIDS            2048
 static uid_t           Ucrit_uid = 0;               /* added by OH */

diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index 8ce0d58ce99a81ef01c7a9552cb99bcd7a4cddba..6d606bba41cda2794663f956a9ce754b474c82da 100644 (file)
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -32,6 +32,7 @@
  */
 
 #include "includes.h"
+#include "popt_common.h"
 
 extern bool AllowDebugChange;
 

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 5e4b9501356b0cdb44b90d33743fd031415893b2..720018d15db3e460966c2af3cc992e8a103539ed 100644 (file)
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -28,6 +28,7 @@
  **/
 
 #include "includes.h"
+#include "popt_common.h"
 #include "web/swat_proto.h"
 
 static int demo_mode = False;

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 05114b2432a8000f6b2e41356867a6b2f64db172..8dbcb12e66066946d7411d54544fb8225742fc78 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -23,6 +23,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 #include "winbindd.h"
 #include "../../nsswitch/libwbclient/wbc_async.h"
 #include "librpc/gen_ndr/messaging.h"