The branch, master has been updated via ab8219a s3-spoolss: remove unused struct in construct_notify_printer_info(). via 03b9a99 libcli/security: fix build warning, cr_descr_log_acl() is not used currently. via 73c31f0 tdb: fix a build warning. via d8cfca3 s3: only include tdb headers where needed. from 8aae59a lib/util don't use enum protocol_types in ms_fnmatch_protocol
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit ab8219a6f39360da742d0f3ca702f2173d798538 Author: Günther Deschner <g...@samba.org> Date: Thu May 5 21:52:57 2011 +0200 s3-spoolss: remove unused struct in construct_notify_printer_info(). Guenther Autobuild-User: Günther Deschner <g...@samba.org> Autobuild-Date: Fri May 6 12:07:17 CEST 2011 on sn-devel-104 commit 03b9a9938b934ff774ad49c5b409c7060e66b999 Author: Günther Deschner <g...@samba.org> Date: Thu May 5 12:52:29 2011 +0200 libcli/security: fix build warning, cr_descr_log_acl() is not used currently. Guenther commit 73c31f044e32103276558a194698ea6cf876b4f2 Author: Günther Deschner <g...@samba.org> Date: Thu May 5 12:52:05 2011 +0200 tdb: fix a build warning. Guenther commit d8cfca3a9bd2b6b6c562fd202377d95a98eb5472 Author: Günther Deschner <g...@samba.org> Date: Thu May 5 11:25:29 2011 +0200 s3: only include tdb headers where needed. Guenther ----------------------------------------------------------------------- Summary of changes: lib/tdb/pytdb.c | 1 + libcli/security/create_descriptor.c | 2 ++ source3/groupdb/mapping.c | 1 + source3/groupdb/mapping_tdb.c | 1 + source3/include/ctdbd_conn.h | 2 ++ source3/include/dbwrap.h | 2 ++ source3/include/includes.h | 3 +-- source3/include/printing.h | 7 +++++-- source3/intl/lang_tdb.c | 1 + source3/lib/ctdbd_conn.c | 1 + source3/lib/dbwrap.c | 1 + source3/lib/dbwrap_ctdb.c | 2 ++ source3/lib/dbwrap_util.c | 1 + source3/lib/eventlog/eventlog.c | 1 + source3/lib/eventlog/eventlog.h | 2 ++ source3/lib/g_lock.c | 1 + source3/lib/gencache.c | 1 + source3/lib/messages_ctdbd.c | 1 + source3/lib/server_mutex.c | 1 + source3/lib/serverid.c | 1 + source3/lib/sessionid_tdb.c | 1 + source3/lib/sharesec.c | 1 + source3/lib/talloc_dict.c | 1 + source3/lib/tdb_validate.c | 1 + source3/lib/util.c | 1 + source3/lib/util_tdb.c | 2 ++ source3/libnet/libnet_dssync_passdb.c | 1 + source3/libsmb/samlogon_cache.c | 1 + source3/libsmb/smb_share_modes.c | 1 + source3/locking/locking.c | 1 + source3/locking/posix.c | 1 + source3/modules/nfs4_acls.c | 1 + source3/modules/vfs_acl_tdb.c | 1 + source3/modules/vfs_xattr_tdb.c | 1 + source3/nmbd/nmbd_winsserver.c | 1 + source3/param/loadparm.c | 1 + source3/passdb/login_cache.c | 1 + source3/passdb/machine_account_secrets.c | 1 + source3/passdb/passdb.c | 1 + source3/passdb/pdb_tdb.c | 1 + source3/passdb/secrets.c | 1 + source3/printing/notify.c | 1 + source3/printing/nt_printing_migrate.c | 1 + source3/printing/nt_printing_tdb.c | 1 + source3/printing/printer_list.c | 1 + source3/printing/printing.c | 1 + source3/printing/printing_db.c | 3 ++- source3/printing/tests/vlp.c | 1 + source3/registry/reg_backend_db.c | 1 + source3/registry/reg_objects.c | 1 + source3/registry/reg_perfcount.c | 1 + source3/rpc_server/eventlog/srv_eventlog_nt.c | 1 + source3/rpc_server/spoolss/srv_spoolss_nt.c | 4 ++-- source3/smbd/files.c | 1 + source3/smbd/globals.c | 1 + source3/smbd/globals.h | 3 ++- source3/smbd/mangle_hash.c | 1 + source3/smbd/notify_internal.c | 1 + source3/smbd/proto.h | 3 ++- source3/smbd/statcache.c | 3 ++- source3/torture/mangle_test.c | 1 + source3/torture/torture.c | 1 + source3/utils/net_idmap.c | 1 + source3/utils/net_idmap_check.c | 1 + source3/utils/net_printing.c | 1 + source3/utils/smbcontrol.c | 1 + source3/winbindd/idmap_autorid.c | 1 + source3/winbindd/idmap_tdb.c | 1 + source3/winbindd/idmap_tdb2.c | 1 + source3/winbindd/winbindd_cache.c | 1 + 70 files changed, 85 insertions(+), 10 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/tdb/pytdb.c b/lib/tdb/pytdb.c index 0faba56..3dd785e 100644 --- a/lib/tdb/pytdb.c +++ b/lib/tdb/pytdb.c @@ -558,6 +558,7 @@ static PyMethodDef tdb_methods[] = { { NULL } }; +void inittdb(void); void inittdb(void) { PyObject *m; diff --git a/libcli/security/create_descriptor.c b/libcli/security/create_descriptor.c index 62919a1..9252896 100644 --- a/libcli/security/create_descriptor.c +++ b/libcli/security/create_descriptor.c @@ -305,6 +305,7 @@ static void cr_descr_log_descriptor(struct security_descriptor *sd, } } +#if 0 static void cr_descr_log_acl(struct security_acl *acl, const char *message, int level) @@ -318,6 +319,7 @@ static void cr_descr_log_acl(struct security_acl *acl, DEBUG(level,("%s: NULL\n", message)); } } +#endif static bool compute_acl(struct security_descriptor *parent_sd, struct security_descriptor *creator_sd, diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c index d35f3c5..04af27b 100644 --- a/source3/groupdb/mapping.c +++ b/source3/groupdb/mapping.c @@ -26,6 +26,7 @@ #include "groupdb/mapping.h" #include "../libcli/security/security.h" #include "lib/winbind_util.h" +#include <tdb.h> static const struct mapping_backend *backend; diff --git a/source3/groupdb/mapping_tdb.c b/source3/groupdb/mapping_tdb.c index 1137b8f..60cdbf1 100644 --- a/source3/groupdb/mapping_tdb.c +++ b/source3/groupdb/mapping_tdb.c @@ -25,6 +25,7 @@ #include "passdb.h" #include "groupdb/mapping.h" #include "dbwrap.h" +#include "util_tdb.h" #include "../libcli/security/security.h" static struct db_context *db; /* used for driver files */ diff --git a/source3/include/ctdbd_conn.h b/source3/include/ctdbd_conn.h index ef291fb..36b6542 100644 --- a/source3/include/ctdbd_conn.h +++ b/source3/include/ctdbd_conn.h @@ -20,6 +20,8 @@ #ifndef _CTDBD_CONN_H #define _CTDBD_CONN_H +#include <tdb.h> + struct ctdbd_connection; struct messaging_context; struct messaging_rec; diff --git a/source3/include/dbwrap.h b/source3/include/dbwrap.h index ef35b00..d657ee7 100644 --- a/source3/include/dbwrap.h +++ b/source3/include/dbwrap.h @@ -20,6 +20,8 @@ #ifndef __DBWRAP_H__ #define __DBWRAP_H__ +#include <tdb.h> + struct db_record { TDB_DATA key, value; NTSTATUS (*store)(struct db_record *rec, TDB_DATA data, int flag); diff --git a/source3/include/includes.h b/source3/include/includes.h index 59aa45a..ddac6d0 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -510,8 +510,6 @@ typedef char fstring[FSTRING_LEN]; #include "../lib/util/attr.h" #include "../lib/util/tsort.h" #include "../lib/util/dlinklist.h" -#include <tdb.h> -#include "util_tdb.h" #include <talloc.h> @@ -522,6 +520,7 @@ typedef char fstring[FSTRING_LEN]; #include "../lib/util/debug.h" #include "../lib/util/debug_s3.h" +#include "../libcli/util/ntstatus.h" #include "libads/ads_status.h" #include "../libcli/util/error.h" #include "../lib/util/charset/charset.h" diff --git a/source3/include/printing.h b/source3/include/printing.h index 084c699..bba7d53 100644 --- a/source3/include/printing.h +++ b/source3/include/printing.h @@ -158,9 +158,12 @@ extern struct printif iprint_printif; /* There can be this many printing tdb's open, plus any locked ones. */ #define MAX_PRINT_DBS_OPEN 1 +struct TDB_DATA; +struct tdb_context; + struct tdb_print_db { struct tdb_print_db *next, *prev; - TDB_CONTEXT *tdb; + struct tdb_context *tdb; int ref_count; fstring printer_name; }; @@ -249,7 +252,7 @@ uint32_t print_parse_jobid(const char *fname); struct tdb_print_db *get_print_db_byname(const char *printername); void release_print_db( struct tdb_print_db *pdb); void close_all_print_db(void); -TDB_DATA get_printer_notify_pid_list(TDB_CONTEXT *tdb, const char *printer_name, bool cleanlist); +struct TDB_DATA get_printer_notify_pid_list(struct tdb_context *tdb, const char *printer_name, bool cleanlist); void print_queue_receive(struct messaging_context *msg, void *private_data, diff --git a/source3/intl/lang_tdb.c b/source3/intl/lang_tdb.c index 15793b7..c6206c1 100644 --- a/source3/intl/lang_tdb.c +++ b/source3/intl/lang_tdb.c @@ -20,6 +20,7 @@ #include "includes.h" #include "system/filesys.h" #include "intl/lang_tdb.h" +#include "util_tdb.h" static TDB_CONTEXT *tdb; diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c index 9c353ba..d271869 100644 --- a/source3/lib/ctdbd_conn.c +++ b/source3/lib/ctdbd_conn.c @@ -19,6 +19,7 @@ */ #include "includes.h" +#include "util_tdb.h" #ifdef CLUSTER_SUPPORT diff --git a/source3/lib/dbwrap.c b/source3/lib/dbwrap.c index 4e7346c..9b3197f 100644 --- a/source3/lib/dbwrap.c +++ b/source3/lib/dbwrap.c @@ -21,6 +21,7 @@ #include "includes.h" #include "dbwrap.h" +#include "util_tdb.h" #ifdef CLUSTER_SUPPORT #include "ctdb_private.h" #endif diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c index f9a7dd6..298f4c1 100644 --- a/source3/lib/dbwrap_ctdb.c +++ b/source3/lib/dbwrap_ctdb.c @@ -20,6 +20,8 @@ #include "includes.h" #include "system/filesys.h" +#include "lib/util/tdb_wrap.h" +#include "util_tdb.h" #ifdef CLUSTER_SUPPORT #include "ctdb.h" #include "ctdb_private.h" diff --git a/source3/lib/dbwrap_util.c b/source3/lib/dbwrap_util.c index 35f8a14..365f0a0 100644 --- a/source3/lib/dbwrap_util.c +++ b/source3/lib/dbwrap_util.c @@ -21,6 +21,7 @@ #include "includes.h" #include "dbwrap.h" +#include "util_tdb.h" int32_t dbwrap_fetch_int32(struct db_context *db, const char *keystr) { diff --git a/source3/lib/eventlog/eventlog.c b/source3/lib/eventlog/eventlog.c index 4941199..0ff0cb1 100644 --- a/source3/lib/eventlog/eventlog.c +++ b/source3/lib/eventlog/eventlog.c @@ -24,6 +24,7 @@ #include "system/filesys.h" #include "lib/eventlog/eventlog.h" #include "../libcli/security/security.h" +#include "util_tdb.h" /* maintain a list of open eventlog tdbs with reference counts */ diff --git a/source3/lib/eventlog/eventlog.h b/source3/lib/eventlog/eventlog.h index 29c25c3..b485bfe 100644 --- a/source3/lib/eventlog/eventlog.h +++ b/source3/lib/eventlog/eventlog.h @@ -17,6 +17,8 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ +#include <tdb.h> + /* Defines for TDB keys */ #define EVT_OLDEST_ENTRY "INFO/oldest_entry" #define EVT_NEXT_RECORD "INFO/next_record" diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c index 184da9b..c3d863f 100644 --- a/source3/lib/g_lock.c +++ b/source3/lib/g_lock.c @@ -20,6 +20,7 @@ #include "includes.h" #include "system/filesys.h" #include "g_lock.h" +#include "util_tdb.h" #include "ctdbd_conn.h" #include "../lib/util/select.h" #include "system/select.h" diff --git a/source3/lib/gencache.c b/source3/lib/gencache.c index 19cc7c9..7a86063 100644 --- a/source3/lib/gencache.c +++ b/source3/lib/gencache.c @@ -24,6 +24,7 @@ #include "includes.h" #include "system/filesys.h" #include "system/glob.h" +#include "util_tdb.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_TDB diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c index 3e2fde0..70f29b7 100644 --- a/source3/lib/messages_ctdbd.c +++ b/source3/lib/messages_ctdbd.c @@ -19,6 +19,7 @@ #include "includes.h" #include "messages.h" +#include "util_tdb.h" #ifdef CLUSTER_SUPPORT diff --git a/source3/lib/server_mutex.c b/source3/lib/server_mutex.c index 9d38907..6eac318 100644 --- a/source3/lib/server_mutex.c +++ b/source3/lib/server_mutex.c @@ -21,6 +21,7 @@ #include "includes.h" #include "system/filesys.h" #include "lib/util/tdb_wrap.h" +#include "util_tdb.h" /* For reasons known only to MS, many of their NT/Win2k versions need serialised access only. Two connections at the same time diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c index 7105e17..b1f6a57 100644 --- a/source3/lib/serverid.c +++ b/source3/lib/serverid.c @@ -20,6 +20,7 @@ #include "includes.h" #include "system/filesys.h" #include "serverid.h" +#include "util_tdb.h" #include "dbwrap.h" #include "lib/util/tdb_wrap.h" diff --git a/source3/lib/sessionid_tdb.c b/source3/lib/sessionid_tdb.c index ab54ec9..de3ccab 100644 --- a/source3/lib/sessionid_tdb.c +++ b/source3/lib/sessionid_tdb.c @@ -21,6 +21,7 @@ #include "system/filesys.h" #include "dbwrap.h" #include "session.h" +#include "util_tdb.h" static struct db_context *session_db_ctx(void) { diff --git a/source3/lib/sharesec.c b/source3/lib/sharesec.c index c84e8fa..c2494e2 100644 --- a/source3/lib/sharesec.c +++ b/source3/lib/sharesec.c @@ -22,6 +22,7 @@ #include "../libcli/security/security.h" #include "../librpc/gen_ndr/ndr_security.h" #include "dbwrap.h" +#include "util_tdb.h" /******************************************************************* Create the share security tdb. diff --git a/source3/lib/talloc_dict.c b/source3/lib/talloc_dict.c index cbe5c7b..95ae0a3 100644 --- a/source3/lib/talloc_dict.c +++ b/source3/lib/talloc_dict.c @@ -20,6 +20,7 @@ #include "includes.h" #include "dbwrap.h" #include "talloc_dict.h" +#include "util_tdb.h" struct talloc_dict { struct db_context *db; diff --git a/source3/lib/tdb_validate.c b/source3/lib/tdb_validate.c index b91ea7a..7dd7dae 100644 --- a/source3/lib/tdb_validate.c +++ b/source3/lib/tdb_validate.c @@ -21,6 +21,7 @@ #include "includes.h" #include "system/filesys.h" +#include "util_tdb.h" #include "tdb_validate.h" /* diff --git a/source3/lib/util.c b/source3/lib/util.c index db92f3c..8d90569 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -24,6 +24,7 @@ #include "includes.h" #include "system/passwd.h" #include "system/filesys.h" +#include "util_tdb.h" #include "ctdbd_conn.h" #include "../lib/util/util_pw.h" #include "messages.h" diff --git a/source3/lib/util_tdb.c b/source3/lib/util_tdb.c index 2aff935..654a538 100644 --- a/source3/lib/util_tdb.c +++ b/source3/lib/util_tdb.c @@ -21,6 +21,8 @@ #include "includes.h" #include "system/filesys.h" +#include "util_tdb.h" + #undef malloc #undef realloc #undef calloc diff --git a/source3/libnet/libnet_dssync_passdb.c b/source3/libnet/libnet_dssync_passdb.c index 349b25a..b8675d3 100644 --- a/source3/libnet/libnet_dssync_passdb.c +++ b/source3/libnet/libnet_dssync_passdb.c @@ -23,6 +23,7 @@ #include "../libcli/security/security.h" #include "../libds/common/flags.h" #include "../librpc/gen_ndr/ndr_drsuapi.h" +#include "util_tdb.h" #include "dbwrap.h" #include "../libds/common/flag_mapping.h" #include "passdb.h" diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c index facdbc7..590c950 100644 --- a/source3/libsmb/samlogon_cache.c +++ b/source3/libsmb/samlogon_cache.c @@ -25,6 +25,7 @@ #include "system/filesys.h" #include "librpc/gen_ndr/ndr_krb5pac.h" #include "../libcli/security/security.h" +#include "util_tdb.h" #define NETSAMLOGON_TDB "netsamlogon_cache.tdb" diff --git a/source3/libsmb/smb_share_modes.c b/source3/libsmb/smb_share_modes.c index 1a6c212..76e63e6 100644 --- a/source3/libsmb/smb_share_modes.c +++ b/source3/libsmb/smb_share_modes.c @@ -27,6 +27,7 @@ #include "includes.h" #include "system/filesys.h" #include "smb_share_modes.h" +#include <tdb.h> /* Database context handle. */ struct smbdb_ctx { diff --git a/source3/locking/locking.c b/source3/locking/locking.c index 1f63bdd..9bb3b9c 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -43,6 +43,7 @@ #include "../libcli/security/security.h" #include "serverid.h" #include "messages.h" +#include "util_tdb.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_LOCKING diff --git a/source3/locking/posix.c b/source3/locking/posix.c index cea8d2f..3f1aa6d 100644 --- a/source3/locking/posix.c +++ b/source3/locking/posix.c @@ -25,6 +25,7 @@ #include "system/filesys.h" #include "locking/proto.h" #include "dbwrap.h" +#include "util_tdb.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_LOCKING diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c index 14d4644..91e98f6 100644 --- a/source3/modules/nfs4_acls.c +++ b/source3/modules/nfs4_acls.c @@ -26,6 +26,7 @@ #include "include/dbwrap.h" #include "system/filesys.h" #include "passdb/lookup_sid.h" +#include "util_tdb.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_ACLS diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c index f2e0415..1e33131 100644 --- a/source3/modules/vfs_acl_tdb.c +++ b/source3/modules/vfs_acl_tdb.c @@ -28,6 +28,7 @@ #include "../lib/crypto/crypto.h" #include "dbwrap.h" #include "auth.h" +#include "util_tdb.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_VFS diff --git a/source3/modules/vfs_xattr_tdb.c b/source3/modules/vfs_xattr_tdb.c index b8281dd..2cfea9c 100644 --- a/source3/modules/vfs_xattr_tdb.c +++ b/source3/modules/vfs_xattr_tdb.c @@ -24,6 +24,7 @@ #include "librpc/gen_ndr/ndr_xattr.h" #include "../librpc/gen_ndr/ndr_netlogon.h" #include "dbwrap.h" +#include "util_tdb.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_VFS diff --git a/source3/nmbd/nmbd_winsserver.c b/source3/nmbd/nmbd_winsserver.c index 976b990..d569154 100644 --- a/source3/nmbd/nmbd_winsserver.c +++ b/source3/nmbd/nmbd_winsserver.c @@ -23,6 +23,7 @@ #include "includes.h" #include "system/filesys.h" #include "nmbd/nmbd.h" +#include "util_tdb.h" #define WINS_LIST "wins.dat" #define WINS_VERSION 1 diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index cfe8668..bf504a4 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -53,6 +53,7 @@ #include "includes.h" #include "system/filesys.h" +#include "util_tdb.h" #include "printing.h" #include "lib/smbconf/smbconf.h" #include "lib/smbconf/smbconf_init.h" diff --git a/source3/passdb/login_cache.c b/source3/passdb/login_cache.c index 1785a4d..629f8a7 100644 --- a/source3/passdb/login_cache.c +++ b/source3/passdb/login_cache.c @@ -20,6 +20,7 @@ #include "includes.h" #include "system/filesys.h" #include "passdb.h" +#include "util_tdb.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_PASSDB diff --git a/source3/passdb/machine_account_secrets.c b/source3/passdb/machine_account_secrets.c index a51a99c..61894d4 100644 --- a/source3/passdb/machine_account_secrets.c +++ b/source3/passdb/machine_account_secrets.c @@ -28,6 +28,7 @@ #include "secrets.h" #include "dbwrap.h" #include "../librpc/ndr/libndr.h" +#include "util_tdb.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_PASSDB diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c index a2fc12a..992f1b8 100644 --- a/source3/passdb/passdb.c +++ b/source3/passdb/passdb.c @@ -29,6 +29,7 @@ #include "secrets.h" #include "../libcli/security/security.h" -- Samba Shared Repository