From 49fcf653b11ef7308b849027d342a3182f270dd3 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 25 Feb 2011 17:14:22 +0100 Subject: s3-includes: only include system/passwd.h when needed. Guenther --- source3/auth/auth_server.c | 1 + source3/auth/auth_unix.c | 1 + source3/client/smbspool.c | 1 + source3/groupdb/mapping.c | 1 + source3/include/includes.h | 1 - source3/lib/substitute.c | 1 + source3/lib/sysacls.c | 1 + source3/lib/system.c | 1 + source3/lib/system_smbd.c | 1 + source3/lib/username.c | 1 + source3/lib/util.c | 1 + source3/libnet/libnet_dssync_passdb.c | 1 + source3/libnet/libnet_samsync_passdb.c | 1 + source3/passdb/passdb.c | 1 + source3/passdb/pdb_interface.c | 1 + source3/passdb/pdb_smbpasswd.c | 1 + source3/passdb/util_unixsids.c | 1 + source3/printing/tests/vlp.c | 1 + source3/rpc_server/samr/srv_samr_chgpasswd.c | 1 + source3/rpc_server/samr/srv_samr_nt.c | 1 + source3/rpc_server/srvsvc/srv_srvsvc_nt.c | 1 + source3/smbd/ntquotas.c | 1 + source3/smbd/password.c | 1 + source3/smbd/uid.c | 1 + source3/torture/cmd_vfs.c | 1 + source3/utils/net_groupmap.c | 1 + source3/utils/net_sam.c | 1 + source3/utils/net_usershare.c | 1 + source3/utils/smbpasswd.c | 1 + source3/web/cgi.c | 1 + source3/winbindd/idmap_nss.c | 1 + 31 files changed, 30 insertions(+), 1 deletion(-) (limited to 'source3') diff --git a/source3/auth/auth_server.c b/source3/auth/auth_server.c index 5fee1e4881..47b6e36d6f 100644 --- a/source3/auth/auth_server.c +++ b/source3/auth/auth_server.c @@ -19,6 +19,7 @@ */ #include "includes.h" +#include "system/passwd.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_AUTH diff --git a/source3/auth/auth_unix.c b/source3/auth/auth_unix.c index 072ad8426c..5d89ca8d5d 100644 --- a/source3/auth/auth_unix.c +++ b/source3/auth/auth_unix.c @@ -18,6 +18,7 @@ */ #include "includes.h" +#include "system/passwd.h" #include "../librpc/gen_ndr/samr.h" #include "smbd/globals.h" diff --git a/source3/client/smbspool.c b/source3/client/smbspool.c index c80ad42dd9..2add37f49d 100644 --- a/source3/client/smbspool.c +++ b/source3/client/smbspool.c @@ -23,6 +23,7 @@ */ #include "includes.h" +#include "system/passwd.h" /* * Starting with CUPS 1.3, Kerberos support is provided by cupsd including diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c index d1a728abcf..00ae4a1790 100644 --- a/source3/groupdb/mapping.c +++ b/source3/groupdb/mapping.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#include "system/passwd.h" #include "groupdb/mapping.h" #include "../libcli/security/security.h" #include "lib/winbind_util.h" diff --git a/source3/include/includes.h b/source3/include/includes.h index 9aa2ae3598..de8092d396 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -72,7 +72,6 @@ #include "system/filesys.h" #include "system/locale.h" #include "system/network.h" -#include "system/passwd.h" #include "system/time.h" #include "system/wait.h" diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c index 629c4b63d7..297d387af5 100644 --- a/source3/lib/substitute.c +++ b/source3/lib/substitute.c @@ -20,6 +20,7 @@ #include "includes.h" +#include "system/passwd.h" #include "secrets.h" static char *alloc_sub_basic(const char *smb_name, const char *domain_name, diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c index 9c1256ed65..9a49c50127 100644 --- a/source3/lib/sysacls.c +++ b/source3/lib/sysacls.c @@ -20,6 +20,7 @@ */ #include "includes.h" +#include "system/passwd.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_ACLS diff --git a/source3/lib/system.c b/source3/lib/system.c index 316e8ff61b..f846dcac89 100644 --- a/source3/lib/system.c +++ b/source3/lib/system.c @@ -23,6 +23,7 @@ #include "includes.h" #include "system/syslog.h" #include "system/capability.h" +#include "system/passwd.h" #ifdef HAVE_SYS_PRCTL_H #include diff --git a/source3/lib/system_smbd.c b/source3/lib/system_smbd.c index 12538c4434..634f88ea9c 100644 --- a/source3/lib/system_smbd.c +++ b/source3/lib/system_smbd.c @@ -24,6 +24,7 @@ */ #include "includes.h" +#include "system/passwd.h" #include "nsswitch/winbind_client.h" #ifndef HAVE_GETGROUPLIST diff --git a/source3/lib/username.c b/source3/lib/username.c index 40e284a01a..d5da532124 100644 --- a/source3/lib/username.c +++ b/source3/lib/username.c @@ -20,6 +20,7 @@ */ #include "includes.h" +#include "system/passwd.h" #include "memcache.h" #include "../lib/util/util_pw.h" diff --git a/source3/lib/util.c b/source3/lib/util.c index 2690a6f649..1bd199cca6 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -22,6 +22,7 @@ */ #include "includes.h" +#include "system/passwd.h" #include "popt_common.h" #include "secrets.h" #include "ctdbd_conn.h" diff --git a/source3/libnet/libnet_dssync_passdb.c b/source3/libnet/libnet_dssync_passdb.c index d38146ed48..cd5943e5f0 100644 --- a/source3/libnet/libnet_dssync_passdb.c +++ b/source3/libnet/libnet_dssync_passdb.c @@ -18,6 +18,7 @@ */ #include "includes.h" +#include "system/passwd.h" #include "libnet/libnet_dssync.h" #include "libnet/libnet_samsync.h" #include "../libcli/security/security.h" diff --git a/source3/libnet/libnet_samsync_passdb.c b/source3/libnet/libnet_samsync_passdb.c index cfcdb7cec2..3ad9ffe652 100644 --- a/source3/libnet/libnet_samsync_passdb.c +++ b/source3/libnet/libnet_samsync_passdb.c @@ -24,6 +24,7 @@ */ #include "includes.h" +#include "system/passwd.h" #include "libnet/libnet_samsync.h" #include "../libcli/security/security.h" diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c index ecf72786f0..80366a24e6 100644 --- a/source3/passdb/passdb.c +++ b/source3/passdb/passdb.c @@ -23,6 +23,7 @@ */ #include "includes.h" +#include "system/passwd.h" #include "../libcli/auth/libcli_auth.h" #include "secrets.h" #include "../libcli/security/security.h" diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c index 046ca650cf..56b66892d0 100644 --- a/source3/passdb/pdb_interface.c +++ b/source3/passdb/pdb_interface.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#include "system/passwd.h" #include "secrets.h" #include "../librpc/gen_ndr/samr.h" #include "memcache.h" diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c index 005c23d34e..9feb9bfe3a 100644 --- a/source3/passdb/pdb_smbpasswd.c +++ b/source3/passdb/pdb_smbpasswd.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#include "system/passwd.h" #include "../librpc/gen_ndr/samr.h" #include "../libcli/security/security.h" diff --git a/source3/passdb/util_unixsids.c b/source3/passdb/util_unixsids.c index cf85a5dbf1..fba4749dbb 100644 --- a/source3/passdb/util_unixsids.c +++ b/source3/passdb/util_unixsids.c @@ -18,6 +18,7 @@ */ #include "includes.h" +#include "system/passwd.h" #include "../libcli/security/security.h" #include "../lib/util/util_pw.h" diff --git a/source3/printing/tests/vlp.c b/source3/printing/tests/vlp.c index 494a811f01..ab05a42500 100644 --- a/source3/printing/tests/vlp.c +++ b/source3/printing/tests/vlp.c @@ -20,6 +20,7 @@ */ #include "includes.h" +#include "system/passwd.h" #include "printing.h" #ifdef malloc diff --git a/source3/rpc_server/samr/srv_samr_chgpasswd.c b/source3/rpc_server/samr/srv_samr_chgpasswd.c index 4fdc7d4d3d..910b782c56 100644 --- a/source3/rpc_server/samr/srv_samr_chgpasswd.c +++ b/source3/rpc_server/samr/srv_samr_chgpasswd.c @@ -47,6 +47,7 @@ #include "includes.h" #include "system/terminal.h" +#include "system/passwd.h" #include "../libcli/auth/libcli_auth.h" #include "../lib/crypto/arcfour.h" #include "rpc_server/samr/srv_samr_util.h" diff --git a/source3/rpc_server/samr/srv_samr_nt.c b/source3/rpc_server/samr/srv_samr_nt.c index 57965cda74..cbb72f8fdd 100644 --- a/source3/rpc_server/samr/srv_samr_nt.c +++ b/source3/rpc_server/samr/srv_samr_nt.c @@ -32,6 +32,7 @@ */ #include "includes.h" +#include "system/passwd.h" #include "smbd/globals.h" #include "../libcli/auth/libcli_auth.h" #include "../librpc/gen_ndr/srv_samr.h" diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c index a0ed295ed3..5720baa4ab 100644 --- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c +++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c @@ -24,6 +24,7 @@ /* This is the implementation of the srvsvc pipe. */ #include "includes.h" +#include "system/passwd.h" #include "../librpc/gen_ndr/srv_srvsvc.h" #include "librpc/gen_ndr/messaging.h" #include "../libcli/security/security.h" diff --git a/source3/smbd/ntquotas.c b/source3/smbd/ntquotas.c index 141f1f81b2..38ee297dde 100644 --- a/source3/smbd/ntquotas.c +++ b/source3/smbd/ntquotas.c @@ -19,6 +19,7 @@ #include "includes.h" #include "../lib/util/util_pw.h" +#include "system/passwd.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_QUOTA diff --git a/source3/smbd/password.c b/source3/smbd/password.c index 15277d04b4..a7b0dd3e13 100644 --- a/source3/smbd/password.c +++ b/source3/smbd/password.c @@ -19,6 +19,7 @@ */ #include "includes.h" +#include "system/passwd.h" #include "smbd/globals.h" #include "../librpc/gen_ndr/netlogon.h" diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c index 3c4b5743f3..070c1448ee 100644 --- a/source3/smbd/uid.c +++ b/source3/smbd/uid.c @@ -18,6 +18,7 @@ */ #include "includes.h" +#include "system/passwd.h" #include "smbd/globals.h" #include "../librpc/gen_ndr/netlogon.h" #include "libcli/security/security.h" diff --git a/source3/torture/cmd_vfs.c b/source3/torture/cmd_vfs.c index 3d7420cba9..e1772dc22e 100644 --- a/source3/torture/cmd_vfs.c +++ b/source3/torture/cmd_vfs.c @@ -20,6 +20,7 @@ */ #include "includes.h" +#include "system/passwd.h" #include "vfstest.h" #include "../lib/util/util_pw.h" diff --git a/source3/utils/net_groupmap.c b/source3/utils/net_groupmap.c index 7ae348c109..6f9a6ce802 100644 --- a/source3/utils/net_groupmap.c +++ b/source3/utils/net_groupmap.c @@ -22,6 +22,7 @@ #include "includes.h" +#include "system/passwd.h" #include "utils/net.h" #include "../libcli/security/security.h" diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c index 156b85ca8c..0156660e86 100644 --- a/source3/utils/net_sam.c +++ b/source3/utils/net_sam.c @@ -19,6 +19,7 @@ #include "includes.h" +#include "system/passwd.h" #include "utils/net.h" #include "../librpc/gen_ndr/samr.h" #include "smbldap.h" diff --git a/source3/utils/net_usershare.c b/source3/utils/net_usershare.c index f0ee682aee..13b18934e8 100644 --- a/source3/utils/net_usershare.c +++ b/source3/utils/net_usershare.c @@ -19,6 +19,7 @@ */ #include "includes.h" +#include "system/passwd.h" #include "utils/net.h" #include "../libcli/security/security.h" diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c index 18d222373a..487f7a68d9 100644 --- a/source3/utils/smbpasswd.c +++ b/source3/utils/smbpasswd.c @@ -17,6 +17,7 @@ * this program; if not, see . */ #include "includes.h" +#include "system/passwd.h" #include "secrets.h" #include "../librpc/gen_ndr/samr.h" #include "../lib/util/util_pw.h" diff --git a/source3/web/cgi.c b/source3/web/cgi.c index 1c610dfd52..b783d0c9d4 100644 --- a/source3/web/cgi.c +++ b/source3/web/cgi.c @@ -18,6 +18,7 @@ #include "includes.h" +#include "system/passwd.h" #include "web/swat_proto.h" #define MAX_VARIABLES 10000 diff --git a/source3/winbindd/idmap_nss.c b/source3/winbindd/idmap_nss.c index bfdb319c90..5cd2bc24c3 100644 --- a/source3/winbindd/idmap_nss.c +++ b/source3/winbindd/idmap_nss.c @@ -20,6 +20,7 @@ */ #include "includes.h" +#include "system/passwd.h" #include "winbindd.h" #include "nsswitch/winbind_client.h" #include "idmap.h" -- cgit