The branch, v3-5-test has been updated via f1470f7e46e2a33b40b9660f2c46996174d8c849 (commit) via 577504dd70cc76151dc4c4259a88229e5999b6e3 (commit) via 11c2052c6f1c452ce51f1859e3bbd9690bfcb36f (commit) from e9cb12953f191489b34e84547fc84841ff29515a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log ----------------------------------------------------------------- commit f1470f7e46e2a33b40b9660f2c46996174d8c849 Author: Günther Deschner <g...@samba.org> Date: Wed Sep 30 16:18:29 2009 +0200 s3: re-run make idl. janitor for tridge. Guenther (cherry picked from commit a6567cf198f9d1c9df0f34c463cec3b9f0aa2e54) commit 577504dd70cc76151dc4c4259a88229e5999b6e3 Author: Kamen Mazdrashki <kamen.mazdras...@postpath.com> Date: Thu Sep 17 13:52:28 2009 +0300 w32err: WERR_DOMAIN_CONTROLLER_NOT_FOUND error value fixed Signed-off-by: Anatoliy Atanasov <anatoliy.atana...@postpath.com> (cherry picked from commit e66911390005f377196d49dffb06cd4ae25ddc5f) commit 11c2052c6f1c452ce51f1859e3bbd9690bfcb36f Author: Kamen Mazdrashki <kamen.mazdras...@postpath.com> Date: Thu Sep 17 23:18:40 2009 +0300 w32err: FRS_ group of errors replaced with numeric values Signed-off-by: Anatoliy Atanasov <anatoliy.atana...@postpath.com> (cherry picked from commit 0e64fcb18f22f31b9004e43f701ea109cef6075d) ----------------------------------------------------------------------- Summary of changes: libcli/util/werror.h | 8 ++++---- librpc/gen_ndr/ndr_ntsvcs.c | 2 +- librpc/gen_ndr/ntsvcs.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/libcli/util/werror.h b/libcli/util/werror.h index 5ae5417..ac4fb37 100644 --- a/libcli/util/werror.h +++ b/libcli/util/werror.h @@ -159,9 +159,9 @@ typedef uint32_t WERROR; #define WERR_INVALID_FORM_NAME W_ERROR(0x0000076E) #define WERR_INVALID_FORM_SIZE W_ERROR(0x0000076F) #define WERR_PASSWORD_MUST_CHANGE W_ERROR(0x00000773) +#define WERR_DOMAIN_CONTROLLER_NOT_FOUND W_ERROR(0x00000774) #define WERR_ACCOUNT_LOCKED_OUT W_ERROR(0x00000775) -#define WERR_DOMAIN_CONTROLLER_NOT_FOUND W_ERROR(0x00000995) /* Error code is wrong, should be 0x00000774 (1908)*/ #define WERR_DEVICE_NOT_AVAILABLE W_ERROR(0x000010DF) @@ -292,9 +292,9 @@ typedef uint32_t WERROR; #define WERR_DS_DUP_MSDS_INTID W_ERROR(0x00002195) /* FRS errors */ -#define WERR_FRS_INSUFFICIENT_PRIV W_ERROR(FRS_ERR_BASE+7) -#define WERR_FRS_SYSVOL_IS_BUSY W_ERROR(FRS_ERR_BASE+15) -#define WERR_FRS_INVALID_SERVICE_PARAMETER W_ERROR(FRS_ERR_BASE+17) +#define WERR_FRS_INSUFFICIENT_PRIV W_ERROR(0x00001F47) +#define WERR_FRS_SYSVOL_IS_BUSY W_ERROR(0x00001F4F) +#define WERR_FRS_INVALID_SERVICE_PARAMETER W_ERROR(0x00001F51) /* RPC/COM/OLE HRESULT error codes */ /* RPC errors */ diff --git a/librpc/gen_ndr/ndr_ntsvcs.c b/librpc/gen_ndr/ndr_ntsvcs.c index 64917b4..f17033f 100644 --- a/librpc/gen_ndr/ndr_ntsvcs.c +++ b/librpc/gen_ndr/ndr_ntsvcs.c @@ -3,7 +3,7 @@ #include "includes.h" #include "../librpc/gen_ndr/ndr_ntsvcs.h" -#include "librpc/gen_ndr/ndr_winreg.h" +#include "librpc/gen_ndr/ndr_misc.h" static enum ndr_err_code ndr_push_PNP_GetIdListFlags(struct ndr_push *ndr, int ndr_flags, uint32_t r) { NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r)); diff --git a/librpc/gen_ndr/ntsvcs.h b/librpc/gen_ndr/ntsvcs.h index f59fcae..76b2628 100644 --- a/librpc/gen_ndr/ntsvcs.h +++ b/librpc/gen_ndr/ntsvcs.h @@ -4,7 +4,7 @@ #include "libcli/util/ntstatus.h" -#include "librpc/gen_ndr/winreg.h" +#include "librpc/gen_ndr/misc.h" #ifndef _HEADER_ntsvcs #define _HEADER_ntsvcs -- Samba Shared Repository