[SCM] Samba Shared Repository - branch master updated

Günther Deschner gd at samba.org
Wed Apr 13 17:32:02 MDT 2011


The branch, master has been updated
       via  165521e s3: only include smb profiling where needed.
       via  1b4d27d s3-waf: add --with-profiling-data configure option.
       via  bae2ce8 s3: fix the build of --with-profiling-data.
       via  321587e s3-includes: only include acl prototypes when needed.
       via  c4331f6 s3-includes: absolutely no need to globally include debugparse.h
       via  b4e4b60 s3-includes: include lib/util/debug.h headers in includes.h not smb.h
       via  76d4ede s3-includes: remove unused schema_types enum.
       via  e782111 s3-includes: move struct pipe_open_rec to srvsvc rpc server.
      from  a21be2c Fix WAF build for sids2xids.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 165521e20d8aea1e35cc68e39ced57de64f8e560
Author: Günther Deschner <gd at samba.org>
Date:   Thu Apr 14 00:36:23 2011 +0200

    s3: only include smb profiling where needed.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Thu Apr 14 01:31:39 CEST 2011 on sn-devel-104

commit 1b4d27d45a55c66ed20de64c2fe299583a710ddd
Author: Günther Deschner <gd at samba.org>
Date:   Thu Apr 14 00:17:29 2011 +0200

    s3-waf: add --with-profiling-data configure option.
    
    Guenther

commit bae2ce805478099c1f436e42cd2f47b3ca0caefd
Author: Günther Deschner <gd at samba.org>
Date:   Thu Apr 14 00:04:08 2011 +0200

    s3: fix the build of --with-profiling-data.
    
    Guenther

commit 321587e44a337e8c47ed3a3c22dd1243d06d8a26
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 13 23:48:33 2011 +0200

    s3-includes: only include acl prototypes when needed.
    
    Guenther

commit c4331f6fcfa68822193a7ac9697d14bf8e0cde3b
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 13 23:34:51 2011 +0200

    s3-includes: absolutely no need to globally include debugparse.h
    
    Guenther

commit b4e4b60719061a04f8b21a6fd9212f1411e6a3f6
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 13 23:34:25 2011 +0200

    s3-includes: include lib/util/debug.h headers in includes.h not smb.h
    
    Guenther

commit 76d4ede6db5479c4d1436f249ddfeb355762ebc5
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 13 23:33:49 2011 +0200

    s3-includes: remove unused schema_types enum.
    
    Guenther

commit e7821116d12b94635e7a1709f60809264d397025
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 13 23:03:56 2011 +0200

    s3-includes: move struct pipe_open_rec to srvsvc rpc server.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 lib/util/debug_s3.h                       |    1 +
 source3/include/includes.h                |   28 ++--------------------------
 source3/include/proto.h                   |    5 -----
 source3/include/smb.h                     |   17 -----------------
 source3/include/smbprofile.h              |    5 +++++
 source3/lib/sysacls.c                     |   20 ++++++++++++++++++++
 source3/modules/vfs_crossrename.c         |    2 +-
 source3/modules/vfs_default.c             |    1 +
 source3/modules/vfs_hpuxacl.c             |    2 ++
 source3/modules/vfs_irixacl.c             |    2 ++
 source3/modules/vfs_posixacl.c            |    2 +-
 source3/modules/vfs_solarisacl.c          |    2 +-
 source3/modules/vfs_tru64acl.c            |    1 +
 source3/nmbd/nmbd_elections.c             |    1 +
 source3/nmbd/nmbd_incomingdgrams.c        |    1 +
 source3/nmbd/nmbd_synclists.c             |    1 +
 source3/profile/profile.c                 |    2 ++
 source3/rpc_server/srvsvc/srv_srvsvc_nt.c |    9 +++++++++
 source3/smbd/fileio.c                     |    1 +
 source3/smbd/ipc.c                        |    1 +
 source3/smbd/message.c                    |    1 +
 source3/smbd/negprot.c                    |    1 +
 source3/smbd/nttrans.c                    |    1 +
 source3/smbd/process.c                    |    1 +
 source3/smbd/reply.c                      |    1 +
 source3/smbd/sec_ctx.c                    |    1 +
 source3/smbd/server.c                     |    1 +
 source3/smbd/sesssetup.c                  |    1 +
 source3/smbd/smb2_server.c                |    1 +
 source3/smbd/statcache.c                  |    1 +
 source3/smbd/trans2.c                     |    1 +
 source3/utils/status_profile.c            |    1 +
 source3/wscript                           |    5 +++++
 source3/wscript_build                     |    2 +-
 34 files changed, 71 insertions(+), 52 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/debug_s3.h b/lib/util/debug_s3.h
index ce8869d..96b8ed7 100644
--- a/lib/util/debug_s3.h
+++ b/lib/util/debug_s3.h
@@ -18,6 +18,7 @@
 */
 
 struct messaging_context;
+struct server_id;
 void debug_message(struct messaging_context *msg_ctx, void *private_data, uint32_t msg_type, struct server_id src, DATA_BLOB *data);
 void debug_register_msgs(struct messaging_context *msg_ctx);
 bool reopen_logs( void );
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 2032db5..5d6e554 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -527,12 +527,13 @@ typedef char fstring[FSTRING_LEN];
 
 #include "../lib/util/data_blob.h"
 #include "../lib/util/time.h"
+#include "../lib/util/debug.h"
+#include "../lib/util/debug_s3.h"
 
 #include "libads/ads_status.h"
 #include "../libcli/util/error.h"
 #include "../lib/util/charset/charset.h"
 #include "dynconfig.h"
-#include "debugparse.h"
 #include "locking.h"
 #include "smb_perfcount.h"
 #include "smb.h"
@@ -561,36 +562,11 @@ enum flush_reason_enum {
     /* NUM_FLUSH_REASONS must remain the last value in the enumeration. */
     NUM_FLUSH_REASONS};
 
-#include "modules/nfs4_acls.h"
-
 /***** prototypes *****/
 #ifndef NO_PROTO_H
 #include "proto.h"
 #endif
 
-#if defined(HAVE_POSIX_ACLS)
-#include "modules/vfs_posixacl.h"
-#endif
-
-#if defined(HAVE_TRU64_ACLS)
-#include "modules/vfs_tru64acl.h"
-#endif
-
-#if defined(HAVE_SOLARIS_ACLS) || defined(HAVE_UNIXWARE_ACLS)
-#include "modules/vfs_solarisacl.h"
-#endif
-
-#if defined(HAVE_HPUX_ACLS)
-#include "modules/vfs_hpuxacl.h"
-#endif
-
-#if defined(HAVE_IRIX_ACLS)
-#include "modules/vfs_irixacl.h"
-#endif
-
-/* We need this after proto.h to reference GetTimeOfDay(). */
-#include "smbprofile.h"
-
 /* String routines */
 
 #include "srvstr.h"
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 5b96bdf..be2915f 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2647,11 +2647,6 @@ void set_server_role(void);
 uint32 get_int_param( const char* param );
 char* get_string_param( const char* param );
 
-/* The following definitions come from profile/profile.c  */
-
-void set_profile_level(int level, struct server_id src);
-bool profile_setup(struct messaging_context *msg_ctx, bool rdonly);
-
 /* The following definitions come from librpc/rpc/rpc_common.c  */
 struct ndr_interface_table;
 bool smb_register_ndr_interface(const struct ndr_interface_table *interface);
diff --git a/source3/include/smb.h b/source3/include/smb.h
index e3560a0..8ebde2f 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -70,10 +70,6 @@
 /* how long to wait for secondary SMB packets (milli-seconds) */
 #define SMB_SECONDARY_WAIT (60*1000)
 
-/* Debugging stuff */
-#include "lib/util/debug.h"
-#include "lib/util/debug_s3.h"
-
 /* this defines the error codes that receive_smb can put in smb_read_error */
 enum smb_read_errors {
 	SMB_READ_OK = 0,
@@ -696,16 +692,6 @@ struct locking_data {
         */
 };
 
-/* Used to store pipe open records for NetFileEnum() */
-
-struct pipe_open_rec {
-	struct server_id pid;
-	uid_t uid;
-	int pnum;
-	fstring name;
-};
-
-
 #define NT_HASH_LEN 16
 #define LM_HASH_LEN 16
 
@@ -1357,9 +1343,6 @@ enum printing_types {PRINT_BSD,PRINT_SYSV,PRINT_AIX,PRINT_HPUX,
 #endif /* DEVELOPER */
 };
 
-/* LDAP schema types */
-enum schema_types {SCHEMA_COMPAT, SCHEMA_AD, SCHEMA_SAMBA};
-
 /* LDAP SSL options */
 enum ldap_ssl_types {LDAP_SSL_OFF, LDAP_SSL_START_TLS};
 
diff --git a/source3/include/smbprofile.h b/source3/include/smbprofile.h
index 3041f6c..4f5b600 100644
--- a/source3/include/smbprofile.h
+++ b/source3/include/smbprofile.h
@@ -966,4 +966,9 @@ static inline uint64_t profile_timestamp(void)
 #define END_PROFILE(x)
 #endif /* WITH_PROFILE */
 
+/* The following definitions come from profile/profile.c  */
+
+void set_profile_level(int level, struct server_id src);
+bool profile_setup(struct messaging_context *msg_ctx, bool rdonly);
+
 #endif
diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c
index 9a49c50..fad717b 100644
--- a/source3/lib/sysacls.c
+++ b/source3/lib/sysacls.c
@@ -22,6 +22,26 @@
 #include "includes.h"
 #include "system/passwd.h"
 
+#if defined(HAVE_POSIX_ACLS)
+#include "modules/vfs_posixacl.h"
+#endif
+
+#if defined(HAVE_TRU64_ACLS)
+#include "modules/vfs_tru64acl.h"
+#endif
+
+#if defined(HAVE_SOLARIS_ACLS) || defined(HAVE_UNIXWARE_ACLS)
+#include "modules/vfs_solarisacl.h"
+#endif
+
+#if defined(HAVE_HPUX_ACLS)
+#include "modules/vfs_hpuxacl.h"
+#endif
+
+#if defined(HAVE_IRIX_ACLS)
+#include "modules/vfs_irixacl.h"
+#endif
+
 #undef  DBGC_CLASS
 #define DBGC_CLASS DBGC_ACLS
 
diff --git a/source3/modules/vfs_crossrename.c b/source3/modules/vfs_crossrename.c
index ffb807d..8f7c5f0 100644
--- a/source3/modules/vfs_crossrename.c
+++ b/source3/modules/vfs_crossrename.c
@@ -19,7 +19,7 @@
 #include "smbd/smbd.h"
 #include "system/filesys.h"
 #include "transfer_file.h"
-
+#include "smbprofile.h"
 
 #define MODULE "crossrename"
 static SMB_OFF_T module_sizelimit;
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index e7c6f7e..859b212 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -23,6 +23,7 @@
 #include "system/filesys.h"
 #include "smbd/smbd.h"
 #include "ntioctl.h"
+#include "smbprofile.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS
diff --git a/source3/modules/vfs_hpuxacl.c b/source3/modules/vfs_hpuxacl.c
index bd1eee6..2155945 100644
--- a/source3/modules/vfs_hpuxacl.c
+++ b/source3/modules/vfs_hpuxacl.c
@@ -49,6 +49,8 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "smbd/smbd.h"
+#include "modules/vfs_hpuxacl.h"
+
 
 /* 
  * including standard header <sys/aclv.h> 
diff --git a/source3/modules/vfs_irixacl.c b/source3/modules/vfs_irixacl.c
index 26f13cf..b14abcc 100644
--- a/source3/modules/vfs_irixacl.c
+++ b/source3/modules/vfs_irixacl.c
@@ -20,6 +20,8 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "smbd/smbd.h"
+#include "modules/vfs_irixacl.h"
+
 
 /* prototypes for private functions first - for clarity */
 
diff --git a/source3/modules/vfs_posixacl.c b/source3/modules/vfs_posixacl.c
index 539ced2..e1c5b63 100644
--- a/source3/modules/vfs_posixacl.c
+++ b/source3/modules/vfs_posixacl.c
@@ -20,7 +20,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "smbd/smbd.h"
-
+#include "modules/vfs_posixacl.h"
 
 /* prototypes for static functions first - for clarity */
 
diff --git a/source3/modules/vfs_solarisacl.c b/source3/modules/vfs_solarisacl.c
index 71da045..dabec5a 100644
--- a/source3/modules/vfs_solarisacl.c
+++ b/source3/modules/vfs_solarisacl.c
@@ -21,7 +21,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "smbd/smbd.h"
-
+#include "modules/vfs_solarisacl.h"
 
 /* typedef struct acl SOLARIS_ACE_T; */
 typedef aclent_t SOLARIS_ACE_T;
diff --git a/source3/modules/vfs_tru64acl.c b/source3/modules/vfs_tru64acl.c
index f7457af..39fc6e9 100644
--- a/source3/modules/vfs_tru64acl.c
+++ b/source3/modules/vfs_tru64acl.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "smbd/smbd.h"
+#include "modules/vfs_tru64acl.h"
 
 /* prototypes for private functions first - for clarity */
 
diff --git a/source3/nmbd/nmbd_elections.c b/source3/nmbd/nmbd_elections.c
index 4c9c9d9..899c273 100644
--- a/source3/nmbd/nmbd_elections.c
+++ b/source3/nmbd/nmbd_elections.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "nmbd/nmbd.h"
+#include "smbprofile.h"
 
 /* Election parameters. */
 extern time_t StartupTime;
diff --git a/source3/nmbd/nmbd_incomingdgrams.c b/source3/nmbd/nmbd_incomingdgrams.c
index cc657e3..6993e18 100644
--- a/source3/nmbd/nmbd_incomingdgrams.c
+++ b/source3/nmbd/nmbd_incomingdgrams.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "../librpc/gen_ndr/svcctl.h"
 #include "nmbd/nmbd.h"
+#include "smbprofile.h"
 
 extern bool found_lm_clients;
 
diff --git a/source3/nmbd/nmbd_synclists.c b/source3/nmbd/nmbd_synclists.c
index 2fd510c..fc2b25e 100644
--- a/source3/nmbd/nmbd_synclists.c
+++ b/source3/nmbd/nmbd_synclists.c
@@ -31,6 +31,7 @@
 #include "../librpc/gen_ndr/svcctl.h"
 #include "nmbd/nmbd.h"
 #include "libsmb/clirap.h"
+#include "smbprofile.h"
 
 struct sync_record {
 	struct sync_record *next, *prev;
diff --git a/source3/profile/profile.c b/source3/profile/profile.c
index 201da3e..6c47c98 100644
--- a/source3/profile/profile.c
+++ b/source3/profile/profile.c
@@ -20,7 +20,9 @@
 */
 
 #include "includes.h"
+#include "system/shmem.h"
 #include "messages.h"
+#include "smbprofile.h"
 
 #ifdef WITH_PROFILE
 #define IPC_PERMS ((S_IRUSR | S_IWUSR) | S_IRGRP | S_IROTH)
diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index df882d7..e51fee8 100644
--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -57,6 +57,15 @@ struct sess_file_count {
 	int count;
 };
 
+/* Used to store pipe open records for NetFileEnum() */
+
+struct pipe_open_rec {
+	struct server_id pid;
+	uid_t uid;
+	int pnum;
+	fstring name;
+};
+
 /****************************************************************************
  Count the entries belonging to a service in the connection db.
 ****************************************************************************/
diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c
index 460eeac..16d8853 100644
--- a/source3/smbd/fileio.c
+++ b/source3/smbd/fileio.c
@@ -23,6 +23,7 @@
 #include "printing.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
+#include "smbprofile.h"
 
 static bool setup_write_cache(files_struct *, SMB_OFF_T);
 
diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index 3fd4295..4f2fea5 100644
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -27,6 +27,7 @@
 #include "includes.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
+#include "smbprofile.h"
 
 #define NERR_notsupported 50
 
diff --git a/source3/smbd/message.c b/source3/smbd/message.c
index 1a6e9c8..34997a1 100644
--- a/source3/smbd/message.c
+++ b/source3/smbd/message.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
+#include "smbprofile.h"
 
 extern userdom_struct current_user_info;
 
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index d307c21..6877ccc 100644
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -25,6 +25,7 @@
 #include "serverid.h"
 #include "auth.h"
 #include "messages.h"
+#include "smbprofile.h"
 
 extern fstring remote_proto;
 
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 2dd5715..e1358c6 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -28,6 +28,7 @@
 #include "passdb/lookup_sid.h"
 #include "auth.h"
 #include "ntioctl.h"
+#include "smbprofile.h"
 
 extern const struct generic_mapping file_generic_mapping;
 
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index f290e1d..93f29e5 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -31,6 +31,7 @@
 #include "passdb.h"
 #include "auth.h"
 #include "messages.h"
+#include "smbprofile.h"
 
 extern bool global_machine_password_needs_changing;
 
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index cc02ae2..9659522 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -38,6 +38,7 @@
 #include "libcli/security/security.h"
 #include "libsmb/nmblib.h"
 #include "auth.h"
+#include "smbprofile.h"
 
 /****************************************************************************
  Ensure we check the path in *exactly* the same way as W2K for a findfirst/findnext
diff --git a/source3/smbd/sec_ctx.c b/source3/smbd/sec_ctx.c
index 8da1db4..f8c8847 100644
--- a/source3/smbd/sec_ctx.c
+++ b/source3/smbd/sec_ctx.c
@@ -22,6 +22,7 @@
 #include "smbd/globals.h"
 #include "libcli/security/security_token.h"
 #include "auth.h"
+#include "smbprofile.h"
 
 extern struct current_user current_user;
 
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 1948077..d3c6c18 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -40,6 +40,7 @@
 #include "passdb.h"
 #include "auth.h"
 #include "messages.h"
+#include "smbprofile.h"
 
 extern void start_epmd(struct tevent_context *ev_ctx,
 		       struct messaging_context *msg_ctx);
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 5067201..3cf6758 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -33,6 +33,7 @@
 #include "../lib/util/asn1.h"
 #include "auth.h"
 #include "messages.h"
+#include "smbprofile.h"
 
 /* For split krb5 SPNEGO blobs. */
 struct pending_auth_data {
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 50505e7..0004e7c 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -24,6 +24,7 @@
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 #include "../lib/tsocket/tsocket.h"
+#include "smbprofile.h"
 
 #define OUTVEC_ALLOC_SIZE (SMB2_HDR_BODY + 9)
 
diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c
index 40174c8..5c74b92 100644
--- a/source3/smbd/statcache.c
+++ b/source3/smbd/statcache.c
@@ -24,6 +24,7 @@
 #include "memcache.h"
 #include "smbd/smbd.h"
 #include "messages.h"
+#include "smbprofile.h"
 
 /****************************************************************************
  Stat cache code used in unix_convert.
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index fe06538..507ae9b 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -34,6 +34,7 @@
 #include "libcli/security/security.h"
 #include "trans2.h"
 #include "auth.h"
+#include "smbprofile.h"
 
 #define DIR_ENTRY_SAFETY_MARGIN 4096
 
diff --git a/source3/utils/status_profile.c b/source3/utils/status_profile.c
index 198dac6..c0eeb7a 100644
--- a/source3/utils/status_profile.c
+++ b/source3/utils/status_profile.c
@@ -19,6 +19,7 @@
  */
 
 #include "includes.h"
+#include "smbprofile.h"
 
 bool status_profile_dump(bool be_verbose);
 bool status_profile_rates(bool be_verbose);
diff --git a/source3/wscript b/source3/wscript
index ebcb1b6..cf96b39 100644


-- 
Samba Shared Repository


More information about the samba-cvs mailing list