s3-includes: only include system/passwd.h when needed.

Guenther

diff --git a/source3/auth/auth_server.c b/source3/auth/auth_server.c
index 5fee1e4881589dc2686d68d372dbf7b1e3850e95..47b6e36d6fbfdcc548b343d87235d35716662ee2 100644 (file)
--- 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 072ad8426c0be71771cf580f3ed43260f1cfab4e..5d89ca8d5d21f336590f762b8bce6573b1935397 100644 (file)
--- 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 c80ad42dd914c507379c7efc956cf01a628349dd..2add37f49d2641e36a2061abab1f7e2b3038fba0 100644 (file)
--- 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 d1a728abcf0fc6f0b8d3c1437c4d5f0e7e335d78..00ae4a1790c33e1e878f30a669873d86bc2df560 100644 (file)
--- 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 9aa2ae359856e2983f3a1252c29a32cce8d56f6e..de8092d3968782f569a59f131ed6656e3eac400b 100644 (file)
--- 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 629c4b63d760fd5adf8f45793afa764464a42109..297d387af5f4cc20d1cb82a97433a7f916bc7069 100644 (file)
--- 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 9c1256ed650039d8a4c895f9aa9b4f5a9a6dab60..9a49c5012725172351b8882ec2b2d825cecd0c68 100644 (file)
--- 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 316e8ff61bb7eecd578e6e7cd0f771e2c3e9f1ad..f846dcac8956699ec47aeed9edc63b189044e782 100644 (file)
--- 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 <sys/prctl.h>

diff --git a/source3/lib/system_smbd.c b/source3/lib/system_smbd.c
index 12538c4434fed89a9cdaaa6688d1d43c583823f6..634f88ea9c2c368d3c5241f2f162b2bc70487bd5 100644 (file)
--- 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 40e284a01a7a150878d7226ad3e98855c7f99148..d5da5321242d14d84cf36383607e09e6b0695d70 100644 (file)
--- 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 2690a6f649001cee9bc54d8581c590ba7bd8df2e..1bd199cca673bd47c38a4e1db14f5d0d50315887 100644 (file)
--- 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 d38146ed489434713c4cb6b255d82a54b406acf1..cd5943e5f0d736cdf1df64e33fff0319b3d83357 100644 (file)
--- 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 cfcdb7cec27dd348b1131701615d7278940b19b8..3ad9ffe6525f4c4888fbcca18cb9eeb11b1b6d03 100644 (file)
--- 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 ecf72786f0abfa94bbef3638e4f867529cb4b980..80366a24e64416591c8d21472651b3eac67a9450 100644 (file)
--- 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 046ca650cf08199d9ade9a7f79e19d69aae375cf..56b66892d09b57b2b217f240b6cd99cf085deac5 100644 (file)
--- 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 005c23d34ed41d8c19ad10b878e6845781d057d7..9feb9bfe3a5454ca6d6c1878510238f25d7fa17b 100644 (file)
--- 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 cf85a5dbf1c4edd0c5173fd2aaccc078e5bdba95..fba4749dbb53be7a28fa20c562f04381e5ed1b72 100644 (file)
--- 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 494a811f019940a5d00607c3504f10100dbbc0c0..ab05a425001e3d3a8b4e0691e7fef7df20552468 100644 (file)
--- 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 4fdc7d4d3dda6de53ed1f70560ff66a40b868377..910b782c569c482bb9f87236a98e2ad5123f022f 100644 (file)
--- 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 57965cda7416171525f5e496a2dceb3ac881d1d4..cbb72f8fdd2b001759471e964173275dd9812940 100644 (file)
--- 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 a0ed295ed3c1ee65e3d6ec9882661db8352c91c4..5720baa4abcafb2dd6b7eab25f774d07854faccd 100644 (file)
--- 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 141f1f81b2296675599f320d0e856443eb5e8336..38ee297dde227274f052d72fc87d2fdad3cf6d0e 100644 (file)
--- 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 15277d04b4a95f2df206f56c62f37898917ef78a..a7b0dd3e1343ff87ce963895a41c31a00ad29442 100644 (file)
--- 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 3c4b5743f3334e0ab8ea0c752dfb8be8acff9c51..070c1448eeee9a4a014bb4043e25dcd7574108c8 100644 (file)
--- 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 3d7420cba9aaa80b369f8fe421af6f8677a6e52f..e1772dc22e2b11ae0ca8ac71c21009aa7120de6f 100644 (file)
--- 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 7ae348c109cd9199d631b812e2c0d71958953417..6f9a6ce802af408e962597c01767a1044f3bcd38 100644 (file)
--- 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 156b85ca8c594797e280e9b85b3915fe9555bee7..0156660e8687c1ae7951b5c0c5e718de31fb6a36 100644 (file)
--- 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 f0ee682aee1b1610cc83186c2a84fa9e57b17c37..13b18934e825e0ff61a33c10b34b05f24f89f3e5 100644 (file)
--- 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 18d222373acacb1b5b060fe56c967f1cecf87ada..487f7a68d92c81cfd41991b82f9c4f335376b442 100644 (file)
--- a/source3/utils/smbpasswd.c
+++ b/source3/utils/smbpasswd.c
@@ -17,6 +17,7 @@
  * this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #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 1c610dfd528e24f7d6924784d5e5b0280f992736..b783d0c9d4f67b427960ca0fb490712d8c0d1588 100644 (file)
--- 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 bfdb319c90bae0fc1eeed5605e95c0a45a526b3b..5cd2bc24c36cc9053440297087c431688a14e9fd 100644 (file)
--- 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"