Build status as of Wed Jul 7 06:00:01 2010
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2010-07-06 00:00:03.0 -0600 +++ /home/build/master/cache/broken_results.txt 2010-07-07 00:00:21.0 -0600 @@ -1,4 +1,4 @@ -Build status as of Tue Jul 6 06:00:01 2010 +Build status as of Wed Jul 7 06:00:01 2010 Build counts: Tree Total Broken Panic @@ -12,7 +12,7 @@ rsync30 12 0 samba-docs 0 0 0 samba-web0 0 0 -samba_3_current 28 28 4 +samba_3_current 28 28 1 samba_3_master 28 28 1 samba_3_next 28 28 2 samba_4_0_test 30 30 0
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 9c3a982... s4-ldb: added support for simple binds on ldb_ldap
backend
via 7f9153f... s4-ldb: added ldb_options_find()
from 85504ae... s4:libcli: Modify S4 client library to check for proper
CN alignment
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 9c3a9824a9165e9d7cf362d4b8c6add8ad0cc983
Author: Andrew Tridgell tri...@samba.org
Date: Tue Jul 6 15:36:21 2010 +1000
s4-ldb: added support for simple binds on ldb_ldap backend
this uses the options[] array to pass in bindMech, bindID and
bindSecret. Currently only simple is supported.
commit 7f9153f7e8a3a39d23b6b9c1336031f769dce923
Author: Andrew Tridgell tri...@samba.org
Date: Tue Jul 6 15:35:16 2010 +1000
s4-ldb: added ldb_options_find()
ldb_options_find() allows backends to find options in the options[]
array passed to the connect operation.
This will be used by the ldb_ldap bind code
---
Summary of changes:
source4/lib/ldb/common/ldb_modules.c |8 ++--
source4/lib/ldb/common/ldb_options.c | 72 +
source4/lib/ldb/config.mk |2 +-
source4/lib/ldb/include/ldb_private.h |6 +++
source4/lib/ldb/ldb.mk|2 +-
source4/lib/ldb/ldb_ldap/ldb_ldap.c | 50 +++
source4/lib/ldb/wscript |2 +-
7 files changed, 135 insertions(+), 7 deletions(-)
create mode 100644 source4/lib/ldb/common/ldb_options.c
Changeset truncated at 500 lines:
diff --git a/source4/lib/ldb/common/ldb_modules.c
b/source4/lib/ldb/common/ldb_modules.c
index 6e92fc5..e4e2c15 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -397,6 +397,7 @@ int ldb_init_module_chain(struct ldb_context *ldb, struct
ldb_module *module)
int ldb_load_modules(struct ldb_context *ldb, const char *options[])
{
+ const char *modules_string;
const char **modules = NULL;
unsigned int i;
int ret;
@@ -409,10 +410,9 @@ int ldb_load_modules(struct ldb_context *ldb, const char
*options[])
/* check if we have a custom module list passd as ldb option */
if (options) {
- for (i = 0; options[i] != NULL; i++) {
- if (strncmp(options[i], LDB_MODULE_PREFIX,
LDB_MODULE_PREFIX_LEN) == 0) {
- modules = ldb_modules_list_from_string(ldb,
mem_ctx, options[i][LDB_MODULE_PREFIX_LEN]);
- }
+ modules_string = ldb_options_find(ldb, options, modules);
+ if (modules_string) {
+ modules = ldb_modules_list_from_string(ldb, mem_ctx,
modules_string);
}
}
diff --git a/source4/lib/ldb/common/ldb_options.c
b/source4/lib/ldb/common/ldb_options.c
new file mode 100644
index 000..f806057
--- /dev/null
+++ b/source4/lib/ldb/common/ldb_options.c
@@ -0,0 +1,72 @@
+/*
+ ldb database library
+
+ Copyright (C) Andrew Tridgell 2010
+
+ ** NOTE! The following LGPL license applies to the ldb
+ ** library. This does NOT imply that all of Samba is released
+ ** under the LGPL
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, see http://www.gnu.org/licenses/.
+*/
+
+/*
+ * Name: ldb
+ *
+ * Component: ldb options[] handling
+ *
+ * Author: Andrew Tridgell
+ */
+
+#include ldb_private.h
+
+/*
+ find an option within an options array
+
+ accepts the following forms:
+
+ NAME
+ NAME:value
+ NAME=value
+
+ returns a pointer into an element of the options[] array, or NULL is
+ not found.
+
+ For the NAME form, returns a pointer to an empty string (thus
+ allowing for boolean options).
+ */
+_PRIVATE_ const char *ldb_options_find(struct ldb_context *ldb, const char
*options[],
+ const char *option_name)
+{
+ size_t len = strlen(option_name);
+ int i;
+
+ if (options == NULL) {
+ return NULL;
+ }
+
+ for (i=0; options[i]; i++) {
+ if (strncmp(option_name, options[i], len) != 0) {
+ continue;
+ }
+ if (options[i][len] == ':' || options[i][len] == '=') {
+
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 0b6cebd... s3 build: Fix *netgrent prototype detection on opensolaris from 9c3a982... s4-ldb: added support for simple binds on ldb_ldap backend http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 0b6cebd60288b37f28176e24abeb20109dfd70e5 Author: Kai Blin k...@samba.org Date: Fri Jul 2 22:35:28 2010 +0200 s3 build: Fix *netgrent prototype detection on opensolaris --- Summary of changes: source3/configure.in | 12 +--- 1 files changed, 9 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/configure.in b/source3/configure.in index 424c320..4c17e4c 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -6424,21 +6424,27 @@ CFLAGS_SAVE=$CFLAGS CFLAGS=$CFLAGS -Werror-implicit-function-declaration AC_CACHE_CHECK([for setnetgrent prototype],samba_cv_setnetgrent_prototype, [ AC_TRY_COMPILE([#includenetdb.h -#includenetgroup.h],[setnetgrent(foo)], +#ifdef HAVE_NETGROUP_H +#includenetgroup.h +#endif],[setnetgrent(foo)], samba_cv_setnetgrent_prototype=yes, samba_cv_setnetgrent_prototype=no)]) if test x$samba_cv_setnetgrent_prototype = xyes; then AC_DEFINE(HAVE_SETNETGRENT_PROTOTYPE, 1, [If setnetgrent prototype is defined]) fi AC_CACHE_CHECK([for getnetgrent prototype],samba_cv_getnetgrent_prototype, [ AC_TRY_COMPILE([#includenetdb.h -#includenetgroup.h],[char *dom, *user,*host; getnetgrent(dom,user,host)], +#ifdef HAVE_NETGROUP_H +#includenetgroup.h +#endif],[char *dom, *user,*host; getnetgrent(dom,user,host)], samba_cv_getnetgrent_prototype=yes, samba_cv_getnetgrent_prototype=no)]) if test x$samba_cv_getnetgrent_prototype = xyes; then AC_DEFINE(HAVE_GETNETGRENT_PROTOTYPE, 1, [If getnetgrent prototype is defined]) fi AC_CACHE_CHECK([for endnetgrent prototype],samba_cv_endnetgrent_prototype, [ AC_TRY_COMPILE([#includenetdb.h -#includenetgroup.h],[endnetgrent()], +#ifdef HAVE_NETGROUP_H +#includenetgroup.h +#endif],[endnetgrent()], samba_cv_endnetgrent_prototype=yes, samba_cv_endnetgrent_prototype=no)]) if test x$samba_cv_endnetgrent_prototype = xyes; then AC_DEFINE(HAVE_ENDNETGRENT_PROTOTYPE, 1, [If endnetgrent prototype is defined]) -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 87df785... s4-dsdb: use ldb_operr() in the dsdb code via fc68558... s4-ldb: added ldb_error() and ldb_operr() from 0b6cebd... s3 build: Fix *netgrent prototype detection on opensolaris http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 87df785a68c1c8043b345b71c98764ef36b76179 Author: Andrew Tridgell tri...@samba.org Date: Tue Jul 6 13:21:54 2010 +1000 s4-dsdb: use ldb_operr() in the dsdb code this replaces return LDB_ERR_OPERATIONS_ERROR with return ldb_operr(ldb) in places in the dsdb code where we don't already explicitly set an error string. This should make is much easier to track down dsdb module bugs that result in an operations error. commit fc68558ab937859a91214e8675d53c0afaf3c4e6 Author: Andrew Tridgell tri...@samba.org Date: Tue Jul 6 13:20:19 2010 +1000 s4-ldb: added ldb_error() and ldb_operr() These will be used to help avoid the problem we have with hundreds of places that do return LDB_ERR_OPERATIONS_ERROR without an explanation. It is very difficult to track down ldb errors which don't have any explanation. By replacing return LDB_ERR_OPERATIONS_ERROR; with return ldb_operr(ldb); we at least get a file:line message in the ldb error string. It isn't an ideal error message, but it is much better than just operations error This change also makes ldb_oom() return the error code (LDB_ERR_OPERATIONS_ERROR) so you can do: return ldb_oom(ldb); instead of: ldb_oom(ldb); return LDB_ERR_OPERATIONS_ERROR; --- Summary of changes: source4/dsdb/common/dsdb_access.c | 21 ++-- source4/dsdb/common/util.c | 78 ++-- source4/dsdb/repl/drepl_ridalloc.c |3 +- source4/dsdb/samdb/ldb_modules/acl.c | 55 - source4/dsdb/samdb/ldb_modules/anr.c | 25 ++--- source4/dsdb/samdb/ldb_modules/descriptor.c| 15 +-- source4/dsdb/samdb/ldb_modules/extended_dn_in.c| 20 +-- source4/dsdb/samdb/ldb_modules/extended_dn_out.c | 46 +++- source4/dsdb/samdb/ldb_modules/extended_dn_store.c | 12 +- source4/dsdb/samdb/ldb_modules/instancetype.c |8 +- source4/dsdb/samdb/ldb_modules/kludge_acl.c| 15 +-- source4/dsdb/samdb/ldb_modules/lazy_commit.c |2 +- source4/dsdb/samdb/ldb_modules/linked_attributes.c | 34 ++--- source4/dsdb/samdb/ldb_modules/local_password.c| 24 ++-- source4/dsdb/samdb/ldb_modules/naming_fsmo.c |9 +- source4/dsdb/samdb/ldb_modules/new_partition.c |5 +- source4/dsdb/samdb/ldb_modules/objectclass.c | 68 +-- source4/dsdb/samdb/ldb_modules/objectclass_attrs.c | 15 +-- source4/dsdb/samdb/ldb_modules/objectguid.c| 16 ++-- source4/dsdb/samdb/ldb_modules/operational.c | 36 +++--- source4/dsdb/samdb/ldb_modules/partition.c | 50 - source4/dsdb/samdb/ldb_modules/partition_init.c| 50 +++- source4/dsdb/samdb/ldb_modules/password_hash.c | 128 +++ source4/dsdb/samdb/ldb_modules/pdc_fsmo.c |9 +- source4/dsdb/samdb/ldb_modules/proxy.c |6 +- source4/dsdb/samdb/ldb_modules/ranged_results.c|5 +- source4/dsdb/samdb/ldb_modules/resolve_oids.c | 42 ++- source4/dsdb/samdb/ldb_modules/ridalloc.c | 15 +-- source4/dsdb/samdb/ldb_modules/rootdse.c | 39 +++ source4/dsdb/samdb/ldb_modules/samba3sid.c |6 +- source4/dsdb/samdb/ldb_modules/samba_dsdb.c| 30 ++--- source4/dsdb/samdb/ldb_modules/samba_secrets.c |6 +- source4/dsdb/samdb/ldb_modules/samldb.c| 59 +- source4/dsdb/samdb/ldb_modules/schema_data.c | 23 ++--- source4/dsdb/samdb/ldb_modules/schema_load.c |6 +- source4/dsdb/samdb/ldb_modules/show_deleted.c | 11 +- source4/dsdb/samdb/ldb_modules/simple_ldap_map.c |4 +- source4/dsdb/samdb/ldb_modules/subtree_delete.c|2 +- source4/dsdb/samdb/ldb_modules/subtree_rename.c|6 +- source4/dsdb/samdb/ldb_modules/update_keytab.c | 20 ++-- source4/dsdb/samdb/ldb_modules/util.c | 34 +++--- source4/dsdb/schema/schema_init.c |9 +- source4/dsdb/schema/schema_set.c | 13 +- source4/lib/ldb/common/ldb.c | 16 +++ source4/lib/ldb/include/ldb_module.h |6 +- source4/lib/ldb/wscript|2 +- 46 files changed, 477 insertions(+), 627 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/dsdb/common/dsdb_access.c b/source4/dsdb/common/dsdb_access.c index ac0c736..c7d8610 100644 ---
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 2c1279f... s3-build: some makefile cosmetics. via 2356496... s3-build: add IDL_FILES variable. from 87df785... s4-dsdb: use ldb_operr() in the dsdb code http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 2c1279f454124c9921bce7005b3bc8296c9fc4aa Author: Günther Deschner g...@samba.org Date: Wed Jul 7 13:40:48 2010 +0200 s3-build: some makefile cosmetics. Guenther commit 2356496ac6490aa82d37b8d9436d6d40979d2e80 Author: Günther Deschner g...@samba.org Date: Wed Jul 7 13:44:42 2010 +0200 s3-build: add IDL_FILES variable. Guenther --- Summary of changes: source3/Makefile.in | 32 source3/wscript_build |6 -- 2 files changed, 24 insertions(+), 14 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/Makefile.in b/source3/Makefile.in index 4cfcbbe..8291f41 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -322,9 +322,15 @@ LIBNDR_GEN_OBJ0 = librpc/gen_ndr/ndr_samr.o \ LIBNDR_NETLOGON_OBJ = librpc/gen_ndr/ndr_netlogon.o \ ../librpc/ndr/ndr_netlogon.o +LIBNDR_SCHANNEL_OBJ = librpc/gen_ndr/ndr_schannel.o \ + ../librpc/ndr/ndr_schannel.o + LIBNDR_SPOOLSS_OBJ = librpc/gen_ndr/ndr_spoolss.o \ ../librpc/ndr/ndr_spoolss_buf.o +LIBNDR_NTPRINTING_OBJ = librpc/gen_ndr/ndr_ntprinting.o \ + ../librpc/ndr/ndr_ntprinting.o \ + LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o \ $(LIBNDR_GEN_OBJ0) \ librpc/gen_ndr/ndr_dfs.o \ @@ -510,8 +516,7 @@ TLDAP_OBJ = lib/tldap.o lib/tldap_util.o lib/util_tsock.o SCHANNEL_OBJ = ../libcli/auth/credentials.o \ ../libcli/auth/schannel_sign.o \ ../libcli/auth/schannel_state_tdb.o \ - librpc/gen_ndr/ndr_schannel.o \ - ../librpc/ndr/ndr_schannel.o + $(LIBNDR_SCHANNEL_OBJ) LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \ libsmb/clikrb5.o libsmb/clispnego.o \ @@ -1033,8 +1038,8 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \ utils/net_serverid.o \ utils/net_eventlog.o \ utils/net_printing.o \ - librpc/gen_ndr/ndr_ntprinting.o \ - ../librpc/ndr/ndr_ntprinting.o + $(LIBNDR_NTPRINTING_OBJ) + # these are not processed by make proto NET_OBJ2 = utils/net_registry_util.o utils/net_help_common.o @@ -1414,23 +1419,26 @@ modules:: SHOWFLAGS $(MODULES) # ## Perl IDL Compiler + +IDL_FILES = librpc/idl/messaging.idl \ + librpc/idl/libnetapi.idl \ + librpc/idl/notify.idl \ + librpc/idl/wbint.idl \ + librpc/idl/perfcount.idl \ + librpc/idl/secrets.idl \ + librpc/idl/libnet_join.idl + samba3-idl:: @PIDL_OUTPUTDIR=librpc/gen_ndr PIDL_ARGS=$(PIDL_ARGS) CPP=$(CPP) PIDL=../pidl/pidl \ srcdir=$(srcdir) ../librpc/build_idl.sh ../librpc/idl/*.idl @PIDL_OUTPUTDIR=librpc/gen_ndr PIDL_ARGS=$(PIDL_ARGS) CPP=$(CPP) PIDL=../pidl/pidl \ -srcdir=$(srcdir) $(srcdir)/script/build_idl.sh \ - librpc/idl/messaging.idl librpc/idl/libnetapi.idl librpc/idl/notify.idl \ - librpc/idl/wbint.idl librpc/idl/perfcount.idl \ - librpc/idl/secrets.idl librpc/idl/libnet_join.idl +srcdir=$(srcdir) $(srcdir)/script/build_idl.sh $(IDL_FILES) idl_full:: @PIDL_OUTPUTDIR=librpc/gen_ndr PIDL_ARGS=$(PIDL_ARGS) CPP=$(CPP) PIDL=../pidl/pidl \ srcdir=$(srcdir) ../librpc/build_idl.sh --full ../librpc/idl/*.idl @PIDL_OUTPUTDIR=librpc/gen_ndr PIDL_ARGS=$(PIDL_ARGS) CPP=$(CPP) PIDL=../pidl/pidl \ -srcdir=$(srcdir) $(srcdir)/script/build_idl.sh --full \ -librpc/idl/messaging.idl librpc/idl/libnetapi.idl librpc/idl/notify.idl \ -librpc/idl/wbint.idl librpc/idl/perfcount.idl \ -librpc/idl/secrets.idl librpc/idl/libnet_join.idl +srcdir=$(srcdir) $(srcdir)/script/build_idl.sh --full $(IDL_FILES) # diff --git a/source3/wscript_build b/source3/wscript_build index 337b840..e231a41 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -62,6 +62,9 @@ LIBNDR_GEN_SRC0 = '''../librpc/gen_ndr/ndr_samr.c LIBNDR_NETLOGON_SRC = '''../librpc/gen_ndr/ndr_netlogon.c ../librpc/ndr/ndr_netlogon.c''' +LIBNDR_SCHANNEL_SRC = '''../librpc/gen_ndr/ndr_schannel.c + ../librpc/ndr/ndr_schannel.c''' + LIBNDR_SPOOLSS_SRC = '''../librpc/gen_ndr/ndr_spoolss.c ../librpc/ndr/ndr_spoolss_buf.c''' @@ -255,8 +258,7 @@ TLDAP_SRC
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via f706d1a... s3-rpc_parse: fix c++ buildwarning in prs_init().
via ca46011... s3-notify: use autogenerated FILE_NOTIFY_INFORMATION
marshalling in smbd.
via 6ab9eaf... s3-notify: add MS-CIFS 2.2.7.4.2 FILE_NOTIFY_INFORMATION
to IDL.
from 2c1279f... s3-build: some makefile cosmetics.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f706d1a96e0cc8c6b87c90becfcbfe26d314
Author: Günther Deschner g...@samba.org
Date: Wed Jul 7 14:56:14 2010 +0200
s3-rpc_parse: fix c++ buildwarning in prs_init().
Guenther
commit ca460113ea28ca82429845c2b3977989175f8ada
Author: Günther Deschner g...@samba.org
Date: Wed Jul 7 01:50:56 2010 +0200
s3-notify: use autogenerated FILE_NOTIFY_INFORMATION marshalling in smbd.
Guenther
commit 6ab9eaf90fa732153dc500087b6f7dcea2a94465
Author: Günther Deschner g...@samba.org
Date: Wed Jul 7 01:50:18 2010 +0200
s3-notify: add MS-CIFS 2.2.7.4.2 FILE_NOTIFY_INFORMATION to IDL.
Guenther
---
Summary of changes:
source3/librpc/idl/notify.idl | 19 ++
source3/rpc_parse/parse_prs.c |2 +-
source3/smbd/notify.c | 81 +++--
3 files changed, 49 insertions(+), 53 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/librpc/idl/notify.idl b/source3/librpc/idl/notify.idl
index 0e80679..040f661 100644
--- a/source3/librpc/idl/notify.idl
+++ b/source3/librpc/idl/notify.idl
@@ -60,4 +60,23 @@ interface notify
pointer private_data;
} notify_event;
+ typedef [v1_enum] enum {
+ FILE_ACTION_ADDED = 0x0001,
+ FILE_ACTION_REMOVED = 0x0002,
+ FILE_ACTION_MODIFIED= 0x0003,
+ FILE_ACTION_RENAMED_OLD_NAME= 0x0004,
+ FILE_ACTION_RENAMED_NEW_NAME= 0x0005,
+ FILE_ACTION_ADDED_STREAM= 0x0006,
+ FILE_ACTION_REMOVED_STREAM = 0x0007,
+ FILE_ACTION_MODIFIED_STREAM = 0x0008
+ } FILE_NOTIFY_ACTION;
+
+ /* structure sent at the CIFS layer */
+ /* Align on 4-byte boundary according to MS-CIFS 2.2.7.4.2 */
+ typedef [public,gensize,flag(NDR_ALIGN4)] struct {
+ uint32 NextEntryOffset;
+ FILE_NOTIFY_ACTION Action;
+ [value(strlen_m(FileName1)*2)] uint32 FileNameLength;
+ [charset(UTF16),flag(STR_NOTERM)] uint16
FileName1[FileNameLength];
+ } FILE_NOTIFY_INFORMATION;
}
diff --git a/source3/rpc_parse/parse_prs.c b/source3/rpc_parse/parse_prs.c
index af1cc3d..c460f1f 100644
--- a/source3/rpc_parse/parse_prs.c
+++ b/source3/rpc_parse/parse_prs.c
@@ -112,7 +112,7 @@ bool prs_init(prs_struct *ps, uint32 size, TALLOC_CTX *ctx,
bool io)
if (size != 0) {
ps-buffer_size = size;
- ps-data_p = talloc_zero_size(ps-mem_ctx, size);
+ ps-data_p = (char *)talloc_zero_size(ps-mem_ctx, size);
if(ps-data_p == NULL) {
DEBUG(0,(prs_init: talloc fail for %u bytes.\n,
(unsigned int)size));
return False;
diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c
index e473d99..011f38f 100644
--- a/source3/smbd/notify.c
+++ b/source3/smbd/notify.c
@@ -21,7 +21,7 @@
#include includes.h
#include smbd/globals.h
-#include ../librpc/gen_ndr/notify.h
+#include ../librpc/gen_ndr/ndr_notify.h
struct notify_change_request {
struct notify_change_request *prev, *next;
@@ -63,23 +63,19 @@ static bool notify_change_record_identical(struct
notify_change *c1,
static bool notify_marshall_changes(int num_changes,
uint32 max_offset,
struct notify_change *changes,
- prs_struct *ps)
+ DATA_BLOB *final_blob)
{
int i;
- UNISTR uni_name;
if (num_changes == -1) {
return false;
}
- uni_name.buffer = NULL;
-
for (i=0; inum_changes; i++) {
+ enum ndr_err_code ndr_err;
struct notify_change *c;
- size_t namelen;
- intrem = 0;
- uint32 u32_tmp; /* Temp arg to prs_uint32 to avoid
-* signed/unsigned issues */
+ struct FILE_NOTIFY_INFORMATION m;
+ DATA_BLOB blob;
/* Coalesce any identical records. */
while (i+1 num_changes
@@ -90,59 +86,43 @@ static bool notify_marshall_changes(int num_changes,
c = changes[i];
- if (!convert_string_talloc(talloc_tos(), CH_UNIX, CH_UTF16LE,
-
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 8def236... s3-libgpo: remove handmarshalled PReg parser from
registry CSE.
via 5f92bd8... s3-registry: add preg.idl.
from f706d1a... s3-rpc_parse: fix c++ buildwarning in prs_init().
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 8def236f187dbbb804a142124bc5042d0cc89854
Author: Günther Deschner g...@samba.org
Date: Wed Jul 7 12:36:33 2010 +0200
s3-libgpo: remove handmarshalled PReg parser from registry CSE.
Guenther
commit 5f92bd863c1f2b8b45aae8155a215366f380a0cc
Author: Günther Deschner g...@samba.org
Date: Wed Jul 7 02:45:01 2010 +0200
s3-registry: add preg.idl.
Guenther
---
Summary of changes:
source3/Makefile.in |9 +-
source3/libgpo/gpext/registry.c | 342 ++
source3/librpc/idl/preg.idl | 49 ++
source3/librpc/idl/wscript_build |2 +-
source3/librpc/ndr/ndr_preg.c| 69
source3/librpc/ndr/ndr_preg.h| 23 +++
6 files changed, 197 insertions(+), 297 deletions(-)
create mode 100644 source3/librpc/idl/preg.idl
create mode 100644 source3/librpc/ndr/ndr_preg.c
create mode 100644 source3/librpc/ndr/ndr_preg.h
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 8291f41..bb9f440 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -331,6 +331,9 @@ LIBNDR_SPOOLSS_OBJ = librpc/gen_ndr/ndr_spoolss.o \
LIBNDR_NTPRINTING_OBJ = librpc/gen_ndr/ndr_ntprinting.o \
../librpc/ndr/ndr_ntprinting.o \
+LIBNDR_PREG_OBJ = librpc/gen_ndr/ndr_preg.o \
+ librpc/ndr/ndr_preg.o
+
LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o \
$(LIBNDR_GEN_OBJ0) \
librpc/gen_ndr/ndr_dfs.o \
@@ -1038,7 +1041,8 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
utils/net_serverid.o \
utils/net_eventlog.o \
utils/net_printing.o \
- $(LIBNDR_NTPRINTING_OBJ)
+ $(LIBNDR_NTPRINTING_OBJ) \
+ $(LIBNDR_PREG_OBJ)
# these are not processed by make proto
@@ -1426,7 +1430,8 @@ IDL_FILES = librpc/idl/messaging.idl \
librpc/idl/wbint.idl \
librpc/idl/perfcount.idl \
librpc/idl/secrets.idl \
- librpc/idl/libnet_join.idl
+ librpc/idl/libnet_join.idl \
+ librpc/idl/preg.idl
samba3-idl::
@PIDL_OUTPUTDIR=librpc/gen_ndr PIDL_ARGS=$(PIDL_ARGS) CPP=$(CPP)
PIDL=../pidl/pidl \
diff --git a/source3/libgpo/gpext/registry.c b/source3/libgpo/gpext/registry.c
index a7e8a5e..90e0a69 100644
--- a/source3/libgpo/gpext/registry.c
+++ b/source3/libgpo/gpext/registry.c
@@ -1,7 +1,7 @@
/*
* Unix SMB/CIFS implementation.
* Group Policy Support
- * Copyright (C) Guenther Deschner 2007-2008
+ * Copyright (C) Guenther Deschner 2007-2008,2010
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
#include ../libgpo/gpo.h
#include libgpo/gpo_proto.h
#include registry.h
+#include ../librpc/gen_ndr/ndr_preg.h
#define GP_EXT_NAME registry
@@ -35,164 +36,11 @@
static TALLOC_CTX *ctx = NULL;
-struct gp_registry_file_header {
- uint32_t signature;
- uint32_t version;
-};
-
-struct gp_registry_file_entry {
- UNISTR key;
- UNISTR value;
- enum winreg_Type type;
- size_t size;
- uint8_t *data;
-};
-
-struct gp_registry_file {
- struct gp_registry_file_header header;
- size_t num_entries;
- struct gp_registry_entry *entries;
-};
-
-/
-/
-
-static bool reg_parse_header(const char *desc,
-struct gp_registry_file_header *header,
-prs_struct *ps,
-int depth)
-{
- if (!header)
- return false;
-
- prs_debug(ps, depth, desc, reg_parse_header);
- depth++;
-
- if (!prs_uint32(signature, ps, depth, header-signature))
- return false;
-
- if (!prs_uint32(version, ps, depth, header-version))
- return false;
-
- return true;
-}
-
-/
-/
-
-static bool reg_parse_and_verify_ucs2_char(const char *desc,
- char character,
- prs_struct *ps,
- int depth)
-{
- uint16_t tmp;
-
- if (!prs_uint16(desc, ps, depth, tmp))
- return false;
-
- if
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 519d17e... s3-rpc_misc: remove unused UNISTR.
via 7e1fa8d... s3-rpc_parse: remove finally unused prs_unistr().
from 8def236... s3-libgpo: remove handmarshalled PReg parser from
registry CSE.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 519d17e451399f09f154dc581a22e74162ff7807
Author: Günther Deschner g...@samba.org
Date: Wed Jul 7 12:40:41 2010 +0200
s3-rpc_misc: remove unused UNISTR.
Guenther
commit 7e1fa8d06774de4fa103118006309b2d1d63069b
Author: Günther Deschner g...@samba.org
Date: Wed Jul 7 12:39:46 2010 +0200
s3-rpc_parse: remove finally unused prs_unistr().
Guenther
---
Summary of changes:
source3/include/proto.h |1 -
source3/include/rpc_misc.h| 11
source3/rpc_parse/parse_prs.c | 124 -
3 files changed, 0 insertions(+), 136 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index a74373f..ee6f446 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5051,7 +5051,6 @@ bool prs_dcerpc_status(const char *name, prs_struct *ps,
int depth, NTSTATUS *st
bool prs_uint8s(bool charmode, const char *name, prs_struct *ps, int depth,
uint8 *data8s, int len);
bool prs_uint16s(bool charmode, const char *name, prs_struct *ps, int depth,
uint16 *data16s, int len);
bool prs_uint32s(bool charmode, const char *name, prs_struct *ps, int depth,
uint32 *data32s, int len);
-bool prs_unistr(const char *name, prs_struct *ps, int depth, UNISTR *str);
bool prs_init_data_blob(prs_struct *prs, DATA_BLOB *blob, TALLOC_CTX *mem_ctx);
bool prs_data_blob(prs_struct *prs, DATA_BLOB *blob, TALLOC_CTX *mem_ctx);
diff --git a/source3/include/rpc_misc.h b/source3/include/rpc_misc.h
index 85dd1ce..08ee5de 100644
--- a/source3/include/rpc_misc.h
+++ b/source3/include/rpc_misc.h
@@ -34,15 +34,4 @@
OTHER)), ((unsigned int)IVAL((hnd)-uuid.node,2)),\
((unsigned int)sys_getpid() )
-
-/**
- * UNICODE string variations
- **/
-
-
-typedef struct { /* UNISTR - unicode string size and buffer */
- uint16 *buffer; /* unicode characters. ***MUST*** be
- little-endian. ***MUST*** be null-terminated
*/
-} UNISTR;
-
#endif /* _RPC_MISC_H */
diff --git a/source3/rpc_parse/parse_prs.c b/source3/rpc_parse/parse_prs.c
index c460f1f..ec5bc9c 100644
--- a/source3/rpc_parse/parse_prs.c
+++ b/source3/rpc_parse/parse_prs.c
@@ -886,130 +886,6 @@ bool prs_uint32s(bool charmode, const char *name,
prs_struct *ps, int depth, uin
}
/***
- Stream a unicode null-terminated string. As the string is already
- in little-endian format then do it as a stream of bytes.
- /
-
-bool prs_unistr(const char *name, prs_struct *ps, int depth, UNISTR *str)
-{
- unsigned int len = 0;
- unsigned char *p = (unsigned char *)str-buffer;
- uint8 *start;
- char *q;
- uint32 max_len;
- uint16* ptr;
-
- if (MARSHALLING(ps)) {
-
- for(len = 0; str-buffer[len] != 0; len++)
- ;
-
- q = prs_mem_get(ps, (len+1)*2);
- if (q == NULL)
- return False;
-
- start = (uint8*)q;
-
- for(len = 0; str-buffer[len] != 0; len++) {
- if(ps-bigendian_data) {
- /* swap bytes - p is little endian, q is big
endian. */
- q[0] = (char)p[1];
- q[1] = (char)p[0];
- p += 2;
- q += 2;
- }
- else
- {
- q[0] = (char)p[0];
- q[1] = (char)p[1];
- p += 2;
- q += 2;
- }
- }
-
- /*
-* even if the string is 'empty' (only an \0 char)
-* at this point the leading \0 hasn't been parsed.
-* so parse it now
-*/
-
- q[0] = 0;
- q[1] = 0;
- q += 2;
-
- len++;
-
- DEBUGADD(5,(%s%04x %s: , tab_depth(5,depth), ps-data_offset,
name));
- print_asc(5, (unsigned char*)start, 2*len);
- DEBUGADD(5, (\n));
- }
- else { /* unmarshalling */
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 0da5e15... s3-winbindd: route samr chgpwd ops for own domain over
internal samr pipe as well.
from 519d17e... s3-rpc_misc: remove unused UNISTR.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0da5e153787b461ea9ba5ac5353a0046a5a26e07
Author: Günther Deschner g...@samba.org
Date: Tue Jul 6 17:02:33 2010 +0200
s3-winbindd: route samr chgpwd ops for own domain over internal samr pipe
as well.
Guenther
---
Summary of changes:
source3/winbindd/winbindd_cm.c|8 +++
source3/winbindd/winbindd_pam.c | 91 +++--
source3/winbindd/winbindd_proto.h |7 +++
source3/winbindd/winbindd_samr.c |8 ++--
4 files changed, 45 insertions(+), 69 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index fa1b78c..b300357 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -2078,6 +2078,14 @@ NTSTATUS cm_connect_sam(struct winbindd_domain *domain,
TALLOC_CTX *mem_ctx,
char *machine_account = NULL;
char *domain_name = NULL;
+ if (strequal(domain-name, get_global_sam_name())) {
+ result = open_internal_samr_conn(mem_ctx, domain, cli,
sam_handle);
+ if (!NT_STATUS_IS_OK(result)) {
+ return result;
+ }
+ return NT_STATUS_OK;
+ }
+
result = init_dc_connection_rpc(domain);
if (!NT_STATUS_IS_OK(result)) {
return result;
diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index ef8d464..bf113e8 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -31,7 +31,6 @@
#include rpc_client/cli_netlogon.h
#include smb_krb5.h
#include ../lib/crypto/arcfour.h
-#include rpc_server/srv_samr_util.h
#include ../libcli/security/dom_sid.h
#undef DBGC_CLASS
@@ -1896,13 +1895,15 @@ enum winbindd_result winbindd_dual_pam_chauthtok(struct
winbindd_domain *contact
char *oldpass;
char *newpass = NULL;
struct policy_handle dom_pol;
- struct rpc_pipe_client *cli;
+ struct rpc_pipe_client *cli = NULL;
bool got_info = false;
struct samr_DomInfo1 *info = NULL;
struct userPwdChangeFailureInformation *reject = NULL;
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
fstring domain, user;
+ ZERO_STRUCT(dom_pol);
+
DEBUG(3, ([%5lu]: dual pam chauthtok %s\n, (unsigned long)state-pid,
state-request-data.auth.user));
@@ -1918,53 +1919,6 @@ enum winbindd_result winbindd_dual_pam_chauthtok(struct
winbindd_domain *contact
/* Initialize reject reason */
state-response-data.auth.reject_reason = Undefined;
- if (strequal(domain, get_global_sam_name())) {
- struct samr_CryptPassword new_nt_password;
- struct samr_CryptPassword new_lm_password;
- struct samr_Password old_nt_hash_enc;
- struct samr_Password old_lanman_hash_enc;
- enum samPwdChangeReason rejectReason;
-
- uchar old_nt_hash[16];
- uchar old_lanman_hash[16];
- uchar new_nt_hash[16];
- uchar new_lanman_hash[16];
-
- contact_domain = NULL;
-
- E_md4hash(oldpass, old_nt_hash);
- E_md4hash(newpass, new_nt_hash);
-
- if (lp_client_lanman_auth()
- E_deshash(newpass, new_lanman_hash)
- E_deshash(oldpass, old_lanman_hash)) {
-
- /* E_deshash returns false for 'long' passwords ( 14
- DOS chars). This allows us to match Win2k, which
- does not store a LM hash for these passwords (which
- would reduce the effective password length to 14) */
-
- encode_pw_buffer(new_lm_password.data, newpass,
STR_UNICODE);
- arcfour_crypt(new_lm_password.data, old_nt_hash, 516);
- E_old_pw_hash(new_nt_hash, old_lanman_hash,
old_lanman_hash_enc.hash);
- } else {
- ZERO_STRUCT(new_lm_password);
- ZERO_STRUCT(old_lanman_hash_enc);
- }
-
- encode_pw_buffer(new_nt_password.data, newpass, STR_UNICODE);
-
- arcfour_crypt(new_nt_password.data, old_nt_hash, 516);
- E_old_pw_hash(new_nt_hash, old_nt_hash, old_nt_hash_enc.hash);
-
- result = pass_oem_change(
- user,
- new_lm_password.data, old_lanman_hash_enc.hash,
- new_nt_password.data, old_nt_hash_enc.hash,
-
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 76a084f... s3-winbindd: Fix child logfile handling which broke with
c67cff0372.
from 0da5e15... s3-winbindd: route samr chgpwd ops for own domain over
internal samr pipe as well.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 76a084feeec208aff2bbfaa45c134592c1719600
Author: Günther Deschner g...@samba.org
Date: Wed Jul 7 17:01:09 2010 +0200
s3-winbindd: Fix child logfile handling which broke with c67cff0372.
Andreas, please check.
Guenther
---
Summary of changes:
source3/winbindd/winbindd_dual.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 277b174..ed8eb13 100644
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -407,7 +407,7 @@ void setup_child(struct winbindd_domain *domain, struct
winbindd_child *child,
if (logprefix logname) {
char *logbase = NULL;
- if (lp_logfile()) {
+ if (*lp_logfile()) {
char *end = NULL;
if (asprintf(logbase, %s, lp_logfile()) 0) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 609b865... s4-dsdb/util: Reorder DSDB_FLAG_* checks via 0c4bbb7... s4-dsdb: Implement module switching in dsdb_module_search_dn() via 62a0f11... s4-source4/dsdb/samdb/ldb_modules/acl.c Use DSDB_FLAG_NEXT_MODULE flag via 02f0c6d... s4-source4/dsdb/samdb/ldb_modules/linked_attributes.c Use DSDB_FLAG_NEXT_MODULE flag via 0d2116a... s4-source4/dsdb/samdb/ldb_modules/naming_fsmo.c Use DSDB_FLAG_NEXT_MODULE flag via b18ab82... s4-source4/dsdb/samdb/ldb_modules/operational.c Use DSDB_FLAG_NEXT_MODULE flag via 7694b19... s4-source4/dsdb/samdb/ldb_modules/partition_init.c Use DSDB_FLAG_NEXT_MODULE flag via b627159... s4-source4/dsdb/samdb/ldb_modules/pdc_fsmo.c Use DSDB_FLAG_NEXT_MODULE flag via 2ee1437... s4-source4/dsdb/samdb/ldb_modules/repl_meta_data.c Use DSDB_FLAG_NEXT_MODULE flag via d7bcac5... s4-source4/dsdb/samdb/ldb_modules/ridalloc.c Use DSDB_FLAG_NEXT_MODULE flag via dc72073... s4-source4/dsdb/samdb/ldb_modules/samba_dsdb.c Use DSDB_FLAG_NEXT_MODULE flag via 8c7a6a8... s4-source4/dsdb/samdb/ldb_modules/schema_load.c Use DSDB_FLAG_NEXT_MODULE flag via 64c31b7... s4-source4/dsdb/samdb/ldb_modules/util.c Use DSDB_FLAG_NEXT_MODULE flag from 76a084f... s3-winbindd: Fix child logfile handling which broke with c67cff0372. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 609b8656910eccbb409b58050c306798be22a078 Author: Kamen Mazdrashki kame...@samba.org Date: Tue Jul 6 04:06:23 2010 +0300 s4-dsdb/util: Reorder DSDB_FLAG_* checks On good thing about having more clear function interfaces (and forcing callers to specify clearly what they want) is that now I can execute following search: git grep DSDB_FLAG_NEXT_MODULE | wc -l This showed that DSDB_FLAG_NEXT_MODULE flag is about 6 times more frequently used than DSDB_FLAG_OWN_MODULE. So this should reduce branch prediction by six times in this part of the code, right :) commit 0c4bbb7106cc2d49052eb85f995dc991b578d885 Author: Kamen Mazdrashki kame...@samba.org Date: Tue Jul 6 03:31:17 2010 +0300 s4-dsdb: Implement module switching in dsdb_module_search_dn() This allows caller to choose from where to start DN search commit 62a0f11dcbc0dbc7dbb78442d933c0fccee2282b Author: Kamen Mazdrashki kame...@samba.org Date: Tue Jul 6 03:26:03 2010 +0300 s4-source4/dsdb/samdb/ldb_modules/acl.c Use DSDB_FLAG_NEXT_MODULE flag commit 02f0c6d1ebaee211e1749c14bb351c1eaebf3948 Author: Kamen Mazdrashki kame...@samba.org Date: Tue Jul 6 03:25:41 2010 +0300 s4-source4/dsdb/samdb/ldb_modules/linked_attributes.c Use DSDB_FLAG_NEXT_MODULE flag commit 0d2116a42396546eb0de11cac6794d257e5a224e Author: Kamen Mazdrashki kame...@samba.org Date: Tue Jul 6 03:25:28 2010 +0300 s4-source4/dsdb/samdb/ldb_modules/naming_fsmo.c Use DSDB_FLAG_NEXT_MODULE flag commit b18ab826043c16adf5aafdb89e4a57be90ff8acf Author: Kamen Mazdrashki kame...@samba.org Date: Tue Jul 6 03:25:11 2010 +0300 s4-source4/dsdb/samdb/ldb_modules/operational.c Use DSDB_FLAG_NEXT_MODULE flag commit 7694b1964f0e51c5f312ef16b9f4d07d0c273bb2 Author: Kamen Mazdrashki kame...@samba.org Date: Tue Jul 6 03:24:59 2010 +0300 s4-source4/dsdb/samdb/ldb_modules/partition_init.c Use DSDB_FLAG_NEXT_MODULE flag commit b62715964a6060c002f0d6ae4ef42d8e296fc582 Author: Kamen Mazdrashki kame...@samba.org Date: Tue Jul 6 03:24:15 2010 +0300 s4-source4/dsdb/samdb/ldb_modules/pdc_fsmo.c Use DSDB_FLAG_NEXT_MODULE flag commit 2ee14378c3b9e46a71b50a37a18ae0bb2705f131 Author: Kamen Mazdrashki kame...@samba.org Date: Tue Jul 6 03:23:58 2010 +0300 s4-source4/dsdb/samdb/ldb_modules/repl_meta_data.c Use DSDB_FLAG_NEXT_MODULE flag commit d7bcac5a9f39a325d984269f7e8651870dcb82ab Author: Kamen Mazdrashki kame...@samba.org Date: Tue Jul 6 03:23:43 2010 +0300 s4-source4/dsdb/samdb/ldb_modules/ridalloc.c Use DSDB_FLAG_NEXT_MODULE flag commit dc720739ab8d966c6d7d5064281740b6b35b77bf Author: Kamen Mazdrashki kame...@samba.org Date: Tue Jul 6 03:23:21 2010 +0300 s4-source4/dsdb/samdb/ldb_modules/samba_dsdb.c Use DSDB_FLAG_NEXT_MODULE flag commit 8c7a6a8dc77fa239aca2283583d3fc858cfb8505 Author: Kamen Mazdrashki kame...@samba.org Date: Tue Jul 6 03:22:28 2010 +0300 s4-source4/dsdb/samdb/ldb_modules/schema_load.c Use DSDB_FLAG_NEXT_MODULE flag commit 64c31b7e0ae2085658ad8f5df7791b0343239276 Author: Kamen Mazdrashki kame...@samba.org Date: Tue Jul 6 03:22:09 2010 +0300 s4-source4/dsdb/samdb/ldb_modules/util.c Use DSDB_FLAG_NEXT_MODULE flag --- Summary of changes: source4/dsdb/samdb/ldb_modules/acl.c | 17 -- source4/dsdb/samdb/ldb_modules/linked_attributes.c |5 +-
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 90b1a1d... s3: Add SMB2 performance counters. from 609b865... s4-dsdb/util: Reorder DSDB_FLAG_* checks http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 90b1a1d29623c6c2abc86e2571b535a7832dd376 Author: Ira Cooper sa...@ira.wakeful.net Date: Thu Jul 1 17:51:41 2010 -0400 s3: Add SMB2 performance counters. A performance counter was added for every base type of SMB2 op. --- Summary of changes: source3/include/smbprofile.h | 87 +++- source3/profile/profile.c | 19 + source3/smbd/smb2_server.c | 77 ++- source3/utils/status_profile.c | 41 +++ 4 files changed, 203 insertions(+), 21 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/smbprofile.h b/source3/include/smbprofile.h index 5b52bad..b406c7d 100644 --- a/source3/include/smbprofile.h +++ b/source3/include/smbprofile.h @@ -26,7 +26,7 @@ #define PROF_SHMEM_KEY ((key_t)0x07021999) #define PROF_SHM_MAGIC 0x6349985 -#define PROF_SHM_VERSION 11 +#define PROF_SHM_VERSION 12 /* time values in the following structure are in microseconds */ @@ -756,6 +756,82 @@ enum profile_stats_values #define election_count __profile_stats_value(PR_VALUE_ELECTION, count) #define election_time __profile_stats_value(PR_VALUE_ELECTION, time) + PR_VALUE_SMB2_NEGPROT, +#define smb2_negprot_count __profile_stats_value(PR_VALUE_SMB2_NEGPROT, count) +#define smb2_negprot_time __profile_stats_value(PR_VALUE_SMB2_NEGPROT, time) + + PR_VALUE_SMB2_SESSSETUP, +#define smb2_sesssetup_count __profile_stats_value(PR_VALUE_SMB2_SESSSETUP, count) +#define smb2_sesssetup_time __profile_stats_value(PR_VALUE_SMB2_SESSSETUP, time) + + PR_VALUE_SMB2_LOGOFF, +#define smb2_logoff_count __profile_stats_value(PR_VALUE_SMB2_LOGOFF, count) +#define smb2_logoff_time __profile_stats_value(PR_VALUE_SMB2_LOGOFF, time) + + PR_VALUE_SMB2_TCON, +#define smb2_tcon_count __profile_stats_value(PR_VALUE_SMB2_TCON, count) +#define smb2_tcon_time __profile_stats_value(PR_VALUE_SMB2_TCON, time) + + PR_VALUE_SMB2_TDIS, +#define smb2_tdis_count __profile_stats_value(PR_VALUE_SMB2_TDIS, count) +#define smb2_tdis_time __profile_stats_value(PR_VALUE_SMB2_TDIS, time) + + PR_VALUE_SMB2_CREATE, +#define smb2_create_count __profile_stats_value(PR_VALUE_SMB2_CREATE, count) +#define smb2_create_time __profile_stats_value(PR_VALUE_SMB2_CREATE, time) + + PR_VALUE_SMB2_CLOSE, +#define smb2_close_count __profile_stats_value(PR_VALUE_SMB2_CLOSE, count) +#define smb2_close_time __profile_stats_value(PR_VALUE_SMB2_CLOSE, time) + + PR_VALUE_SMB2_FLUSH, +#define smb2_flush_count __profile_stats_value(PR_VALUE_SMB2_FLUSH, count) +#define smb2_flush_time __profile_stats_value(PR_VALUE_SMB2_FLUSH, time) + + PR_VALUE_SMB2_READ, +#define smb2_read_count __profile_stats_value(PR_VALUE_SMB2_READ, count) +#define smb2_read_time __profile_stats_value(PR_VALUE_SMB2_READ, time) + + PR_VALUE_SMB2_WRITE, +#define smb2_write_count __profile_stats_value(PR_VALUE_SMB2_WRITE, count) +#define smb2_write_time __profile_stats_value(PR_VALUE_SMB2_WRITE, time) + + PR_VALUE_SMB2_LOCK, +#define smb2_lock_count __profile_stats_value(PR_VALUE_SMB2_LOCK, count) +#define smb2_lock_time __profile_stats_value(PR_VALUE_SMB2_LOCK, time) + + PR_VALUE_SMB2_IOCTL, +#define smb2_ioctl_count __profile_stats_value(PR_VALUE_SMB2_IOCTL, count) +#define smb2_ioctl_time __profile_stats_value(PR_VALUE_SMB2_IOCTL, time) + + PR_VALUE_SMB2_CANCEL, +#define smb2_cancel_count __profile_stats_value(PR_VALUE_SMB2_CANCEL, count) +#define smb2_cancel_time __profile_stats_value(PR_VALUE_SMB2_CANCEL, time) + + PR_VALUE_SMB2_KEEPALIVE, +#define smb2_keepalive_count __profile_stats_value(PR_VALUE_SMB2_KEEPALIVE, count) +#define smb2_keepalive_time __profile_stats_value(PR_VALUE_SMB2_KEEPALIVE, time) + + PR_VALUE_SMB2_FIND, +#define smb2_find_count __profile_stats_value(PR_VALUE_SMB2_FIND, count) +#define smb2_find_time __profile_stats_value(PR_VALUE_SMB2_FIND, time) + + PR_VALUE_SMB2_NOTIFY, +#define smb2_notify_count __profile_stats_value(PR_VALUE_SMB2_NOTIFY, count) +#define smb2_notify_time __profile_stats_value(PR_VALUE_SMB2_NOTIFY, time) + + PR_VALUE_SMB2_GETINFO, +#define smb2_getinfo_count __profile_stats_value(PR_VALUE_SMB2_GETINFO, count) +#define smb2_getinfo_time __profile_stats_value(PR_VALUE_SMB2_GETINFO, time) + + PR_VALUE_SMB2_SETINFO, +#define smb2_setinfo_count __profile_stats_value(PR_VALUE_SMB2_SETINFO, count) +#define smb2_setinfo_time __profile_stats_value(PR_VALUE_SMB2_SETINFO, time) + + PR_VALUE_SMB2_BREAK, +#define smb2_break_count __profile_stats_value(PR_VALUE_SMB2_BREAK, count)
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via f0b9184... s3:winbindd_samr Do not use static contexts
from 90b1a1d... s3: Add SMB2 performance counters.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f0b918473db75ff389a7d2e3bf4a069b8b30d141
Author: Simo Sorce i...@samba.org
Date: Wed Jul 7 23:43:47 2010 -0400
s3:winbindd_samr Do not use static contexts
It is a very bad idea to use a static context within the open function.
Use the memory hierarchy to keep track of a client connection.
---
Summary of changes:
source3/winbindd/winbindd_samr.c |8
1 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_samr.c b/source3/winbindd/winbindd_samr.c
index f8004d9..a2865a0 100644
--- a/source3/winbindd/winbindd_samr.c
+++ b/source3/winbindd/winbindd_samr.c
@@ -40,7 +40,7 @@
static NTSTATUS open_internal_samr_pipe(TALLOC_CTX *mem_ctx,
struct rpc_pipe_client **samr_pipe)
{
- static struct rpc_pipe_client *cli = NULL;
+ struct rpc_pipe_client *cli = NULL;
struct auth_serversupplied_info *server_info = NULL;
NTSTATUS status;
@@ -58,7 +58,7 @@ static NTSTATUS open_internal_samr_pipe(TALLOC_CTX *mem_ctx,
}
/* create a samr connection */
- status = rpc_pipe_open_internal(talloc_autofree_context(),
+ status = rpc_pipe_open_internal(mem_ctx,
ndr_table_samr.syntax_id,
rpc_samr_dispatch,
server_info,
@@ -112,7 +112,7 @@ NTSTATUS open_internal_samr_conn(TALLOC_CTX *mem_ctx,
static NTSTATUS open_internal_lsa_pipe(TALLOC_CTX *mem_ctx,
struct rpc_pipe_client **lsa_pipe)
{
- static struct rpc_pipe_client *cli = NULL;
+ struct rpc_pipe_client *cli = NULL;
struct auth_serversupplied_info *server_info = NULL;
NTSTATUS status;
@@ -130,7 +130,7 @@ static NTSTATUS open_internal_lsa_pipe(TALLOC_CTX *mem_ctx,
}
/* create a samr connection */
- status = rpc_pipe_open_internal(talloc_autofree_context(),
+ status = rpc_pipe_open_internal(mem_ctx,
ndr_table_lsarpc.syntax_id,
rpc_lsarpc_dispatch,
server_info,
--
Samba Shared Repository
