[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Wed Apr 2 14:41:04 MDT 2014
The branch, master has been updated
via 32b35b8 script to generate content for libcli/util/nterr.c & libcli/util/ntstatus.h
via e9522b5 Add error codes and message descriptions for NTSTATUS
via 983fc4e Use correct error code value for NT_STATUS_RPC_ENUM_VALUE_OUT_OF_RANGE
via 4f9dd94 script to generate libcli/util/hresult.c & libcli/util/hresult.h
via 57a4319 Allow FSRVP access generic HRESULT error message descriptions
via 027afd1 Add autogenerated HRESULT error codes and descriptions from MS_ERREF
from 85f57eb torture-samr: Add testing of account lockout and password change behaviour
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 32b35b8d92075dc25f2e29be5a10648e2e5cbda6
Author: Noel Power <noel.power at suse.com>
Date: Mon Mar 24 20:35:50 2014 +0000
script to generate content for libcli/util/nterr.c & libcli/util/ntstatus.h
A ropey script to generate some missing NT_STATUS error codes and
and descriptions. The script generates ntstatus.c & ntstatus.h
whose contents are used to extend the existing contents of
libcli/util/nterr.c & libcli/util/ntstatus.h
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: David Disseldorp <ddiss at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Wed Apr 2 22:40:06 CEST 2014 on sn-devel-104
commit e9522b5ee342f07b1435f7a0a82eaff297970237
Author: Noel Power <noel.power at suse.com>
Date: Mon Mar 24 17:19:54 2014 +0000
Add error codes and message descriptions for NTSTATUS
Error codes and descriptions were autogenerated from [MS-ERREF]
see http://msdn.microsoft.com/en-us/library/cc704588.aspx
Additionally some missing error descriptions for existing errors were
identified and generated.
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: David Disseldorp <ddiss at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit 983fc4e4a41bfce79acc997c63b7fa832f7b5d0b
Author: Noel Power <noel.power at suse.com>
Date: Mon Mar 24 19:19:42 2014 +0000
Use correct error code value for NT_STATUS_RPC_ENUM_VALUE_OUT_OF_RANGE
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: David Disseldorp <ddiss at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit 4f9dd94819b5cebe53bbc34d69df408f2eb1e800
Author: Noel Power <noel.power at suse.com>
Date: Mon Mar 24 15:02:45 2014 +0000
script to generate libcli/util/hresult.c & libcli/util/hresult.h
This hacky script was used to generate the contents of libcli/util/hresult.c
& libcli/util/hresult.h. It expects the table contents of
http://msdn.microsoft.com/en-us/library/cc704587.aspx cut'n'pasted into
the text file specified as it's single required input param
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: David Disseldorp <ddiss at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit 57a4319baaee011f2604eadeac655ff1c84d4312
Author: Noel Power <noel.power at suse.com>
Date: Mon Mar 24 11:52:48 2014 +0000
Allow FSRVP access generic HRESULT error message descriptions
FSRVP can possibly return any HRESULT error in addition to it's own
specific errors. This change searches the HRESULT errors for a description
if the error doesn't match any of the known FSRVP ones.
Also removed some errors defined in fsrvp.idl (now that they are defined
in hresult.h)
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: David Disseldorp <ddiss at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit 027afd11ca404f24726013d0f9805f42b14e59d7
Author: Noel Power <noel.power at suse.com>
Date: Mon Mar 10 11:00:38 2014 +0000
Add autogenerated HRESULT error codes and descriptions from MS_ERREF
error codes & string descriptions are generated from
http://msdn.microsoft.com/en-us/library/cc704587.aspx, additionally there
is a function to return the error description from the error code,
this function will also try to determine the error description
associated with a W_ERROR code translated as a HRESULT.
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: David Disseldorp <ddiss at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
-----------------------------------------------------------------------
Summary of changes:
libcli/util/hresult.c |11759 +++++++++++++++++++++++++++++++++
libcli/util/hresult.h | 2980 +++++++++
libcli/util/nterr.c | 2975 +++++++++
libcli/util/ntstatus.h | 1265 ++++-
libcli/util/wscript_build | 4 +-
librpc/idl/fsrvp.idl | 6 -
source3/rpcclient/cmd_fss.c | 8 +
source4/scripting/bin/gen_hresult.py | 207 +
source4/scripting/bin/gen_ntstatus.py | 243 +
source4/torture/rpc/fsrvp.c | 5 +-
10 files changed, 19441 insertions(+), 11 deletions(-)
create mode 100644 libcli/util/hresult.c
create mode 100644 libcli/util/hresult.h
create mode 100755 source4/scripting/bin/gen_hresult.py
create mode 100755 source4/scripting/bin/gen_ntstatus.py
Changeset truncated at 500 lines:
diff --git a/libcli/util/hresult.c b/libcli/util/hresult.c
new file mode 100644
index 0000000..4c15588
--- /dev/null
+++ b/libcli/util/hresult.c
@@ -0,0 +1,11759 @@
+/*
+ * Unix SMB/CIFS implementation.
+ *
+ * HRESULT Error definitions
+ *
+ * Copyright (C) Noel Power <noel.power at suse.com> 2014
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "includes.h"
+#include "hresult.h"
+/*
+ * The following error codes and descriptions are autogenerated from [MS-ERREF]
+ * see http://msdn.microsoft.com/en-us/library/cc704587.aspx
+ */
+
+static const struct {
+ HRESULT error_code;
+ const char *error_str;
+} hresult_errs[] = {
+ {
+ HRES_STG_S_CONVERTED,
+ "The underlying file was converted to compound file format."
+ },
+ {
+ HRES_STG_S_BLOCK,
+ "The storage operation should block until more data is available."
+ },
+ {
+ HRES_STG_S_RETRYNOW,
+ "The storage operation should retry immediately."
+ },
+ {
+ HRES_STG_S_MONITORING,
+ "The notified event sink will not influence the storage operation."
+ },
+ {
+ HRES_STG_S_MULTIPLEOPENS,
+ "Multiple opens prevent consolidated (commit succeeded)."
+ },
+ {
+ HRES_STG_S_CONSOLIDATIONFAILED,
+ "Consolidation of the storage file failed (commit succeeded)."
+ },
+ {
+ HRES_STG_S_CANNOTCONSOLIDATE,
+ "Consolidation of the storage file is inappropriate (commit succeeded)."
+ },
+ {
+ HRES_OLE_S_USEREG,
+ "Use the registry database to provide the requested information."
+ },
+ {
+ HRES_OLE_S_STATIC,
+ "Success, but static."
+ },
+ {
+ HRES_OLE_S_MAC_CLIPFORMAT,
+ "Macintosh clipboard format."
+ },
+ {
+ HRES_DRAGDROP_S_DROP,
+ "Successful drop took place."
+ },
+ {
+ HRES_DRAGDROP_S_CANCEL,
+ "Drag-drop operation canceled."
+ },
+ {
+ HRES_DRAGDROP_S_USEDEFAULTCURSORS,
+ "Use the default cursor."
+ },
+ {
+ HRES_DATA_S_SAMEFORMATETC,
+ "Data has same FORMATETC."
+ },
+ {
+ HRES_VIEW_S_ALREADY_FROZEN,
+ "View is already frozen."
+ },
+ {
+ HRES_CACHE_S_FORMATETC_NOTSUPPORTED,
+ "FORMATETC not supported."
+ },
+ {
+ HRES_CACHE_S_SAMECACHE,
+ "Same cache."
+ },
+ {
+ HRES_CACHE_S_SOMECACHES_NOTUPDATED,
+ "Some caches are not updated."
+ },
+ {
+ HRES_OLEOBJ_S_INVALIDVERB,
+ "Invalid verb for OLE object."
+ },
+ {
+ HRES_OLEOBJ_S_CANNOT_DOVERB_NOW,
+ "Verb number is valid but verb cannot be done now."
+ },
+ {
+ HRES_OLEOBJ_S_INVALIDHWND,
+ "Invalid window handle passed."
+ },
+ {
+ HRES_INPLACE_S_TRUNCATED,
+ "Message is too long; some of it had to be truncated before displaying."
+ },
+ {
+ HRES_CONVERT10_S_NO_PRESENTATION,
+ "Unable to convert OLESTREAM to IStorage."
+ },
+ {
+ HRES_MK_S_REDUCED_TO_SELF,
+ "Moniker reduced to itself."
+ },
+ {
+ HRES_MK_S_ME,
+ "Common prefix is this moniker."
+ },
+ {
+ HRES_MK_S_HIM,
+ "Common prefix is input moniker."
+ },
+ {
+ HRES_MK_S_US,
+ "Common prefix is both monikers."
+ },
+ {
+ HRES_MK_S_MONIKERALREADYREGISTERED,
+ "Moniker is already registered in running object table."
+ },
+ {
+ HRES_EVENT_S_SOME_SUBSCRIBERS_FAILED,
+ "An event was able to invoke some, but not all, of the subscribers."
+ },
+ {
+ HRES_EVENT_S_NOSUBSCRIBERS,
+ "An event was delivered, but there were no subscribers."
+ },
+ {
+ HRES_SCHED_S_TASK_READY,
+ "The task is ready to run at its next scheduled time."
+ },
+ {
+ HRES_SCHED_S_TASK_RUNNING,
+ "The task is currently running."
+ },
+ {
+ HRES_SCHED_S_TASK_DISABLED,
+ "The task will not run at the scheduled times because it has been disabled."
+ },
+ {
+ HRES_SCHED_S_TASK_HAS_NOT_RUN,
+ "The task has not yet run."
+ },
+ {
+ HRES_SCHED_S_TASK_NO_MORE_RUNS,
+ "There are no more runs scheduled for this task."
+ },
+ {
+ HRES_SCHED_S_TASK_NOT_SCHEDULED,
+ "One or more of the properties that are needed to run this task on a schedule have not been set."
+ },
+ {
+ HRES_SCHED_S_TASK_TERMINATED,
+ "The last run of the task was terminated by the user."
+ },
+ {
+ HRES_SCHED_S_TASK_NO_VALID_TRIGGERS,
+ "Either the task has no triggers, or the existing triggers are disabled or not set."
+ },
+ {
+ HRES_SCHED_S_EVENT_TRIGGER,
+ "Event triggers do not have set run times."
+ },
+ {
+ HRES_SCHED_S_SOME_TRIGGERS_FAILED,
+ "The task is registered, but not all specified triggers will start the task."
+ },
+ {
+ HRES_SCHED_S_BATCH_LOGON_PROBLEM,
+ "The task is registered, but it may fail to start. Batch logon privilege needs to be enabled for the task principal."
+ },
+ {
+ HRES_XACT_S_ASYNC,
+ "An asynchronous operation was specified. The operation has begun, but its outcome is not known yet."
+ },
+ {
+ HRES_XACT_S_READONLY,
+ "The method call succeeded because the transaction was read-only."
+ },
+ {
+ HRES_XACT_S_SOMENORETAIN,
+ "The transaction was successfully aborted. However, this is a coordinated transaction, and a number of enlisted resources were aborted outright because they could not support abort-retaining semantics."
+ },
+ {
+ HRES_XACT_S_OKINFORM,
+ "No changes were made during this call, but the sink wants another chance to look if any other sinks make further changes."
+ },
+ {
+ HRES_XACT_S_MADECHANGESCONTENT,
+ "The sink is content and wants the transaction to proceed. Changes were made to one or more resources during this call."
+ },
+ {
+ HRES_XACT_S_MADECHANGESINFORM,
+ "The sink is for the moment and wants the transaction to proceed, but if other changes are made following this return by other event sinks, this sink wants another chance to look."
+ },
+ {
+ HRES_XACT_S_ALLNORETAIN,
+ "The transaction was successfully aborted. However, the abort was nonretaining."
+ },
+ {
+ HRES_XACT_S_ABORTING,
+ "An abort operation was already in progress."
+ },
+ {
+ HRES_XACT_S_SINGLEPHASE,
+ "The resource manager has performed a single-phase commit of the transaction."
+ },
+ {
+ HRES_XACT_S_LOCALLY_OK,
+ "The local transaction has not aborted."
+ },
+ {
+ HRES_XACT_S_LASTRESOURCEMANAGER,
+ "The resource manager has requested to be the coordinator (last resource manager) for the transaction."
+ },
+ {
+ HRES_CO_S_NOTALLINTERFACES,
+ "Not all the requested interfaces were available."
+ },
+ {
+ HRES_CO_S_MACHINENAMENOTFOUND,
+ "The specified machine name was not found in the cache."
+ },
+ {
+ HRES_SEC_I_CONTINUE_NEEDED,
+ "The function completed successfully, but it must be called again to complete the context."
+ },
+ {
+ HRES_SEC_I_COMPLETE_NEEDED,
+ "The function completed successfully, but CompleteToken must be called."
+ },
+ {
+ HRES_SEC_I_COMPLETE_AND_CONTINUE,
+ "The function completed successfully, but both CompleteToken and this function must be called to complete the context."
+ },
+ {
+ HRES_SEC_I_LOCAL_LOGON,
+ "The logon was completed, but no network authority was available. The logon was made using locally known information."
+ },
+ {
+ HRES_SEC_I_CONTEXT_EXPIRED,
+ "The context has expired and can no longer be used."
+ },
+ {
+ HRES_SEC_I_INCOMPLETE_CREDENTIALS,
+ "The credentials supplied were not complete and could not be verified. Additional information can be returned from the context."
+ },
+ {
+ HRES_SEC_I_RENEGOTIATE,
+ "The context data must be renegotiated with the peer."
+ },
+ {
+ HRES_SEC_I_NO_LSA_CONTEXT,
+ "There is no LSA mode context associated with this context."
+ },
+ {
+ HRES_SEC_I_SIGNATURE_NEEDED,
+ "A signature operation must be performed before the user can authenticate."
+ },
+ {
+ HRES_CRYPT_I_NEW_PROTECTION_REQUIRED,
+ "The protected data needs to be reprotected."
+ },
+ {
+ HRES_NS_S_CALLPENDING,
+ "The requested operation is pending completion."
+ },
+ {
+ HRES_NS_S_CALLABORTED,
+ "The requested operation was aborted by the client."
+ },
+ {
+ HRES_NS_S_STREAM_TRUNCATED,
+ "The stream was purposefully stopped before completion."
+ },
+ {
+ HRES_NS_S_REBUFFERING,
+ "The requested operation has caused the source to rebuffer."
+ },
+ {
+ HRES_NS_S_DEGRADING_QUALITY,
+ "The requested operation has caused the source to degrade codec quality."
+ },
+ {
+ HRES_NS_S_TRANSCRYPTOR_EOF,
+ "The transcryptor object has reached end of file."
+ },
+ {
+ HRES_NS_S_WMP_UI_VERSIONMISMATCH,
+ "An upgrade may be needed for the theme manager to correctly show this skin. Skin reports version: %.1f."
+ },
+ {
+ HRES_NS_S_WMP_EXCEPTION,
+ "An error occurred in one of the UI components."
+ },
+ {
+ HRES_NS_S_WMP_LOADED_GIF_IMAGE,
+ "Successfully loaded a GIF file."
+ },
+ {
+ HRES_NS_S_WMP_LOADED_PNG_IMAGE,
+ "Successfully loaded a PNG file."
+ },
+ {
+ HRES_NS_S_WMP_LOADED_BMP_IMAGE,
+ "Successfully loaded a BMP file."
+ },
+ {
+ HRES_NS_S_WMP_LOADED_JPG_IMAGE,
+ "Successfully loaded a JPG file."
+ },
+ {
+ HRES_NS_S_WMG_FORCE_DROP_FRAME,
+ "Drop this frame."
+ },
+ {
+ HRES_NS_S_WMR_ALREADYRENDERED,
+ "The specified stream has already been rendered."
+ },
+ {
+ HRES_NS_S_WMR_PINTYPEPARTIALMATCH,
+ "The specified type partially matches this pin type."
+ },
+ {
+ HRES_NS_S_WMR_PINTYPEFULLMATCH,
+ "The specified type fully matches this pin type."
+ },
+ {
+ HRES_NS_S_WMG_ADVISE_DROP_FRAME,
+ "The timestamp is late compared to the current render position. Advise dropping this frame."
+ },
+ {
+ HRES_NS_S_WMG_ADVISE_DROP_TO_KEYFRAME,
+ "The timestamp is severely late compared to the current render position. Advise dropping everything up to the next key frame."
+ },
+ {
+ HRES_NS_S_NEED_TO_BUY_BURN_RIGHTS,
+ "No burn rights. You will be prompted to buy burn rights when you try to burn this file to an audio CD."
+ },
+ {
+ HRES_NS_S_WMPCORE_PLAYLISTCLEARABORT,
+ "Failed to clear playlist because it was aborted by user."
+ },
+ {
+ HRES_NS_S_WMPCORE_PLAYLISTREMOVEITEMABORT,
+ "Failed to remove item in the playlist since it was aborted by user."
+ },
+ {
+ HRES_NS_S_WMPCORE_PLAYLIST_CREATION_PENDING,
+ "Playlist is being generated asynchronously."
+ },
+ {
+ HRES_NS_S_WMPCORE_MEDIA_VALIDATION_PENDING,
+ "Validation of the media is pending."
+ },
+ {
+ HRES_NS_S_WMPCORE_PLAYLIST_REPEAT_SECONDARY_SEGMENTS_IGNORED,
+ "Encountered more than one Repeat block during ASX processing."
+ },
+ {
+ HRES_NS_S_WMPCORE_COMMAND_NOT_AVAILABLE,
+ "Current state of WMP disallows calling this method or property."
+ },
+ {
+ HRES_NS_S_WMPCORE_PLAYLIST_NAME_AUTO_GENERATED,
+ "Name for the playlist has been auto generated."
+ },
+ {
+ HRES_NS_S_WMPCORE_PLAYLIST_IMPORT_MISSING_ITEMS,
+ "The imported playlist does not contain all items from the original."
+ },
+ {
+ HRES_NS_S_WMPCORE_PLAYLIST_COLLAPSED_TO_SINGLE_MEDIA,
+ "The M3U playlist has been ignored because it only contains one item."
+ },
+ {
+ HRES_NS_S_WMPCORE_MEDIA_CHILD_PLAYLIST_OPEN_PENDING,
+ "The open for the child playlist associated with this media is pending."
+ },
+ {
+ HRES_NS_S_WMPCORE_MORE_NODES_AVAIABLE,
+ "More nodes support the interface requested, but the array for returning them is full."
+ },
+ {
+ HRES_NS_S_WMPBR_SUCCESS,
+ "Backup or Restore successful!."
+ },
+ {
+ HRES_NS_S_WMPBR_PARTIALSUCCESS,
+ "Transfer complete with limitations."
+ },
+ {
+ HRES_NS_S_WMPEFFECT_TRANSPARENT,
+ "Request to the effects control to change transparency status to transparent."
+ },
+ {
+ HRES_NS_S_WMPEFFECT_OPAQUE,
+ "Request to the effects control to change transparency status to opaque."
+ },
+ {
+ HRES_NS_S_OPERATION_PENDING,
+ "The requested application pane is performing an operation and will not be released."
+ },
+ {
+ HRES_NS_S_TRACK_BUY_REQUIRES_ALBUM_PURCHASE,
+ "The file is only available for purchase when you buy the entire album."
+ },
+ {
+ HRES_NS_S_NAVIGATION_COMPLETE_WITH_ERRORS,
+ "There were problems completing the requested navigation. There are identifiers missing in the catalog."
+ },
+ {
+ HRES_NS_S_TRACK_ALREADY_DOWNLOADED,
+ "Track already downloaded."
+ },
+ {
+ HRES_NS_S_PUBLISHING_POINT_STARTED_WITH_FAILED_SINKS,
+ "The publishing point successfully started, but one or more of the requested data writer plug-ins failed."
+ },
+ {
+ HRES_NS_S_DRM_LICENSE_ACQUIRED,
+ "Status message: The license was acquired."
+ },
+ {
+ HRES_NS_S_DRM_INDIVIDUALIZED,
+ "Status message: The security upgrade has been completed."
+ },
+ {
+ HRES_NS_S_DRM_MONITOR_CANCELLED,
+ "Status message: License monitoring has been canceled."
+ },
+ {
+ HRES_NS_S_DRM_ACQUIRE_CANCELLED,
+ "Status message: License acquisition has been canceled."
+ },
+ {
+ HRES_NS_S_DRM_BURNABLE_TRACK,
+ "The track is burnable and had no playlist burn limit."
+ },
+ {
+ HRES_NS_S_DRM_BURNABLE_TRACK_WITH_PLAYLIST_RESTRICTION,
+ "The track is burnable but has a playlist burn limit."
+ },
+ {
+ HRES_NS_S_DRM_NEEDS_INDIVIDUALIZATION,
+ "A security upgrade is required to perform the operation on this media file."
+ },
+ {
+ HRES_NS_S_REBOOT_RECOMMENDED,
+ "Installation was successful; however, some file cleanup is not complete. For best results, restart your computer."
+ },
+ {
+ HRES_NS_S_REBOOT_REQUIRED,
+ "Installation was successful; however, some file cleanup is not complete. To continue, you must restart your computer."
+ },
+ {
+ HRES_NS_S_EOSRECEDING,
+ "EOS hit during rewinding."
+ },
+ {
+ HRES_NS_S_CHANGENOTICE,
+ "Internal."
+ },
+ {
+ HRES_ERROR_FLT_IO_COMPLETE,
+ "The IO was completed by a filter."
+ },
+ {
+ HRES_ERROR_GRAPHICS_MODE_NOT_PINNED,
--
Samba Shared Repository
More information about the samba-cvs
mailing list