[SCM] Samba Shared Repository - branch v3-3-test updated -
release-3-2-0pre2-3000-g891d4cc
Günther Deschner
gd at samba.org
Thu Jun 26 08:24:46 GMT 2008
The branch, v3-3-test has been updated
via 891d4cca0ca5ccb075940517af25f3760a315219 (commit)
via 2efe18f7c96d8d122943342b9af1db62a1432771 (commit)
from 9075c5f2ada8f96ae8d6cbcfc36663969e9bf34f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 891d4cca0ca5ccb075940517af25f3760a315219
Author: Günther Deschner <gd at samba.org>
Date: Thu Jun 26 10:22:40 2008 +0200
net_vampire: add some error output to libnet_dssync.
Guenther
commit 2efe18f7c96d8d122943342b9af1db62a1432771
Author: Günther Deschner <gd at samba.org>
Date: Thu Jun 26 09:49:13 2008 +0200
errors: add WERR_DS_DRA_BAD_NC and WERR_DS_DRA_BAD_DN.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source/include/doserr.h | 3 +++
source/libnet/libnet_dssync.c | 17 ++++++++++++++++-
source/libsmb/doserr.c | 4 ++++
3 files changed, 23 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/doserr.h b/source/include/doserr.h
index b027ba4..c455f7a 100644
--- a/source/include/doserr.h
+++ b/source/include/doserr.h
@@ -235,6 +235,9 @@
#define WERR_DEVICE_NOT_AVAILABLE W_ERROR(4319)
#define WERR_STATUS_MORE_ENTRIES W_ERROR(0x0105)
+#define WERR_DS_DRA_BAD_DN W_ERROR(8439)
+#define WERR_DS_DRA_BAD_NC W_ERROR(8440)
+
#define WERR_PRINTER_DRIVER_ALREADY_INSTALLED W_ERROR(ERRdriveralreadyinstalled)
#define WERR_UNKNOWN_PORT W_ERROR(ERRunknownprinterport)
#define WERR_UNKNOWN_PRINTER_DRIVER W_ERROR(ERRunknownprinterdriver)
diff --git a/source/libnet/libnet_dssync.c b/source/libnet/libnet_dssync.c
index b1392ac..0866db5 100644
--- a/source/libnet/libnet_dssync.c
+++ b/source/libnet/libnet_dssync.c
@@ -158,6 +158,9 @@ static NTSTATUS libnet_dssync_lookup_nc(TALLOC_CTX *mem_ctx,
&ctr,
&werr);
if (!NT_STATUS_IS_OK(status)) {
+ ctx->error_message = talloc_asprintf(mem_ctx,
+ "Failed to lookup DN for domain name: %s",
+ get_friendly_werror_msg(werr));
return status;
}
@@ -252,11 +255,14 @@ static NTSTATUS libnet_dssync_process(TALLOC_CTX *mem_ctx,
&ctr,
&werr);
if (!NT_STATUS_IS_OK(status)) {
- werr = ntstatus_to_werror(status);
+ ctx->error_message = talloc_asprintf(mem_ctx,
+ "Failed to get NC Changes: %s",
+ get_friendly_werror_msg(werr));
goto out;
}
if (!W_ERROR_IS_OK(werr)) {
+ status = werror_to_ntstatus(werr);
goto out;
}
@@ -270,6 +276,9 @@ static NTSTATUS libnet_dssync_process(TALLOC_CTX *mem_ctx,
status = cli_get_session_key(mem_ctx, ctx->cli, &ctx->session_key);
if (!NT_STATUS_IS_OK(status)) {
+ ctx->error_message = talloc_asprintf(mem_ctx,
+ "Failed to get Session Key: %s",
+ nt_errstr(status));
return status;
}
@@ -283,6 +292,9 @@ static NTSTATUS libnet_dssync_process(TALLOC_CTX *mem_ctx,
ctr1->first_object,
ctx);
if (!NT_STATUS_IS_OK(status)) {
+ ctx->error_message = talloc_asprintf(mem_ctx,
+ "Failed to call processing function: %s",
+ nt_errstr(status));
goto out;
}
}
@@ -313,6 +325,9 @@ static NTSTATUS libnet_dssync_process(TALLOC_CTX *mem_ctx,
ctr6->first_object,
ctx);
if (!NT_STATUS_IS_OK(status)) {
+ ctx->error_message = talloc_asprintf(mem_ctx,
+ "Failed to call processing function: %s",
+ nt_errstr(status));
goto out;
}
}
diff --git a/source/libsmb/doserr.c b/source/libsmb/doserr.c
index 12999e7..bbb12e0 100644
--- a/source/libsmb/doserr.c
+++ b/source/libsmb/doserr.c
@@ -118,6 +118,8 @@ werror_code_struct dos_errs[] =
{ "WERR_PASSWORD_MUST_CHANGE", WERR_PASSWORD_MUST_CHANGE },
{ "WERR_DOMAIN_CONTROLLER_NOT_FOUND", WERR_DOMAIN_CONTROLLER_NOT_FOUND },
{ "WERR_ACCOUNT_LOCKED_OUT", WERR_ACCOUNT_LOCKED_OUT },
+ { "WERR_DS_DRA_BAD_DN", WERR_DS_DRA_BAD_DN },
+ { "WERR_DS_DRA_BAD_NC", WERR_DS_DRA_BAD_NC },
{ NULL, W_ERROR(0) }
};
@@ -145,6 +147,8 @@ werror_str_struct dos_err_strs[] = {
{ WERR_NONE_MAPPED, "Could not map names to SIDs" },
{ WERR_NO_SUCH_USER, "No such User" },
{ WERR_GROUP_EXISTS, "Group already exists" },
+ { WERR_DS_DRA_BAD_DN, "An invalid distinguished name was specified for this replication" },
+ { WERR_DS_DRA_BAD_NC, "An invalid naming context was specified for this replication operation" },
};
/*****************************************************************************
--
Samba Shared Repository
More information about the samba-cvs
mailing list