diff options
38 files changed, 36 insertions, 7 deletions
diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c index 0369d40145..b986a437e0 100644 --- 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 d4395818a7..8716f7433f 100644 --- 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 318c747d53..fcc6fe0dcc 100644 --- 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 a6e43d2659..040fae9b21 100644 --- 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 fe977262b6..2e081aa09a 100644 --- 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 53228ba979..ca71245547 100644 --- 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 3a624bf7e8..630c74e8d5 100644 --- 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 060382b930..9dd438b7f7 100644 --- 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 42ef76df11..2c6fedc4ca 100644 --- 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 6770a715d8..8bea36b870 100644 --- 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 a0f8f282b3..9d84585398 100644 --- 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 6d3da1cd77..7661ecf2f8 100644 --- 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 dd42675cc6..16a4d7d816 100644 --- 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 565aaa8288..4ea2b74384 100644 --- 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 dba5204326..82f2f48440 100644 --- 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 950177c3ca..a775791cf5 100644 --- 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 47353d2a94..d5d580c30b 100644 --- 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 ea18bb395e..75feff83c3 100644 --- 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 04e17946c2..1430161858 100644 --- 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 5b946913d2..0b1230efe7 100644 --- 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 1c342858ee..d9a1bf6912 100644 --- 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 08142357a9..cfc2a7ed8a 100644 --- 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 3e93fc503c..435af091e3 100644 --- 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 b1de4d24c5..b04e6bd5b1 100644 --- 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 63c9a34dd8..1187c96d73 100644 --- 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 1ddc94b8f7..d234a3cd05 100644 --- 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 c6ccbc86a2..b3c6d14a96 100644 --- 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 ce330a8b16..f6f500a2aa 100644 --- 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 a29995b87b..79078b234a 100644 --- 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 46361add76..65fec1041b 100644 --- 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 58e03fb6b2..09f4f3146f 100644 --- 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 3f98b12503..f575872b0d 100644 --- 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 8b88a0fef3..62ecb34c9e 100644 --- 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 d7ba1234ed..f27011cdea 100644 --- 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 d2b10c1810..fb23789d0e 100644 --- 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 8ce0d58ce9..6d606bba41 100644 --- 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 5e4b950135..720018d15d 100644 --- 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 05114b2432..8dbcb12e66 100644 --- 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" |