[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-182-g664f2fc
The branch, v4-0-test has been updated via 664f2fc49f32a081f14638571ee0db01a7863347 (commit) from fee7ea7080ec40182efc6ffe57b267444eb9389a (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log - commit 664f2fc49f32a081f14638571ee0db01a7863347 Author: Andrew Bartlett [EMAIL PROTECTED] Date: Wed Apr 16 09:02:12 2008 +0200 Now that we don't create a new event context, don't free it. This previously would free the torture provided global event context. Andrew Bartlett --- Summary of changes: source/lib/messaging/tests/messaging.c |1 - 1 files changed, 0 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/lib/messaging/tests/messaging.c b/source/lib/messaging/tests/messaging.c index 45b5735..f66b3a5 100644 --- a/source/lib/messaging/tests/messaging.c +++ b/source/lib/messaging/tests/messaging.c @@ -134,7 +134,6 @@ static bool test_ping_speed(struct torture_context *tctx) talloc_free(msg_client_ctx); talloc_free(msg_server_ctx); - talloc_free(ev); return true; } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0pre2-716-g93ab530
The branch, v3-2-stable has been updated
via 93ab530b6a12a779aa4f5065465c8aba96094c6d (commit)
from ca4725b0cc17b0fabe59856723f1eb715874b0a5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable
- Log -
commit 93ab530b6a12a779aa4f5065465c8aba96094c6d
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Fri Feb 29 05:51:09 2008 -0800
Fix part of bug #3617 from valgrind trace.
Invalid read of size 1 errors.
Jeremy.
(cherry picked from commit d954a4954ba8ed6cb2c6074176a6008cfa398dd7)
---
Summary of changes:
source/nmbd/nmbd_namelistdb.c |1 -
source/nmbd/nmbd_nameregister.c |6 --
2 files changed, 4 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/nmbd/nmbd_namelistdb.c b/source/nmbd/nmbd_namelistdb.c
index f9cbcf4..6570fd4 100644
--- a/source/nmbd/nmbd_namelistdb.c
+++ b/source/nmbd/nmbd_namelistdb.c
@@ -297,7 +297,6 @@ void standard_success_register(struct subnet_record *subrec,
**/
void standard_fail_register( struct subnet_record *subrec,
- struct response_record *rrec,
struct nmb_name*nmbname )
{
struct name_record *namerec;
diff --git a/source/nmbd/nmbd_nameregister.c b/source/nmbd/nmbd_nameregister.c
index edcf258..98f129a 100644
--- a/source/nmbd/nmbd_nameregister.c
+++ b/source/nmbd/nmbd_nameregister.c
@@ -152,10 +152,11 @@ static void register_name_response(struct subnet_record
*subrec,
if( rrec-success_fn)
(*(register_name_success_function)rrec-success_fn)(subrec, rrec-userdata,
answer_name, nb_flags, ttl, register_ip);
} else {
+ struct nmb_name qname = *question_name;
if( rrec-fail_fn)
(*(register_name_fail_function)rrec-fail_fn)(subrec,
rrec, question_name);
/* Remove the name. */
- standard_fail_register( subrec, rrec, question_name);
+ standard_fail_register( subrec, qname);
}
/* Ensure we don't retry. */
@@ -280,10 +281,11 @@ static void register_name_timeout_response(struct
subnet_record *subrec,
if( rrec-success_fn)
(*(register_name_success_function)rrec-success_fn)(subrec, rrec-userdata,
question_name, nb_flags, ttl, registered_ip);
} else {
+ struct nmb_name qname = *question_name;
if( rrec-fail_fn)
(*(register_name_fail_function)rrec-fail_fn)(subrec,
rrec, question_name);
/* Remove the name. */
- standard_fail_register( subrec, rrec, question_name);
+ standard_fail_register( subrec, qname);
}
/* Ensure we don't retry. */
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-940-ge68daef
The branch, v3-2-test has been updated
via e68daef0ee051515c8f489820fde9110747e8aa6 (commit)
from 4868b4ea1a18d4218330c49bf57818c4b5117d1d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit e68daef0ee051515c8f489820fde9110747e8aa6
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Apr 16 02:45:00 2008 +0200
net: Remove unused rpc_user_add/del_internals code.
Guenther
---
Summary of changes:
source/utils/net_rpc.c | 257
1 files changed, 0 insertions(+), 257 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c
index d0e0487..9394779 100644
--- a/source/utils/net_rpc.c
+++ b/source/utils/net_rpc.c
@@ -571,156 +571,6 @@ static int rpc_user_usage(int argc, const char **argv)
/**
* Add a new user to a remote RPC server
*
- * All parameters are provided by the run_rpc_command function, except for
- * argc, argv which are passes through.
- *
- * @param domain_sid The domain sid acquired from the remote server
- * @param cli A cli_state connected to the server.
- * @param mem_ctx Talloc context, destoyed on completion of the function.
- * @param argc Standard main() style argc
- * @param argv Standard main() style argv. Initial components are already
- * stripped
- *
- * @return Normal NTSTATUS return.
- **/
-
-static NTSTATUS rpc_user_add_internals(const DOM_SID *domain_sid,
- const char *domain_name,
- struct cli_state *cli,
- struct rpc_pipe_client *pipe_hnd,
- TALLOC_CTX *mem_ctx,
- int argc, const char **argv)
-{
-
- POLICY_HND connect_pol, domain_pol, user_pol;
- NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
- const char *acct_name;
- struct lsa_String lsa_acct_name;
- uint32 acb_info;
- uint32 acct_flags, user_rid;
- uint32_t access_granted = 0;
- struct samr_Ids user_rids, name_types;
-
- if (argc 1) {
- d_printf(User must be specified\n);
- rpc_user_usage(argc, argv);
- return NT_STATUS_OK;
- }
-
- acct_name = argv[0];
- init_lsa_String(lsa_acct_name, acct_name);
-
- /* Get sam policy handle */
-
- result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
- pipe_hnd-cli-desthost,
- MAXIMUM_ALLOWED_ACCESS,
- connect_pol);
- if (!NT_STATUS_IS_OK(result)) {
- goto done;
- }
-
- /* Get domain policy handle */
-
- result = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
- connect_pol,
- MAXIMUM_ALLOWED_ACCESS,
- CONST_DISCARD(struct dom_sid2 *,
domain_sid),
- domain_pol);
- if (!NT_STATUS_IS_OK(result)) {
- goto done;
- }
-
- /* Create domain user */
-
- acb_info = ACB_NORMAL;
- acct_flags = SEC_GENERIC_READ | SEC_GENERIC_WRITE | SEC_GENERIC_EXECUTE
|
-SEC_STD_WRITE_DAC | SEC_STD_DELETE |
-SAMR_USER_ACCESS_SET_PASSWORD |
-SAMR_USER_ACCESS_GET_ATTRIBUTES |
-SAMR_USER_ACCESS_SET_ATTRIBUTES;
-
- result = rpccli_samr_CreateUser2(pipe_hnd, mem_ctx,
-domain_pol,
-lsa_acct_name,
-acb_info,
-acct_flags,
-user_pol,
-access_granted,
-user_rid);
-
- if (!NT_STATUS_IS_OK(result)) {
- goto done;
- }
-
- if (argc == 2) {
-
- union samr_UserInfo info;
- uchar pwbuf[516];
-
- result = rpccli_samr_LookupNames(pipe_hnd, mem_ctx,
-domain_pol,
-1,
-lsa_acct_name,
-user_rids,
-name_types);
-
- if (!NT_STATUS_IS_OK(result)) {
- goto done;
- }
-
- result = rpccli_samr_OpenUser(pipe_hnd, mem_ctx,
- domain_pol,
- MAXIMUM_ALLOWED_ACCESS,
-
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-941-g01bc4b6
The branch, v3-2-test has been updated via 01bc4b6ac03b98c2371b4dfc0948f5ef8d06bcbc (commit) from e68daef0ee051515c8f489820fde9110747e8aa6 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 01bc4b6ac03b98c2371b4dfc0948f5ef8d06bcbc Author: Günther Deschner [EMAIL PROTECTED] Date: Wed Apr 16 10:03:06 2008 +0200 libnetapi: Add initial inline doxygen comments. Guenther --- Summary of changes: source/lib/netapi/netapi.h | 231 +--- 1 files changed, 195 insertions(+), 36 deletions(-) Changeset truncated at 500 lines: diff --git a/source/lib/netapi/netapi.h b/source/lib/netapi/netapi.h index e933815..e9fcc37 100644 --- a/source/lib/netapi/netapi.h +++ b/source/lib/netapi/netapi.h @@ -179,9 +179,23 @@ const char *libnetapi_get_error_string(struct libnetapi_ctx *ctx, NET_API_STATUS NetApiBufferFree(void *buffer); -/ - NetJoinDomain -/ +///** + * + * NetJoinDomain + * + * @brief Join a computer to a domain or workgroup + * + * @param[in] server The server name to connect to + * @param[in] domain The domain or workgroup to join + * @param[in] account_ou The organizational Unit to create the computer account + * in (AD only) + * @param[in] account The domain account used for joining a domain + * @param[in] password The domain account's password used for joining a domain + * @param[in] join_flags Bitmask field to define specific join features + * @return NET_API_STATUS + * + * example netdomjoin/netdomjoin.c + ***/ NET_API_STATUS NetJoinDomain(const char * server /* [in] */, const char * domain /* [in] [ref] */, @@ -190,26 +204,62 @@ NET_API_STATUS NetJoinDomain(const char * server /* [in] */, const char * password /* [in] */, uint32_t join_flags /* [in] */); -/ - NetUnjoinDomain -/ +///** + * + * NetUnjoinDomain + * + * @brief Unjoin a computer from a domain or workgroup + * + * @param[in] server_name The server name to connect to + * @param[in] account The domain account used for unjoining a domain + * @param[in] password The domain account's password used for unjoining a domain + * @param[in] unjoin_flags Bitmask field to define specific unjoin features + * @return NET_API_STATUS + * + ***/ NET_API_STATUS NetUnjoinDomain(const char * server_name /* [in] */, const char * account /* [in] */, const char * password /* [in] */, uint32_t unjoin_flags /* [in] */); -/ - NetGetJoinInformation -/ +///** + * + * NetGetJoinInformation + * + * @brief Unjoin a computer from a domain or workgroup + * + * @param[in] server_name The server name to connect to + * @param[out] name_buffer Returns the name of the workgroup or domain + * @param[out] name_type Returns the type of that name + * @return NET_API_STATUS + * + * example netdomjoin-gui/netdomjoin-gui.c + * + ***/ NET_API_STATUS NetGetJoinInformation(const char * server_name /* [in] */, const char * *name_buffer /* [out] [ref] */, uint16_t *name_type /* [out] [ref] */); -/ - NetGetJoinableOUs -/ +///** + * + * NetGetJoinableOUs + * + * @brief Query for the list of joinable organizational Units that can be used + * for joining AD + * + * @param[in] server_name The server name to connect to + * @param[in] domain The AD domain to query + * @param[in] account The domain account used for the query + * @param[in] password The domain account's password used for the query + * @param[out] ou_count The number of ous returned + * @param[out] ous Returned string array containing the ous + * @return NET_API_STATUS + * + * example netdomjoin-gui/netdomjoin-gui.c + * + ***/ NET_API_STATUS
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-186-g49367e0
The branch, v4-0-test has been updated
via 49367e044e3ab94639ab3209bfd06c6286b44b59 (commit)
via 9b364bf390524fa34db1b3d7e6f875a6b8f35f24 (commit)
via 690924dc7f43b69b9c4cfc1dd0c9c6e83d333518 (commit)
via 38ed501ac8993e84ea7f02d4633bc83b490dfe61 (commit)
from 664f2fc49f32a081f14638571ee0db01a7863347 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit 49367e044e3ab94639ab3209bfd06c6286b44b59
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Wed Apr 16 14:52:29 2008 +0200
Use the subunit shell library.
commit 9b364bf390524fa34db1b3d7e6f875a6b8f35f24
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Wed Apr 16 14:41:42 2008 +0200
Remove policy library - it's now in a separate git repository.
commit 690924dc7f43b69b9c4cfc1dd0c9c6e83d333518
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Wed Apr 16 12:34:53 2008 +0200
Use library for subunit test functions.
commit 38ed501ac8993e84ea7f02d4633bc83b490dfe61
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Wed Apr 16 11:43:37 2008 +0200
make sure header can be included more than once.
---
Summary of changes:
source/lib/basic.mk |1 -
source/lib/policy/adm.h | 47 -
source/lib/policy/config.mk | 14 -
source/lib/policy/dumpadm.c | 54 -
source/lib/policy/lex.c | 2085 --
source/lib/policy/lex.l | 142 ---
source/lib/policy/parse_adm.c| 1726
source/lib/policy/parse_adm.h| 135 ---
source/lib/policy/parse_adm.y| 138 ---
source/scripting/python/pyrpc.h |5 +
source/torture/config.mk |2 -
testprogs/blackbox/subunit.sh| 67 ++
testprogs/blackbox/test_cifsdd.sh| 24 +-
testprogs/blackbox/test_gentest.sh | 15 +-
testprogs/blackbox/test_kinit.sh | 16 +-
testprogs/blackbox/test_ldb.sh |2 +
testprogs/blackbox/test_locktest.sh | 15 +-
testprogs/blackbox/test_masktest.sh | 15 +-
testprogs/blackbox/test_ndrdump.sh | 17 +-
testprogs/blackbox/test_smbclient.sh | 15 +-
testprogs/blackbox/test_wbinfo.sh| 15 +-
21 files changed, 86 insertions(+), 4464 deletions(-)
delete mode 100644 source/lib/policy/adm.h
delete mode 100644 source/lib/policy/config.mk
delete mode 100644 source/lib/policy/dumpadm.c
delete mode 100644 source/lib/policy/lex.c
delete mode 100644 source/lib/policy/lex.l
delete mode 100644 source/lib/policy/parse_adm.c
delete mode 100644 source/lib/policy/parse_adm.h
delete mode 100644 source/lib/policy/parse_adm.y
create mode 100755 testprogs/blackbox/subunit.sh
Changeset truncated at 500 lines:
diff --git a/source/lib/basic.mk b/source/lib/basic.mk
index a021512..71acb94 100644
--- a/source/lib/basic.mk
+++ b/source/lib/basic.mk
@@ -5,7 +5,6 @@ mkinclude charset/config.mk
mkinclude ldb-samba/config.mk
mkinclude tls/config.mk
mkinclude registry/config.mk
-mkinclude policy/config.mk
mkinclude messaging/config.mk
mkinclude events/config.mk
mkinclude cmdline/config.mk
diff --git a/source/lib/policy/adm.h b/source/lib/policy/adm.h
deleted file mode 100644
index c541ced..000
--- a/source/lib/policy/adm.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- Copyright (C) 2006 Wilco Baan Hofman [EMAIL PROTECTED]
- Copyright (C) 2006 Jelmer Vernooij [EMAIL PROTECTED]
-
- 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
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#ifndef __ADM_H__
-#define __ADM_H__
-
-struct adm_file {
- struct adm_class *classes;
-};
-
-struct adm_class {
- struct adm_category *categories;
-};
-
-struct adm_category {
- struct adm_category *subcategories;
- struct adm_policy *policies;
-};
-
-struct adm_policy {
- struct adm_part *parts;
-};
-
-struct adm_part {
- int dummy;
-};
-
-struct adm_file *adm_read_file(const char *);
-
-#endif /* __ADM_H__ */
diff --git a/source/lib/policy/config.mk b/source/lib/policy/config.mk
deleted file mode 100644
index 9a8e60b..000
--- a/source/lib/policy/config.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-[SUBSYSTEM::LIBPOLICY]
-CFLAGS =
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-942-g359921a
The branch, v3-2-test has been updated
via 359921acd436684a0b4cf76ba15f82a224d2c337 (commit)
from 01bc4b6ac03b98c2371b4dfc0948f5ef8d06bcbc (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 359921acd436684a0b4cf76ba15f82a224d2c337
Author: Gerald W. Carter [EMAIL PROTECTED]
Date: Wed Apr 16 15:48:00 2008 +0200
Fix out of tree build. Remove the embedded srcdir path from talloc and tdb.
---
Summary of changes:
source/Makefile.in |4 ++--
source/configure.in|4 ++--
source/lib/talloc/libtalloc.m4 |8
3 files changed, 8 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/Makefile.in b/source/Makefile.in
index a2c826f..a599b23 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -151,7 +151,7 @@ [EMAIL PROTECTED]@
[EMAIL PROTECTED]@
LIBTDB=$(LIBTDB_STATIC_TARGET) @LIBTDB_SHARED@
LIBTDB_SYMS=$(srcdir)/exports/libtdb.syms
[EMAIL PROTECTED]@/include/tdb.h
+LIBTDB_HEADERS=$(srcdir)/@tdbdir@/include/tdb.h
LIBSMBCLIENT=bin/libsmbclient.a @LIBSMBCLIENT_SHARED@
LIBSMBSHAREMODES=bin/libsmbsharemodes.a @LIBSMBSHAREMODES_SHARED@
@@ -2131,7 +2131,7 @@ installlibtalloc: installdirs libtalloc
-$(INSTALLLIBCMD_SH) $(LIBTALLOC_SHARED_TARGET) $(DESTDIR)$(LIBDIR)
-$(INSTALLLIBCMD_A) $(LIBTALLOC_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN)
$(DESTDIR) ${prefix}/include
- -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) @tallocdir@/talloc.h
$(DESTDIR)${prefix}/include
+ -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/@tallocdir@/talloc.h
$(DESTDIR)${prefix}/include
installlibtdb: installdirs libtdb
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN)
$(DESTDIR) $(LIBDIR)
diff --git a/source/configure.in b/source/configure.in
index 01808a4..98ce92c 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -33,9 +33,9 @@ AC_SUBST(TALLOC_OBJS)
# TODO: These should come from m4_include(lib/tdb/libtdb.m4)
# but currently this fails: things have to get merged from s4.
-tdbdir=${srcdir-.}/lib/tdb
+tdbdir=lib/tdb
AC_SUBST(tdbdir)
-TDB_CFLAGS=-I$tdbdir/include
+TDB_CFLAGS=-I${srcdir-.}/$tdbdir/include
AC_SUBST(TDB_CFLAGS)
TDB_OBJ=common/tdb.o common/dump.o common/transaction.o common/error.o
common/traverse.o
TDB_OBJ=$TDB_OBJ common/freelist.o common/freelistcheck.o common/io.o
common/lock.o common/open.o
diff --git a/source/lib/talloc/libtalloc.m4 b/source/lib/talloc/libtalloc.m4
index d2e8eba..fd2b4b2 100644
--- a/source/lib/talloc/libtalloc.m4
+++ b/source/lib/talloc/libtalloc.m4
@@ -1,10 +1,10 @@
dnl find the talloc sources. This is meant to work both for
dnl talloc standalone builds, and builds of packages using talloc
tallocdir=
-tallocpaths=$srcdir $srcdir/lib/talloc $srcdir/talloc $srcdir/../talloc
+tallocpaths=. lib/talloc talloc ../talloc
for d in $tallocpaths; do
- if test -f $d/talloc.c; then
- tallocdir=$d
+ if test -f $srcdir/$d/talloc.c; then
+ tallocdir=$d
AC_SUBST(tallocdir)
break;
fi
@@ -15,7 +15,7 @@ fi
TALLOC_OBJ=talloc.o
AC_SUBST(TALLOC_OBJ)
-TALLOC_CFLAGS=-I$tallocdir
+TALLOC_CFLAGS=-I$srcdir/$tallocdir
AC_SUBST(TALLOC_CFLAGS)
TALLOC_LIBS=
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-943-gce7025d
The branch, v3-2-test has been updated
via ce7025df2958dac284ec9e5ce47ab172c3aa2567 (commit)
from 359921acd436684a0b4cf76ba15f82a224d2c337 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit ce7025df2958dac284ec9e5ce47ab172c3aa2567
Author: Björn Jacke [EMAIL PROTECTED]
Date: Wed Apr 9 16:27:20 2008 +0200
add AC_TRY_RUN_STRICT support for Sun Studio compiler
---
Summary of changes:
source/configure.in | 12
1 files changed, 12 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/configure.in b/source/configure.in
index 98ce92c..07e5bbe 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -307,6 +307,18 @@ AC_CACHE_CHECK([that the C compiler understands
-w2],samba_cv_HAVE_w2, [
samba_cv_HAVE_w2=yes,samba_cv_HAVE_w2=no,samba_cv_HAVE_w2=cross)])
if test x$samba_cv_HAVE_w2 = xyes; then
Werror_FLAGS=-w2
+else
+dnl Check if the C compiler understands -errwarn
+AC_CACHE_CHECK([that the C compiler understands
-errwarn],samba_cv_HAVE_errwarn, [
+ AC_TRY_RUN_STRICT([
+ int main(void)
+ {
+ return 0;
+ }],[-errwarn=%all],[$CPPFLAGS],[$LDFLAGS],
+
samba_cv_HAVE_errwarn=yes,samba_cv_HAVE_errwarn=no,samba_cv_HAVE_errwarn=cross)])
+if test x$samba_cv_HAVE_errwarn = xyes; then
+ Werror_FLAGS=-errwarn=%all
+fi
fi
fi
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0pre2-719-g42d606b
The branch, v3-2-stable has been updated
via 42d606bb90b73b561c4570e3b9ebece0abb9633c (commit)
from 4c20bd30fa5e9ee698148c50bc908a9d56496c5a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable
- Log -
commit 42d606bb90b73b561c4570e3b9ebece0abb9633c
Author: Björn Jacke [EMAIL PROTECTED]
Date: Wed Apr 9 16:27:20 2008 +0200
add AC_TRY_RUN_STRICT support for Sun Studio compiler
(cherry picked from commit ce7025df2958dac284ec9e5ce47ab172c3aa2567)
---
Summary of changes:
source/configure.in | 12
1 files changed, 12 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/configure.in b/source/configure.in
index 8e12919..7d6b189 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -305,6 +305,18 @@ AC_CACHE_CHECK([that the C compiler understands
-w2],samba_cv_HAVE_w2, [
samba_cv_HAVE_w2=yes,samba_cv_HAVE_w2=no,samba_cv_HAVE_w2=cross)])
if test x$samba_cv_HAVE_w2 = xyes; then
Werror_FLAGS=-w2
+else
+dnl Check if the C compiler understands -errwarn
+AC_CACHE_CHECK([that the C compiler understands
-errwarn],samba_cv_HAVE_errwarn, [
+ AC_TRY_RUN_STRICT([
+ int main(void)
+ {
+ return 0;
+ }],[-errwarn=%all],[$CPPFLAGS],[$LDFLAGS],
+
samba_cv_HAVE_errwarn=yes,samba_cv_HAVE_errwarn=no,samba_cv_HAVE_errwarn=cross)])
+if test x$samba_cv_HAVE_errwarn = xyes; then
+ Werror_FLAGS=-errwarn=%all
+fi
fi
fi
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-187-g356a5d2
The branch, v4-0-test has been updated
via 356a5d24747bb5e1ef9774c690a5ec386a4a165e (commit)
from 49367e044e3ab94639ab3209bfd06c6286b44b59 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit 356a5d24747bb5e1ef9774c690a5ec386a4a165e
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Wed Apr 16 17:21:48 2008 +0200
Provide stubs when the [todo] attribute is set.
---
Summary of changes:
source/librpc/idl/policyagent.idl |2 +-
source/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm | 54 +-
2 files changed, 42 insertions(+), 14 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/idl/policyagent.idl
b/source/librpc/idl/policyagent.idl
index 295b70a..ab137fa 100644
--- a/source/librpc/idl/policyagent.idl
+++ b/source/librpc/idl/policyagent.idl
@@ -9,5 +9,5 @@
{
/*/
/* Function 0x00 */
- WERROR policyagent_Dummy();
+ [todo] WERROR policyagent_Dummy();
}
diff --git a/source/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
b/source/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
index e9c158e..f8209be 100644
--- a/source/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
+++ b/source/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
@@ -7,6 +7,7 @@
package Parse::Pidl::Samba4::NDR::Client;
use Parse::Pidl::Samba4 qw(choose_header is_intree);
+use Parse::Pidl::Util qw(has_property);
use vars qw($VERSION);
$VERSION = '0.01';
@@ -15,30 +16,45 @@ use strict;
my($res,$res_hdr);
-#
-# parse a function
-sub ParseFunction($$)
+sub ParseFunctionSend($$$)
{
- my ($interface, $fn) = @_;
- my $name = $fn-{NAME};
+ my ($interface, $fn, $name) = @_;
my $uname = uc $name;
- $res_hdr .= \nstruct rpc_request *dcerpc_$name\_send(struct
dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct $name *r);
-NTSTATUS dcerpc_$name(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct $name
*r);
-;
+ my $proto = struct rpc_request *dcerpc_$name\_send(struct dcerpc_pipe
*p, TALLOC_CTX *mem_ctx, struct $name *r);
- $res .=
-struct rpc_request *dcerpc_$name\_send(struct dcerpc_pipe *p, TALLOC_CTX
*mem_ctx, struct $name *r)
-{
+ $res_hdr .= \n$proto;\n;
+
+ $res .= $proto\n{\n;
+
+ if (has_property($fn, todo)) {
+ $res .= \treturn NULL;\n;
+ } else {
+ $res .=
if (p-conn-flags DCERPC_DEBUG_PRINT_IN) {
NDR_PRINT_IN_DEBUG($name, r);
}
return dcerpc_ndr_request_send(p, NULL, ndr_table_$interface-{NAME},
NDR_$uname, mem_ctx, r);
+;
+ }
+
+ $res .= }\n\n;
}
-NTSTATUS dcerpc_$name(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct $name
*r)
+sub ParseFunctionSync($$$)
{
+ my ($interface, $fn, $name) = @_;
+
+ my $proto = NTSTATUS dcerpc_$name(struct dcerpc_pipe *p, TALLOC_CTX
*mem_ctx, struct $name *r);
+
+ $res_hdr .= \n$proto;\n;
+ $res .= $proto\n{\n;
+
+ if (has_property($fn, todo)) {
+ $res .= \treturn NT_STATUS_NOT_IMPLEMENTED;\n;
+ } else {
+ $res .=
struct rpc_request *req;
NTSTATUS status;
@@ -58,8 +74,20 @@ NTSTATUS dcerpc_$name(struct dcerpc_pipe *p, TALLOC_CTX
*mem_ctx, struct $name *
$res .=
return status;
-}
;
+ }
+
+ $res .= }\n\n;
+}
+
+#
+# parse a function
+sub ParseFunction($$)
+{
+ my ($interface, $fn) = @_;
+
+ ParseFunctionSend($interface, $fn, $fn-{NAME});
+ ParseFunctionSync($interface, $fn, $fn-{NAME});
}
my %done;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-192-geab5f6a
The branch, v4-0-test has been updated
via eab5f6a7f5efa8608cb23af2cab8ab19f9f62485 (commit)
via 29d5de9e8fb69346e29a95c6fcaefabd018c9447 (commit)
via 18dd8120cc35fe3d1cd4455c1f6a32b503274d97 (commit)
via df05f118831245bdb19573711545bdb1b01a0c50 (commit)
via 86694d429d62940882ac9b7af83b3e7d00e67c5a (commit)
from 356a5d24747bb5e1ef9774c690a5ec386a4a165e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit eab5f6a7f5efa8608cb23af2cab8ab19f9f62485
Merge: 29d5de9e8fb69346e29a95c6fcaefabd018c9447
356a5d24747bb5e1ef9774c690a5ec386a4a165e
Author: Andrew Bartlett [EMAIL PROTECTED]
Date: Wed Apr 16 17:35:32 2008 +0200
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into
4-0-abartlet
commit 29d5de9e8fb69346e29a95c6fcaefabd018c9447
Author: Andrew Bartlett [EMAIL PROTECTED]
Date: Wed Apr 16 17:33:58 2008 +0200
Adjust the expectations of the struct based winbind test.
These expectations (such as what happens when we have no trusted
domains) were incorrect, compared with Samba3 (which is the reference
for this protocol).
Andrew Bartlett
commit 18dd8120cc35fe3d1cd4455c1f6a32b503274d97
Merge: df05f118831245bdb19573711545bdb1b01a0c50
49367e044e3ab94639ab3209bfd06c6286b44b59
Author: Andrew Bartlett [EMAIL PROTECTED]
Date: Wed Apr 16 16:12:58 2008 +0200
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into
4-0-abartlet
commit df05f118831245bdb19573711545bdb1b01a0c50
Author: Andrew Bartlett [EMAIL PROTECTED]
Date: Wed Apr 16 16:11:17 2008 +0200
Fix struct_based winbind test for 'check machine account'.
The problem here was that we did not fill in the error strings in the
success case, and the testsuite checked against the incorrect
'freindly' error string.
Andrew Bartlett
commit 86694d429d62940882ac9b7af83b3e7d00e67c5a
Author: Andrew Bartlett [EMAIL PROTECTED]
Date: Wed Apr 16 16:10:16 2008 +0200
Fix wbinfo --trusted-domains.
The problems here were that we did not bind to the LSA pipe, and we
did not consider it possible to have 0 trusted domains.
Andrew Bartlett
---
Summary of changes:
source/selftest/samba4_tests.sh |2 +-
source/torture/winbind/struct_based.c | 23 +++
source/winbind/wb_cmd_list_trustdom.c |3 ++-
source/winbind/wb_connect_lsa.c | 11 +++
source/winbind/wb_samba3_cmd.c|9 +
testprogs/blackbox/test_wbinfo.sh |5 ++---
6 files changed, 32 insertions(+), 21 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/selftest/samba4_tests.sh b/source/selftest/samba4_tests.sh
index a021fff..730846d 100755
--- a/source/selftest/samba4_tests.sh
+++ b/source/selftest/samba4_tests.sh
@@ -301,7 +301,7 @@ for t in $NBT_TESTS; do
plansmbtorturetest $t dc //\$SERVER/_none_ -U\$USERNAME%\$PASSWORD
done
-WB_OPTS=--option=\torture:strict mode=yes\
+WB_OPTS=--option=\torture:strict mode=no\
WB_OPTS=${WB_OPTS} --option=\torture:timelimit=1\
WB_OPTS=${WB_OPTS} --option=\torture:winbindd separator=/\
WB_OPTS=${WB_OPTS} --option=\torture:winbindd private pipe
dir=\$WINBINDD_PRIV_PIPE_DIR\
diff --git a/source/torture/winbind/struct_based.c
b/source/torture/winbind/struct_based.c
index 51ac0e6..87378aa 100644
--- a/source/torture/winbind/struct_based.c
+++ b/source/torture/winbind/struct_based.c
@@ -262,7 +262,7 @@ static bool torture_winbind_struct_check_machacc(struct
torture_context *torture
torture_assert_str_equal(torture,
rep.data.auth.error_string,
-nt_errstr(NT_STATUS_OK),
+get_friendly_nt_error_msg(NT_STATUS_OK),
WINBINDD_CHECK_MACHACC ok: error_string);
torture_assert_int_equal(torture,
@@ -295,6 +295,10 @@ static bool get_trusted_domains(struct torture_context
*torture,
DO_STRUCT_REQ_REP(WINBINDD_LIST_TRUSTDOM, req, rep);
extra_data = (char *)rep.extra_data.data;
+ if (!extra_data) {
+ return true;
+ }
+
torture_assert(torture, extra_data, NULL trust list);
while (next_token(extra_data, line, \n, sizeof(fstring))) {
@@ -356,7 +360,6 @@ static bool torture_winbind_struct_list_trustdom(struct
torture_context *torture
DO_STRUCT_REQ_REP(WINBINDD_LIST_TRUSTDOM, req, rep);
list1 = (char *)rep.extra_data.data;
- torture_assert(torture, list1, NULL trust list);
torture_comment(torture, %s\n, list1);
@@ -368,7 +371,6 @@ static bool torture_winbind_struct_list_trustdom(struct
torture_context *torture
DO_STRUCT_REQ_REP(WINBINDD_LIST_TRUSTDOM, req, rep);
list2 = (char *)rep.extra_data.data;
-
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-194-gb175e7b
The branch, v4-0-test has been updated via b175e7bf16eb26c0bae9731a9147d1d379ca (commit) via dedbeea4d28ae10a15766e38e59593a2799183f3 (commit) from eab5f6a7f5efa8608cb23af2cab8ab19f9f62485 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log - commit b175e7bf16eb26c0bae9731a9147d1d379ca Merge: dedbeea4d28ae10a15766e38e59593a2799183f3 eab5f6a7f5efa8608cb23af2cab8ab19f9f62485 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Wed Apr 16 18:17:10 2008 +0200 Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test commit dedbeea4d28ae10a15766e38e59593a2799183f3 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Wed Apr 16 18:11:37 2008 +0200 Fix todo element on actually implemented function. --- Summary of changes: source/librpc/idl/drsuapi.idl |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/librpc/idl/drsuapi.idl b/source/librpc/idl/drsuapi.idl index 9652571..2f48287 100644 --- a/source/librpc/idl/drsuapi.idl +++ b/source/librpc/idl/drsuapi.idl @@ -849,7 +849,7 @@ interface drsuapi [case(1)] drsuapi_DsNameCtr1 *ctr1; } drsuapi_DsNameCtr; - [todo] WERROR drsuapi_DsCrackNames( + WERROR drsuapi_DsCrackNames( [in] policy_handle *bind_handle, [in, out] int32 level, [in,switch_is(level)] drsuapi_DsNameRequest req, -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-195-gd408047
The branch, v4-0-test has been updated
via d40804777edf41889bd461f63f7a07cc1cc60e27 (commit)
from b175e7bf16eb26c0bae9731a9147d1d379ca (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit d40804777edf41889bd461f63f7a07cc1cc60e27
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Wed Apr 16 22:30:15 2008 +0200
Avoid event_find_context() when the event context is already available
in the net utility.
---
Summary of changes:
source/utils/net/net.c |1 +
source/utils/net/net.h |1 +
source/utils/net/net_join.c |2 +-
source/utils/net/net_password.c |4 ++--
source/utils/net/net_time.c |2 +-
source/utils/net/net_user.c |4 ++--
source/utils/net/net_vampire.c |6 +++---
7 files changed, 11 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/utils/net/net.c b/source/utils/net/net.c
index 6086a4c..ab81f07 100644
--- a/source/utils/net/net.c
+++ b/source/utils/net/net.c
@@ -199,6 +199,7 @@ static int binary_net(int argc, const char **argv)
ZERO_STRUCTP(ctx);
ctx-lp_ctx = cmdline_lp_ctx;
ctx-credentials = cmdline_credentials;
+ ctx-event_ctx = ev;
cli_credentials_set_event_context(ctx-credentials, ev);
rc = net_run_function(ctx, argc_new-1, argv_new+1, net_functable,
net_usage);
diff --git a/source/utils/net/net.h b/source/utils/net/net.h
index 1738807..309bee2 100644
--- a/source/utils/net/net.h
+++ b/source/utils/net/net.h
@@ -24,6 +24,7 @@
struct net_context {
struct cli_credentials *credentials;
struct loadparm_context *lp_ctx;
+ struct event_context *event_ctx;
};
struct net_functable {
diff --git a/source/utils/net/net_join.c b/source/utils/net/net_join.c
index 37b3c21..ad63340 100644
--- a/source/utils/net/net_join.c
+++ b/source/utils/net/net_join.c
@@ -58,7 +58,7 @@ int net_join(struct net_context *ctx, int argc, const char
**argv)
domain_name = tmp;
- libnetctx = libnet_context_init(event_context_find(ctx), ctx-lp_ctx);
+ libnetctx = libnet_context_init(ctx-event_ctx, ctx-lp_ctx);
if (!libnetctx) {
return -1;
}
diff --git a/source/utils/net/net_password.c b/source/utils/net/net_password.c
index 97bb467..55f7c3c 100644
--- a/source/utils/net/net_password.c
+++ b/source/utils/net/net_password.c
@@ -53,7 +53,7 @@ static int net_password_change(struct net_context *ctx, int
argc, const char **a
new_password = getpass(password_prompt);
}
- libnetctx = libnet_context_init(event_context_find(ctx), ctx-lp_ctx);
+ libnetctx = libnet_context_init(ctx-event_ctx, ctx-lp_ctx);
if (!libnetctx) {
return -1;
}
@@ -128,7 +128,7 @@ static int net_password_set(struct net_context *ctx, int
argc, const char **argv
new_password = getpass(password_prompt);
}
- libnetctx = libnet_context_init(event_context_find(ctx), ctx-lp_ctx);
+ libnetctx = libnet_context_init(ctx-event_ctx, ctx-lp_ctx);
if (!libnetctx) {
return -1;
}
diff --git a/source/utils/net/net_time.c b/source/utils/net/net_time.c
index 12a8132..92e6e77 100644
--- a/source/utils/net/net_time.c
+++ b/source/utils/net/net_time.c
@@ -43,7 +43,7 @@ int net_time(struct net_context *ctx, int argc, const char
**argv)
return net_time_usage(ctx, argc, argv);
}
- libnetctx = libnet_context_init(event_context_find(ctx), ctx-lp_ctx);
+ libnetctx = libnet_context_init(ctx-event_ctx, ctx-lp_ctx);
if (!libnetctx) {
return -1;
}
diff --git a/source/utils/net/net_user.c b/source/utils/net/net_user.c
index 57cef6b..c4b8ecb 100644
--- a/source/utils/net/net_user.c
+++ b/source/utils/net/net_user.c
@@ -44,7 +44,7 @@ static int net_user_add(struct net_context *ctx, int argc,
const char **argv)
}
/* libnet context init and its params */
- lnet_ctx = libnet_context_init(event_context_find(ctx), ctx-lp_ctx);
+ lnet_ctx = libnet_context_init(ctx-event_ctx, ctx-lp_ctx);
if (!lnet_ctx) return -1;
lnet_ctx-cred = ctx-credentials;
@@ -84,7 +84,7 @@ static int net_user_delete(struct net_context *ctx, int argc,
const char **argv)
}
/* libnet context init and its params */
- lnet_ctx = libnet_context_init(event_context_find(ctx), ctx-lp_ctx);
+ lnet_ctx = libnet_context_init(ctx-event_ctx, ctx-lp_ctx);
if (!lnet_ctx) return -1;
lnet_ctx-cred = ctx-credentials;
diff --git a/source/utils/net/net_vampire.c b/source/utils/net/net_vampire.c
index 38f0535..14f6a07 100644
--- a/source/utils/net/net_vampire.c
+++ b/source/utils/net/net_vampire.c
@@ -54,7 +54,7 @@
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-944-g518f4d4
The branch, v3-2-test has been updated
via 518f4d4e6662138a2e71acc2296acedefc7c739a (commit)
from ce7025df2958dac284ec9e5ce47ab172c3aa2567 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 518f4d4e6662138a2e71acc2296acedefc7c739a
Author: Michael Adam [EMAIL PROTECTED]
Date: Wed Apr 16 22:42:49 2008 +0200
libsmbconf: fix segfault in listing share names / config.
Discovered by Günther while giving a talk. - Sorry Günther!
Michael
---
Summary of changes:
source/lib/smbconf/smbconf_reg.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/smbconf/smbconf_reg.c b/source/lib/smbconf/smbconf_reg.c
index 39b05f7..930999c 100644
--- a/source/lib/smbconf/smbconf_reg.c
+++ b/source/lib/smbconf/smbconf_reg.c
@@ -784,7 +784,7 @@ static WERROR smbconf_reg_get_share_names(struct
smbconf_ctx *ctx,
/* make sure global is always listed first */
if (smbconf_share_exists(ctx, GLOBAL_NAME)) {
werr = smbconf_add_string_to_array(tmp_ctx, tmp_share_names,
- 1, GLOBAL_NAME);
+ added_count, GLOBAL_NAME);
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-947-g70b7b33
The branch, v3-2-test has been updated
via 70b7b331d9e2d915e6209fca5900f41fae4866fd (commit)
via b42304c299224238a0247e0e1561eb2ad3217b96 (commit)
via 2fe416ffa5c7efd2e6a644e4c8bac756152881d9 (commit)
from 518f4d4e6662138a2e71acc2296acedefc7c739a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 70b7b331d9e2d915e6209fca5900f41fae4866fd
Author: Günther Deschner [EMAIL PROTECTED]
Date: Thu Apr 17 00:06:00 2008 +0200
net: Be more tolerant while joining.
Guenther
commit b42304c299224238a0247e0e1561eb2ad3217b96
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Apr 16 23:59:43 2008 +0200
NetrUnjoinDomain2: Honor registry config to try config changes.
Guenther
commit 2fe416ffa5c7efd2e6a644e4c8bac756152881d9
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Apr 16 23:56:03 2008 +0200
dsgetdcname: Fix discover_dc_dns.
Guenther
---
Summary of changes:
source/libsmb/dsgetdcname.c | 40 -
source/rpc_server/srv_wkssvc_nt.c |1 +
source/utils/net_ads.c| 13 ---
3 files changed, 36 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libsmb/dsgetdcname.c b/source/libsmb/dsgetdcname.c
index 7af4364..00841f0 100644
--- a/source/libsmb/dsgetdcname.c
+++ b/source/libsmb/dsgetdcname.c
@@ -418,6 +418,8 @@ static NTSTATUS discover_dc_dns(TALLOC_CTX *mem_ctx,
struct dns_rr_srv *dcs = NULL;
int numdcs = 0;
int numaddrs = 0;
+ struct ip_service_name *dclist = NULL;
+ int count = 0;
if ((!(flags DS_DIRECTORY_SERVICE_REQUIRED))
(!(flags DS_KDC_REQUIRED))
@@ -460,9 +462,10 @@ static NTSTATUS discover_dc_dns(TALLOC_CTX *mem_ctx,
numaddrs += MAX(dcs[i].num_ips,1);
}
- if ((*returned_dclist = TALLOC_ZERO_ARRAY(mem_ctx,
- struct ip_service_name,
- numaddrs)) == NULL) {
+ dclist = TALLOC_ZERO_ARRAY(mem_ctx,
+ struct ip_service_name,
+ numaddrs);
+ if (!dclist) {
return NT_STATUS_NO_MEMORY;
}
@@ -471,15 +474,16 @@ static NTSTATUS discover_dc_dns(TALLOC_CTX *mem_ctx,
*return_count = 0;
i = 0;
j = 0;
- while (i numdcs (*return_countnumaddrs)) {
- struct ip_service_name *r = (*returned_dclist)[*return_count];
+ while ((i numdcs) (count numaddrs)) {
+
+ struct ip_service_name *r = dclist[count];
r-port = dcs[i].port;
r-hostname = dcs[i].hostname;
if (!(flags DS_IP_REQUIRED)) {
- (*return_count)++;
+ count++;
continue;
}
@@ -511,13 +515,19 @@ static NTSTATUS discover_dc_dns(TALLOC_CTX *mem_ctx,
* anything about the DC's -- jerry */
if (!is_zero_addr(r-ss)) {
- (*return_count)++;
+ count++;
continue;
}
}
- return (*return_count 0) ? NT_STATUS_OK :
-NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
+ *returned_dclist = dclist;
+ *return_count = count;
+
+ if (count 0) {
+ return NT_STATUS_OK;
+ }
+
+ return NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
}
/
@@ -590,7 +600,7 @@ static NTSTATUS make_domain_controller_info(TALLOC_CTX
*mem_ctx,
static NTSTATUS process_dc_dns(TALLOC_CTX *mem_ctx,
const char *domain_name,
uint32_t flags,
- struct ip_service_name **dclist,
+ struct ip_service_name *dclist,
int num_dcs,
struct netr_DsRGetDCNameInfo **info)
{
@@ -607,7 +617,9 @@ static NTSTATUS process_dc_dns(TALLOC_CTX *mem_ctx,
ZERO_STRUCT(r);
- if ((ads_cldap_netlogon(dclist[i]-hostname,
+ DEBUG(10,(LDAP ping to %s\n, dclist[i].hostname));
+
+ if ((ads_cldap_netlogon(dclist[i].hostname,
domain_name, r))
(check_cldap_reply_required_flags(r.flags, flags))) {
valid_dc = true;
@@ -645,7 +657,7 @@ static NTSTATUS process_dc_dns(TALLOC_CTX *mem_ctx,
if (flags DS_IP_REQUIRED) {
char addr[INET6_ADDRSTRLEN];
- print_sockaddr(addr, sizeof(addr), dclist[i]-ss);
+
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-951-g2cbe5a0
The branch, v3-2-test has been updated
via 2cbe5a006a6df79c38f4aaa68d498cd6d5a34dba (commit)
via c084ccd70f42ce29ce24565969a9f440dde254e1 (commit)
via a4f628d6c9e2a5761c048e268a29e1f5daae4180 (commit)
via 57ba71140fbf6b4a5a917fa3248fa76536be883b (commit)
from 70b7b331d9e2d915e6209fca5900f41fae4866fd (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 2cbe5a006a6df79c38f4aaa68d498cd6d5a34dba
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Thu Apr 17 00:17:06 2008 +0200
wbinfo: use wbcCheckTrustCredentials()
metze
commit c084ccd70f42ce29ce24565969a9f440dde254e1
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Wed Apr 16 23:35:12 2008 +0200
libwbclient: add wbcCheckTrustCredentials()
This only accepts NULL as domain for now,
because winbindd doesn't support checking
trust passwords as a domain controller.
metze
commit a4f628d6c9e2a5761c048e268a29e1f5daae4180
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Mon Apr 14 09:35:15 2008 +0200
wbinfo: use wbcResolveWinsByName() and wbcResolveWinsByIP()
metze
commit 57ba71140fbf6b4a5a917fa3248fa76536be883b
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Mon Apr 14 09:31:46 2008 +0200
libwbclient: add wbcResolveWinsByName() and wbcResolveWinsByIP()
metze
---
Summary of changes:
source/nsswitch/libwbclient/wbc_pam.c | 52
source/nsswitch/libwbclient/wbc_util.c | 81
source/nsswitch/libwbclient/wbclient.h | 12 +
source/nsswitch/wbinfo.c | 64 +++--
4 files changed, 173 insertions(+), 36 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/nsswitch/libwbclient/wbc_pam.c
b/source/nsswitch/libwbclient/wbc_pam.c
index 2b33f55..f6a355a 100644
--- a/source/nsswitch/libwbclient/wbc_pam.c
+++ b/source/nsswitch/libwbclient/wbc_pam.c
@@ -419,3 +419,55 @@ done:
return wbc_status;
}
+
+/** @brief Trigger a verification of the trust credentials of a specific domain
+ *
+ * @param *domain The name of the domain, only NULL for the default
domain is
+ * supported yet. Other values than NULL will result in
+ * WBC_ERR_NOT_IMPLEMENTED.
+ * @param errorOutput details on WBC_ERR_AUTH_ERROR
+ *
+ * @return #wbcErr
+ *
+ **/
+wbcErr wbcCheckTrustCredentials(const char *domain,
+ struct wbcAuthErrorInfo **error)
+{
+ struct winbindd_request request;
+ struct winbindd_response response;
+ wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
+ const char *name_str;
+
+ if (domain) {
+ /*
+* the current protocol doesn't support
+* specifying a domain
+*/
+ wbc_status = WBC_ERR_NOT_IMPLEMENTED;
+ BAIL_ON_WBC_ERROR(wbc_status);
+ }
+
+ ZERO_STRUCT(request);
+ ZERO_STRUCT(response);
+
+ /* Send request */
+
+ wbc_status = wbcRequestResponse(WINBINDD_CHECK_MACHACC,
+ request,
+ response);
+ if (response.data.auth.nt_status != 0) {
+ if (error) {
+ wbc_status = wbc_create_error_info(NULL,
+ response,
+ error);
+ BAIL_ON_WBC_ERROR(wbc_status);
+ }
+
+ wbc_status = WBC_ERR_AUTH_ERROR;
+ BAIL_ON_WBC_ERROR(wbc_status);
+ }
+ BAIL_ON_WBC_ERROR(wbc_status);
+
+ done:
+ return wbc_status;
+}
diff --git a/source/nsswitch/libwbclient/wbc_util.c
b/source/nsswitch/libwbclient/wbc_util.c
index 7bdae91..edcad28 100644
--- a/source/nsswitch/libwbclient/wbc_util.c
+++ b/source/nsswitch/libwbclient/wbc_util.c
@@ -187,3 +187,84 @@ wbcErr wbcDomainInfo(const char *domain, struct
wbcDomainInfo **dinfo)
return wbc_status;
}
+
+
+/** @brief Resolve a NetbiosName via WINS
+ *
+ * @param name Name to resolve
+ * @param *ip Pointer to the ip address string
+ *
+ * @return #wbcErr
+ *
+ **/
+wbcErr wbcResolveWinsByName(const char *name, const char **ip)
+{
+ struct winbindd_request request;
+ struct winbindd_response response;
+ wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
+ const char *ipaddr;
+
+ ZERO_STRUCT(request);
+ ZERO_STRUCT(response);
+
+ /* Send request */
+
+ strncpy(request.data.winsreq, name,
+ sizeof(request.data.winsreq)-1);
+
+ wbc_status = wbcRequestResponse(WINBINDD_WINS_BYNAME,
+ request,
+
Build status as of Thu Apr 17 00:00:01 2008
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2008-04-16 00:01:03.0 + +++ /home/build/master/cache/broken_results.txt 2008-04-17 00:00:25.0 + @@ -1,4 +1,4 @@ -Build status as of Wed Apr 16 00:00:02 2008 +Build status as of Thu Apr 17 00:00:01 2008 Build counts: Tree Total Broken Panic @@ -14,8 +14,8 @@ rsync30 12 0 samba-docs 0 0 0 samba-gtk4 4 0 -samba_3_2_test 30 18 0 -samba_4_0_test 28 27 11 +samba_3_2_test 29 18 0 +samba_4_0_test 28 26 2 smb-build28 3 0 talloc 30 7 0 tdb 30 13 0
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-202-g30e04ae
The branch, v4-0-test has been updated
via 30e04ae3a02596de03d06874ff5dfc0ddc3bf902 (commit)
via 02bfe20fd3ef2981945b3eb38f0bf012ef0cb91e (commit)
via d70afbb0673184ed067e5f1c7608536025a3cca7 (commit)
via 66c0f331a231ea8897bd8f83658c86b1d2c85d62 (commit)
via fbfbd74e65b1f3e185f08a538bdd50ba7c6ce9bf (commit)
via e0a0d8e36acd735b587cd7870625af52c5dc3431 (commit)
via 874924a85a862e38b7d1a6199276e998cf3697d8 (commit)
from d40804777edf41889bd461f63f7a07cc1cc60e27 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit 30e04ae3a02596de03d06874ff5dfc0ddc3bf902
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Wed Apr 16 10:11:44 2008 +0200
torture/smb2: add SMB2-PERSISTENT-HANDLES1 test
This demonstrates that the file seek position
is still available on reconnected persistent handles.
metze
commit 02bfe20fd3ef2981945b3eb38f0bf012ef0cb91e
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Thu Apr 17 02:38:13 2008 +0200
selftest: ignore failures in the SMB2-PERSISTENT-HANDLES1 test
metze
commit d70afbb0673184ed067e5f1c7608536025a3cca7
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Wed Apr 16 15:16:56 2008 +0200
torture/smb2: add torture_suite_add_2smb2_test() helper function
metze
commit 66c0f331a231ea8897bd8f83658c86b1d2c85d62
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Wed Apr 16 15:15:57 2008 +0200
torture/smb2: fix whitespaces
metze
commit fbfbd74e65b1f3e185f08a538bdd50ba7c6ce9bf
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Wed Apr 16 19:26:52 2008 +0200
smb_server/smb2: initialize new create.in.blobs element untill it'll be
supported
metze
commit e0a0d8e36acd735b587cd7870625af52c5dc3431
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Wed Apr 16 10:03:08 2008 +0200
libcli/smb2: make it possible to pass additional extra blobs in
smb2_create()
This also fixes the alignment from 8 to 4 byte bounderies.
metze
commit 874924a85a862e38b7d1a6199276e998cf3697d8
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Wed Apr 16 10:05:53 2008 +0200
libcli/smb2: also offer the SMB2 dialect that what used in longhorn beta3
With this smbtorture works against longhorn beta3 again,
hopefully it still works with new versions...
metze
---
Summary of changes:
source/libcli/raw/interfaces.h |8 ++
source/libcli/smb2/connect.c |7 +-
source/libcli/smb2/create.c | 94 +
source/samba4-knownfail |1 +
source/smb_server/smb2/fileio.c |1 +
source/torture/smb2/config.mk|3 +-
source/torture/smb2/persistent_handles.c | 162 ++
source/torture/smb2/smb2.c | 62 +++-
8 files changed, 308 insertions(+), 30 deletions(-)
create mode 100644 source/torture/smb2/persistent_handles.c
Changeset truncated at 500 lines:
diff --git a/source/libcli/raw/interfaces.h b/source/libcli/raw/interfaces.h
index 61441b2..cf5a3aa 100644
--- a/source/libcli/raw/interfaces.h
+++ b/source/libcli/raw/interfaces.h
@@ -1587,6 +1587,14 @@ union smb_open {
/* optional list of extended attributes */
struct smb_ea_list eas;
+
+ struct smb2_create_blobs {
+ uint32_t num_blobs;
+ struct smb2_create_blob {
+ const char *tag;
+ DATA_BLOB data;
+ } *blobs;
+ } blobs;
} in;
struct {
union smb_handle file;
diff --git a/source/libcli/smb2/connect.c b/source/libcli/smb2/connect.c
index d68b85a..59d4e6e 100644
--- a/source/libcli/smb2/connect.c
+++ b/source/libcli/smb2/connect.c
@@ -121,7 +121,7 @@ static void continue_socket(struct composite_context *creq)
struct smbcli_socket *sock;
struct smb2_transport *transport;
struct smb2_request *req;
- uint16_t dialects[1];
+ uint16_t dialects[2];
c-status = smbcli_sock_connect_recv(creq, state, sock);
if (!composite_is_ok(c)) return;
@@ -130,11 +130,12 @@ static void continue_socket(struct composite_context
*creq)
if (composite_nomem(transport, c)) return;
ZERO_STRUCT(state-negprot);
- state-negprot.in.dialect_count = 1;
+ state-negprot.in.dialect_count = 2;
state-negprot.in.security_mode = 0;
state-negprot.in.capabilities = 0;
unix_to_nt_time(state-negprot.in.start_time, time(NULL));
- dialects[0] = SMB2_DIALECT_REVISION;
+ dialects[0] = 0;
+
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-204-g9013748
The branch, v4-0-test has been updated
via 9013748273378f88bfc66d3583814f0fee67c40f (commit)
via ae0a7d0918cc15309a6d1166885f23531365007c (commit)
from 30e04ae3a02596de03d06874ff5dfc0ddc3bf902 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit 9013748273378f88bfc66d3583814f0fee67c40f
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Thu Apr 17 03:54:26 2008 +0200
ntvfs_generic: map SMB2 oplock levels to the generic ones
metze
commit ae0a7d0918cc15309a6d1166885f23531365007c
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Thu Apr 17 03:52:45 2008 +0200
SMB2-PERSISTENT-HANDLES1: verify some more fields
metze
---
Summary of changes:
source/ntvfs/ntvfs_generic.c | 29 ++-
source/torture/smb2/persistent_handles.c | 84 ++---
2 files changed, 79 insertions(+), 34 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/ntvfs/ntvfs_generic.c b/source/ntvfs/ntvfs_generic.c
index fee3269..5d4bbf3 100644
--- a/source/ntvfs/ntvfs_generic.c
+++ b/source/ntvfs/ntvfs_generic.c
@@ -208,7 +208,21 @@ static NTSTATUS ntvfs_map_open_finish(struct
ntvfs_module_context *ntvfs,
case RAW_OPEN_SMB2:
io-smb2.out.file.ntvfs = io2-generic.out.file.ntvfs;
- io-smb2.out.oplock_level = 0;
+ switch (io2-generic.out.oplock_level) {
+ case OPLOCK_BATCH:
+ io-smb2.out.oplock_level = SMB2_OPLOCK_LEVEL_BATCH;
+ break;
+ case OPLOCK_EXCLUSIVE:
+ io-smb2.out.oplock_level = SMB2_OPLOCK_LEVEL_EXCLUSIVE;
+ break;
+ case OPLOCK_LEVEL_II:
+ io-smb2.out.oplock_level = SMB2_OPLOCK_LEVEL_II;
+ break;
+ default:
+ io-smb2.out.oplock_level = SMB2_OPLOCK_LEVEL_NONE;
+ break;
+ }
+ io-smb2.out.reserved = 0;
io-smb2.out.create_action =
io2-generic.out.create_action;
io-smb2.out.create_time= io2-generic.out.create_time;
io-smb2.out.access_time= io2-generic.out.access_time;
@@ -484,7 +498,18 @@ NTSTATUS ntvfs_map_open(struct ntvfs_module_context *ntvfs,
status = ntvfs-ops-open(ntvfs, req, io2);
break;
case RAW_OPEN_SMB2:
- io2-generic.in.flags = 0;
+ switch (io-smb2.in.oplock_level) {
+ case SMB2_OPLOCK_LEVEL_BATCH:
+ io2-generic.in.flags =
NTCREATEX_FLAGS_REQUEST_BATCH_OPLOCK |
+ NTCREATEX_FLAGS_REQUEST_OPLOCK;
+ break;
+ case SMB2_OPLOCK_LEVEL_EXCLUSIVE:
+ io2-generic.in.flags = NTCREATEX_FLAGS_REQUEST_OPLOCK;
+ break;
+ default:
+ io2-generic.in.flags = 0;
+ break;
+ }
io2-generic.in.root_fid= 0;
io2-generic.in.access_mask = io-smb2.in.desired_access;
io2-generic.in.alloc_size = 0;
diff --git a/source/torture/smb2/persistent_handles.c
b/source/torture/smb2/persistent_handles.c
index d08714d..ace57d8 100644
--- a/source/torture/smb2/persistent_handles.c
+++ b/source/torture/smb2/persistent_handles.c
@@ -52,44 +52,57 @@ bool torture_smb2_persistent_handles1(struct
torture_context *tctx,
{
TALLOC_CTX *mem_ctx = talloc_new(tctx);
struct smb2_handle h1, h2;
- struct smb2_create io;
+ struct smb2_create io1, io2;
NTSTATUS status;
const char *fname = persistent_handles.dat;
DATA_BLOB b;
union smb_fileinfo qfinfo;
union smb_setfileinfo sfinfo;
bool ret = true;
-
- ZERO_STRUCT(io);
- io.in.security_flags= 0x00;
- io.in.oplock_level = SMB2_OPLOCK_LEVEL_BATCH;
- io.in.impersonation_level = NTCREATEX_IMPERSONATION_IMPERSONATION;
- io.in.create_flags = 0x;
- io.in.reserved = 0x;
- io.in.desired_access= SEC_RIGHTS_FILE_READ;
- io.in.file_attributes = 0x;
- io.in.share_access = NTCREATEX_SHARE_ACCESS_READ |
+ uint64_t pos;
+
+ smb2_util_unlink(tree1, fname);
+
+ ZERO_STRUCT(io1);
+ io1.in.security_flags = 0x00;
+ io1.in.oplock_level = SMB2_OPLOCK_LEVEL_BATCH;
+ io1.in.impersonation_level = NTCREATEX_IMPERSONATION_IMPERSONATION;
+ io1.in.create_flags = 0x;
+ io1.in.reserved
