[SCM] Samba Shared Repository - branch master updated
Matthias Dieter Wallnöfer
mdw at samba.org
Sat Nov 27 15:36:01 MST 2010
The branch, master has been updated
via b87c370 s4:netcmd/drs.py - use "objectClass" for discovering the server and it's NTDS settings object
via 989d880 tdb:common/open.c - use "discard_const_p" for certain "tdb->name" assignments
via eaac277 s4:dsdb/repl/drepl_service.c - return the correct WERR result
via bfb2824 s4:drepl_service.c - fix error macro (use "_werr" and not "werr")
via a13bd32 s4:dsdb/repl/drepl_out_helpers.c - print out the correct error message (werr)
via 450b26b s4:lib/registry/rpc.c - remove a duplicate assignment
via 24c5d6b s4:torture/rpc/samr.c - fix uninitialised "status" variables
via 5c8f0c5 s4:torture/rpc/samsync.c - remove uninitialised "nt_status" check
via 6df6364 s4:drsuapi RPC server - fix "enum security_user_level" warning on Tru64
via c8aa7d5 s4:param/secrets.h - fix "enum netr_SchannelType" include correctly
via 4010eff s4:wkssvc RPC server - better solution for srvsvc* enum's in server_info.c
via 3c343fe Revert "s4:rpc_server/common/common.h - introduce two forward declarations to suppress parameter declaration warnings"
via 19ea378 s4:libcli/security/session.h - fix include ordering for "enum security_user_level"
via 4dece69 s4:dsdb/samdb/samdb.h - fix include ordering in order to prevent warnings on Tru64
from 2f40657 s3: Use localtime_r, libreplace defines it
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b87c3703cf890bd55340a201536073bd2be1e1d8
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Sat Nov 27 22:44:55 2010 +0100
s4:netcmd/drs.py - use "objectClass" for discovering the server and it's NTDS settings object
Small optimisation: we don't need to look for "nTDSDSARO" since it's a subclass
of "ntDSDSA".
Autobuild-User: Matthias Dieter Wallnöfer <mdw at samba.org>
Autobuild-Date: Sat Nov 27 23:35:13 CET 2010 on sn-devel-104
commit 989d8803f28826e6541667127abad801c4fa4566
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Sat Nov 27 20:19:34 2010 +0100
tdb:common/open.c - use "discard_const_p" for certain "tdb->name" assignments
In order to suppress compiler warnings.
commit eaac27738145c60133163bff763412d96bc72cbb
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Sat Nov 27 20:13:02 2010 +0100
s4:dsdb/repl/drepl_service.c - return the correct WERR result
commit bfb28243d0a6d37c7ce10641a4b65539152799be
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Sat Nov 27 20:12:25 2010 +0100
s4:drepl_service.c - fix error macro (use "_werr" and not "werr")
Detected by Tru64 "cc".
commit a13bd32fa90ce0129227805811ed58490d8dba73
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Sat Nov 27 20:06:18 2010 +0100
s4:dsdb/repl/drepl_out_helpers.c - print out the correct error message (werr)
Also detected by Tru64 "cc".
commit 450b26b9b5917caaa1a8ad87c9107d741434e9e9
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Sat Nov 27 20:03:53 2010 +0100
s4:lib/registry/rpc.c - remove a duplicate assignment
commit 24c5d6b5042fc34a526348ea8a66aab2c994e3dc
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Sat Nov 27 19:52:46 2010 +0100
s4:torture/rpc/samr.c - fix uninitialised "status" variables
Detected by Tru64. I wonder how this tests even worked.
commit 5c8f0c5b9dcd4119ec1ef2e997f3ea75781eb53b
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Sat Nov 27 19:45:45 2010 +0100
s4:torture/rpc/samsync.c - remove uninitialised "nt_status" check
Found by Tru64 compiler.
commit 6df636422047b80f0844d2398fe4124f7bca05df
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Sat Nov 27 19:42:31 2010 +0100
s4:drsuapi RPC server - fix "enum security_user_level" warning on Tru64
commit c8aa7d5837bdfc7f721ac9fcc12211fd89f3dbcf
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Sat Nov 27 19:32:03 2010 +0100
s4:param/secrets.h - fix "enum netr_SchannelType" include correctly
commit 4010eff80b888fec7cb7e5d43cb0c3ff23188a64
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Sat Nov 27 19:16:00 2010 +0100
s4:wkssvc RPC server - better solution for srvsvc* enum's in server_info.c
Reworked version of commit 7e710c4de92c310897817acc06d229cce763d2d7
commit 3c343fec8ab6f175edfa8adaad5de07f5a74b2c8
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Sat Nov 27 19:10:27 2010 +0100
Revert "s4:rpc_server/common/common.h - introduce two forward declarations to suppress parameter declaration warnings"
This reverts commit 7e710c4de92c310897817acc06d229cce763d2d7.
This causes more noise than it's useful.
commit 19ea37886c3a469f37d4e9067703d9fff696fdfb
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Sat Nov 27 18:33:42 2010 +0100
s4:libcli/security/session.h - fix include ordering for "enum security_user_level"
commit 4dece699ed84becefbc928896de2525df8b9c84f
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Sat Nov 27 18:30:12 2010 +0100
s4:dsdb/samdb/samdb.h - fix include ordering in order to prevent warnings on Tru64
-----------------------------------------------------------------------
Summary of changes:
lib/tdb/common/open.c | 4 ++--
source4/dsdb/repl/drepl_out_helpers.c | 2 +-
source4/dsdb/repl/drepl_service.c | 4 ++--
source4/dsdb/samdb/samdb.c | 1 -
source4/dsdb/samdb/samdb.h | 2 +-
source4/lib/registry/rpc.c | 1 -
source4/libcli/security/session.h | 4 ++--
source4/libnet/libnet_join.c | 1 -
source4/param/secrets.h | 3 ++-
source4/rpc_server/common/common.h | 3 ---
source4/rpc_server/common/server_info.c | 2 +-
source4/rpc_server/drsuapi/addentry.c | 4 ++--
source4/rpc_server/drsuapi/dcesrv_drsuapi.c | 2 +-
source4/rpc_server/drsuapi/dcesrv_drsuapi.h | 1 -
source4/rpc_server/drsuapi/getncchanges.c | 4 ++--
source4/rpc_server/drsuapi/updaterefs.c | 4 ++--
source4/rpc_server/drsuapi/writespn.c | 4 ++--
source4/rpc_server/wkssvc/dcesrv_wkssvc.c | 1 +
source4/scripting/python/samba/netcmd/drs.py | 4 ++--
source4/smbd/process_onefork.c | 1 -
source4/smbd/process_prefork.c | 1 -
source4/torture/rpc/samr.c | 4 ++++
source4/torture/rpc/samsync.c | 9 +--------
23 files changed, 28 insertions(+), 38 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tdb/common/open.c b/lib/tdb/common/open.c
index ce8e9f5..ec45689 100644
--- a/lib/tdb/common/open.c
+++ b/lib/tdb/common/open.c
@@ -202,7 +202,7 @@ _PUBLIC_ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int td
}
if (name == NULL) {
- tdb->name = "__NULL__";
+ tdb->name = discard_const_p(char, "__NULL__");
TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_open_ex: called with name == NULL\n"));
tdb->name = NULL;
errno = EINVAL;
@@ -215,7 +215,7 @@ _PUBLIC_ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int td
* set the name as the given string, so that tdb_name() will
* work in case of an error.
*/
- tdb->name = name;
+ tdb->name = discard_const_p(char, name);
TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_open_ex: can't strdup(%s)\n",
name));
tdb->name = NULL;
diff --git a/source4/dsdb/repl/drepl_out_helpers.c b/source4/dsdb/repl/drepl_out_helpers.c
index b99f126..2bd5974 100644
--- a/source4/dsdb/repl/drepl_out_helpers.c
+++ b/source4/dsdb/repl/drepl_out_helpers.c
@@ -361,7 +361,7 @@ static void dreplsrv_op_pull_source_get_changes_trigger(struct tevent_req *req)
werr = udv_convert(partition, &partition->uptodatevector, &partition->uptodatevector_ex);
if (!W_ERROR_IS_OK(werr)) {
DEBUG(0,(__location__ ": Failed to convert UDV for %s : %s\n",
- ldb_dn_get_linearized(partition->dn), nt_errstr(status)));
+ ldb_dn_get_linearized(partition->dn), win_errstr(werr)));
}
}
diff --git a/source4/dsdb/repl/drepl_service.c b/source4/dsdb/repl/drepl_service.c
index 11f81bb..2f9a5d5 100644
--- a/source4/dsdb/repl/drepl_service.c
+++ b/source4/dsdb/repl/drepl_service.c
@@ -226,7 +226,7 @@ static NTSTATUS drepl_replica_sync(struct irpc_message *msg,
struct dreplsrv_service);
#define REPLICA_SYNC_FAIL(_msg, _werr) do {\
- if (!W_ERROR_IS_OK(werr)) { \
+ if (!W_ERROR_IS_OK(_werr)) { \
DEBUG(0,(__location__ ": Failure - %s. werr = %s\n", \
_msg, win_errstr(_werr))); \
NDR_PRINT_IN_DEBUG(drsuapi_DsReplicaSync, r); \
@@ -308,7 +308,7 @@ static NTSTATUS drepl_replica_sync(struct irpc_message *msg,
}
if (!W_ERROR_IS_OK(werr)) {
REPLICA_SYNC_FAIL("Failed to locate source DSA for given NC",
- WERR_DS_DRA_NO_REPLICA);
+ werr);
}
/* schedule replication item */
diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c
index 2c890a7..416cf50 100644
--- a/source4/dsdb/samdb/samdb.c
+++ b/source4/dsdb/samdb/samdb.c
@@ -23,7 +23,6 @@
#include "includes.h"
#include "librpc/gen_ndr/ndr_netlogon.h"
-#include "librpc/gen_ndr/ndr_misc.h"
#include "librpc/gen_ndr/ndr_security.h"
#include "lib/events/events.h"
#include "lib/ldb-samba/ldb_wrap.h"
diff --git a/source4/dsdb/samdb/samdb.h b/source4/dsdb/samdb/samdb.h
index a3d8f79..7748bcd 100644
--- a/source4/dsdb/samdb/samdb.h
+++ b/source4/dsdb/samdb/samdb.h
@@ -37,8 +37,8 @@ struct tevent_context;
#include "librpc/gen_ndr/drsblobs.h"
#include "dsdb/schema/schema.h"
#include "dsdb/samdb/samdb_proto.h"
-#include "dsdb/common/proto.h"
#include "dsdb/common/dsdb_dn.h"
+#include "dsdb/common/proto.h"
#include "../libds/common/flags.h"
#define DSDB_CONTROL_CURRENT_PARTITION_OID "1.3.6.1.4.1.7165.4.3.2"
diff --git a/source4/lib/registry/rpc.c b/source4/lib/registry/rpc.c
index bc49045..f1e14c1 100644
--- a/source4/lib/registry/rpc.c
+++ b/source4/lib/registry/rpc.c
@@ -473,7 +473,6 @@ static struct registry_operations reg_backend_rpc = {
.create_key = rpc_add_key,
.delete_key = rpc_del_key,
.get_key_info = rpc_get_info,
- .get_predefined_key = rpc_get_predefined_key,
};
_PUBLIC_ WERROR reg_open_remote(struct registry_context **ctx,
diff --git a/source4/libcli/security/session.h b/source4/libcli/security/session.h
index 851a37d..cf69665 100644
--- a/source4/libcli/security/session.h
+++ b/source4/libcli/security/session.h
@@ -19,8 +19,6 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "libcli/security/session_proto.h"
-
enum security_user_level {
SECURITY_ANONYMOUS = 0,
SECURITY_USER = 10,
@@ -30,4 +28,6 @@ enum security_user_level {
SECURITY_SYSTEM = 50
};
+#include "libcli/security/session_proto.h"
+
struct auth_session_info;
diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index 2353044..6077de9 100644
--- a/source4/libnet/libnet_join.c
+++ b/source4/libnet/libnet_join.c
@@ -24,7 +24,6 @@
#include "librpc/gen_ndr/ndr_drsuapi_c.h"
#include "lib/ldb/include/ldb.h"
#include "lib/ldb/include/ldb_errors.h"
-#include "param/secrets.h"
#include "dsdb/samdb/samdb.h"
#include "ldb_wrap.h"
#include "libcli/security/security.h"
diff --git a/source4/param/secrets.h b/source4/param/secrets.h
index d9e0f53..4cab9cc 100644
--- a/source4/param/secrets.h
+++ b/source4/param/secrets.h
@@ -38,10 +38,11 @@
*/
struct loadparm_context;
struct tevent_context;
-enum netr_SchannelType;
struct ldb_message;
struct ldb_context;
+#include "librpc/gen_ndr/misc.h"
+
struct tdb_wrap *secrets_init(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx);
struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx);
struct dom_sid *secrets_get_domain_sid(TALLOC_CTX *mem_ctx,
diff --git a/source4/rpc_server/common/common.h b/source4/rpc_server/common/common.h
index 240ef29..7d2f8c5 100644
--- a/source4/rpc_server/common/common.h
+++ b/source4/rpc_server/common/common.h
@@ -38,9 +38,6 @@ struct dcerpc_server_info {
uint32_t version_build;
};
-enum srvsvc_PlatformId;
-enum srvsvc_ShareType;
-
#include "rpc_server/common/proto.h"
#endif /* _DCERPC_SERVER_COMMON_H_ */
diff --git a/source4/rpc_server/common/server_info.c b/source4/rpc_server/common/server_info.c
index 414a047..c56b93f 100644
--- a/source4/rpc_server/common/server_info.c
+++ b/source4/rpc_server/common/server_info.c
@@ -20,7 +20,7 @@
*/
#include "includes.h"
-#include "librpc/gen_ndr/ndr_srvsvc.h"
+#include "librpc/gen_ndr/srvsvc.h"
#include "rpc_server/dcerpc_server.h"
#include "dsdb/samdb/samdb.h"
#include "auth/auth.h"
diff --git a/source4/rpc_server/drsuapi/addentry.c b/source4/rpc_server/drsuapi/addentry.c
index c4f33d7..5f030a0 100644
--- a/source4/rpc_server/drsuapi/addentry.c
+++ b/source4/rpc_server/drsuapi/addentry.c
@@ -25,10 +25,10 @@
#include "dsdb/samdb/samdb.h"
#include "dsdb/common/util.h"
#include "param/param.h"
-#include "rpc_server/drsuapi/dcesrv_drsuapi.h"
-#include "librpc/gen_ndr/ndr_drsuapi.h"
#include "libcli/security/security.h"
#include "libcli/security/session.h"
+#include "rpc_server/drsuapi/dcesrv_drsuapi.h"
+#include "librpc/gen_ndr/ndr_drsuapi.h"
/*
add special SPNs needed for DRS replication to machine accounts when
diff --git a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
index 6829416..429fc31 100644
--- a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
+++ b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
@@ -25,9 +25,9 @@
#include "rpc_server/dcerpc_server.h"
#include "rpc_server/common/common.h"
#include "dsdb/samdb/samdb.h"
-#include "rpc_server/drsuapi/dcesrv_drsuapi.h"
#include "libcli/security/security.h"
#include "libcli/security/session.h"
+#include "rpc_server/drsuapi/dcesrv_drsuapi.h"
#include "auth/auth.h"
#include "param/param.h"
#include "lib/messaging/irpc.h"
diff --git a/source4/rpc_server/drsuapi/dcesrv_drsuapi.h b/source4/rpc_server/drsuapi/dcesrv_drsuapi.h
index 1a9d867..49d1d42 100644
--- a/source4/rpc_server/drsuapi/dcesrv_drsuapi.h
+++ b/source4/rpc_server/drsuapi/dcesrv_drsuapi.h
@@ -62,7 +62,6 @@ int drsuapi_search_with_extended_dn(struct ldb_context *ldb,
const char * const *attrs,
const char *filter);
-enum security_user_level;
WERROR drs_security_level_check(struct dcesrv_call_state *dce_call,
const char* call, enum security_user_level minimum_level,
const struct dom_sid *domain_sid);
diff --git a/source4/rpc_server/drsuapi/getncchanges.c b/source4/rpc_server/drsuapi/getncchanges.c
index 9be076e..822e628 100644
--- a/source4/rpc_server/drsuapi/getncchanges.c
+++ b/source4/rpc_server/drsuapi/getncchanges.c
@@ -27,11 +27,11 @@
#include "librpc/gen_ndr/ndr_drsblobs.h"
#include "librpc/gen_ndr/ndr_drsuapi.h"
#include "librpc/gen_ndr/ndr_security.h"
+#include "libcli/security/security.h"
+#include "libcli/security/session.h"
#include "rpc_server/drsuapi/dcesrv_drsuapi.h"
#include "rpc_server/dcerpc_server_proto.h"
#include "../libcli/drsuapi/drsuapi.h"
-#include "libcli/security/security.h"
-#include "libcli/security/session.h"
#include "lib/util/binsearch.h"
#include "lib/util/tsort.h"
#include "auth/session.h"
diff --git a/source4/rpc_server/drsuapi/updaterefs.c b/source4/rpc_server/drsuapi/updaterefs.c
index 6499807..2d62718 100644
--- a/source4/rpc_server/drsuapi/updaterefs.c
+++ b/source4/rpc_server/drsuapi/updaterefs.c
@@ -22,9 +22,9 @@
#include "includes.h"
#include "rpc_server/dcerpc_server.h"
#include "dsdb/samdb/samdb.h"
-#include "rpc_server/drsuapi/dcesrv_drsuapi.h"
-#include "libcli/security/session.h"
#include "libcli/security/security.h"
+#include "libcli/security/session.h"
+#include "rpc_server/drsuapi/dcesrv_drsuapi.h"
#include "auth/session.h"
#include "librpc/gen_ndr/ndr_drsuapi.h"
diff --git a/source4/rpc_server/drsuapi/writespn.c b/source4/rpc_server/drsuapi/writespn.c
index 320232d..652fd2c 100644
--- a/source4/rpc_server/drsuapi/writespn.c
+++ b/source4/rpc_server/drsuapi/writespn.c
@@ -24,11 +24,11 @@
#include "rpc_server/dcerpc_server.h"
#include "dsdb/samdb/samdb.h"
#include "dsdb/common/util.h"
-#include "rpc_server/drsuapi/dcesrv_drsuapi.h"
#include "system/kerberos.h"
#include "auth/kerberos/kerberos.h"
-#include "libcli/security/session.h"
#include "libcli/security/security.h"
+#include "libcli/security/session.h"
+#include "rpc_server/drsuapi/dcesrv_drsuapi.h"
#include "auth/session.h"
/*
diff --git a/source4/rpc_server/wkssvc/dcesrv_wkssvc.c b/source4/rpc_server/wkssvc/dcesrv_wkssvc.c
index 0b553ef..80a518c 100644
--- a/source4/rpc_server/wkssvc/dcesrv_wkssvc.c
+++ b/source4/rpc_server/wkssvc/dcesrv_wkssvc.c
@@ -22,6 +22,7 @@
#include "includes.h"
#include "rpc_server/dcerpc_server.h"
#include "librpc/gen_ndr/ndr_wkssvc.h"
+#include "librpc/gen_ndr/ndr_srvsvc.h"
#include "rpc_server/common/common.h"
#include "rpc_server/common/share.h"
#include "param/param.h"
diff --git a/source4/scripting/python/samba/netcmd/drs.py b/source4/scripting/python/samba/netcmd/drs.py
index 7c4b171..e7a631b 100644
--- a/source4/scripting/python/samba/netcmd/drs.py
+++ b/source4/scripting/python/samba/netcmd/drs.py
@@ -258,7 +258,7 @@ class cmd_drs_replicate(Command):
# we need to find the NTDS GUID of the source DC
msg = self.samdb.search(base=self.samdb.get_config_basedn(),
- expression="(&(objectCategory=server)(|(name=%s)(dNSHostName=%s)))" % (SOURCE_DC,
+ expression="(&(objectClass=server)(|(name=%s)(dNSHostName=%s)))" % (SOURCE_DC,
SOURCE_DC),
attrs=[])
if len(msg) == 0:
@@ -266,7 +266,7 @@ class cmd_drs_replicate(Command):
server_dn = msg[0]['dn']
msg = self.samdb.search(base=server_dn, scope=ldb.SCOPE_ONELEVEL,
- expression="(|(objectCategory=nTDSDSA)(objectCategory=nTDSDSARO))",
+ expression="(objectClass=nTDSDSA)",
attrs=['objectGUID', 'options'])
if len(msg) == 0:
raise CommandError("Failed to find source NTDS DN %s" % SOURCE_DC)
diff --git a/source4/smbd/process_onefork.c b/source4/smbd/process_onefork.c
index da34f73..5194e1b 100644
--- a/source4/smbd/process_onefork.c
+++ b/source4/smbd/process_onefork.c
@@ -27,7 +27,6 @@
#include "lib/events/events.h"
#include "lib/socket/socket.h"
#include "smbd/process_model.h"
-#include "param/secrets.h"
#include "system/filesys.h"
#include "cluster/cluster.h"
#include "param/param.h"
diff --git a/source4/smbd/process_prefork.c b/source4/smbd/process_prefork.c
index 1340464..71c1c57 100644
--- a/source4/smbd/process_prefork.c
+++ b/source4/smbd/process_prefork.c
@@ -27,7 +27,6 @@
#include "lib/events/events.h"
#include "lib/socket/socket.h"
#include "smbd/process_model.h"
-#include "param/secrets.h"
#include "system/filesys.h"
#include "cluster/cluster.h"
#include "param/param.h"
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 223146e..a57cdb8 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -7229,6 +7229,7 @@ static bool test_EnumDomainUsers(struct dcerpc_binding_handle *b,
torture_assert_ntstatus_ok(tctx, r.out.result,
"failed to enumerate users");
}
+ status = r.out.result;
total_num_entries += num_entries;
} while (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES));
@@ -7269,6 +7270,7 @@ static bool test_EnumDomainGroups(struct dcerpc_binding_handle *b,
torture_assert_ntstatus_ok(tctx, r.out.result,
"failed to enumerate groups");
}
+ status = r.out.result;
total_num_entries += num_entries;
} while (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES));
@@ -7309,6 +7311,7 @@ static bool test_EnumDomainAliases(struct dcerpc_binding_handle *b,
torture_assert_ntstatus_ok(tctx, r.out.result,
"failed to enumerate aliases");
}
+ status = r.out.result;
total_num_entries += num_entries;
} while (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES));
@@ -7353,6 +7356,7 @@ static bool test_QueryDisplayInfo_level(struct dcerpc_binding_handle *b,
torture_assert_ntstatus_ok(tctx, r.out.result,
"failed to query displayinfo");
}
+ status = r.out.result;
if (*r.out.returned_size == 0) {
break;
diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index 90c4514..980e085 100644
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -509,20 +509,13 @@ static bool samsync_handle_user(struct torture_context *tctx, TALLOC_CTX *mem_ct
"GetGroupsForUser failed");
if (!test_samr_handle_Close(samsync_state->b_samr, tctx, &user_handle)) {
- torture_comment(tctx, "samr_handle_Close failed - %s\n",
- nt_errstr(nt_status));
+ torture_comment(tctx, "samr_handle_Close failed\n");
ret = false;
}
if (!ret) {
return false;
}
- if (!NT_STATUS_IS_OK(nt_status)) {
- torture_comment(tctx, "QueryUserInfo level %u failed - %s\n",
- q.in.level, nt_errstr(nt_status));
- return false;
- }
-
TEST_STRING_EQUAL(info->info21.account_name, user->account_name);
TEST_STRING_EQUAL(info->info21.full_name, user->full_name);
TEST_INT_EQUAL(info->info21.rid, user->rid);
--
Samba Shared Repository
More information about the samba-cvs
mailing list