diff options
| author | Jeremy Allison <jra@samba.org> | 2009-04-09 22:46:59 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-04-09 22:46:59 -0700 |
| commit | 7f10bf980edef3ace1522d0c9c082b35e225c950 (patch) | |
| tree | d4e9af21de194cca812e754b28f9358a3651f4ce /libcli/util | |
| parent | f8f68703da58cf7f61b655b48bbbc45cda647748 (diff) | |
| parent | f930f504e1d5e78d2f6f36cab9ce36dbeb34e955 (diff) | |
| download | samba-7f10bf980edef3ace1522d0c9c082b35e225c950.tar.gz samba-7f10bf980edef3ace1522d0c9c082b35e225c950.tar.bz2 samba-7f10bf980edef3ace1522d0c9c082b35e225c950.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'libcli/util')
| -rw-r--r-- | libcli/util/doserr.c | 3 | ||||
| -rw-r--r-- | libcli/util/ntstatus.h | 4 | ||||
| -rw-r--r-- | libcli/util/werror.h | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/libcli/util/doserr.c b/libcli/util/doserr.c index 1a7422e3f6..1151d3236b 100644 --- a/libcli/util/doserr.c +++ b/libcli/util/doserr.c @@ -168,7 +168,10 @@ static const struct werror_code_struct dos_errs[] = { "WERR_REG_FILE_INVALID", WERR_REG_FILE_INVALID }, { "WERR_NO_SUCH_SERVICE", WERR_NO_SUCH_SERVICE }, { "WERR_SERVICE_DISABLED", WERR_SERVICE_DISABLED }, + { "WERR_SERVICE_MARKED_FOR_DELETE", WERR_SERVICE_MARKED_FOR_DELETE }, + { "WERR_SERVICE_EXISTS", WERR_SERVICE_EXISTS }, { "WERR_SERVICE_NEVER_STARTED", WERR_SERVICE_NEVER_STARTED }, + { "WERR_DUPLICATE_SERVICE_NAME", WERR_DUPLICATE_SERVICE_NAME }, { "WERR_PASSWORD_MUST_CHANGE", WERR_PASSWORD_MUST_CHANGE }, { "WERR_ACCOUNT_LOCKED_OUT", WERR_ACCOUNT_LOCKED_OUT }, { "WERR_UNKNOWN_PRINT_MONITOR", WERR_UNKNOWN_PRINT_MONITOR }, diff --git a/libcli/util/ntstatus.h b/libcli/util/ntstatus.h index 1608e2874f..a97ef5337e 100644 --- a/libcli/util/ntstatus.h +++ b/libcli/util/ntstatus.h @@ -60,8 +60,8 @@ typedef uint32_t NTSTATUS; #define ERROR_INSUFFICIENT_BUFFER NT_STATUS(0x007a) #define ERROR_INVALID_DATATYPE NT_STATUS(0x070c) -/* XXX Win7 Status code: Name unknown. */ -#define NT_STATUS_WIN7_INVALID_RANGE NT_STATUS(0xC0000000 | 0x01a1) +/* Win7 status codes. */ +#define NT_STATUS_INVALID_LOCK_RANGE NT_STATUS(0xC0000000 | 0x01a1) /* Win32 Error codes extracted using a loop in smbclient then printing a netmon sniff to a file. */ diff --git a/libcli/util/werror.h b/libcli/util/werror.h index a69587f361..2e6b696d3f 100644 --- a/libcli/util/werror.h +++ b/libcli/util/werror.h @@ -113,7 +113,10 @@ typedef uint32_t WERROR; #define WERR_INVALID_SERVICE_CONTROL W_ERROR(1052) #define WERR_SERVICE_ALREADY_RUNNING W_ERROR(1056) #define WERR_SERVICE_DISABLED W_ERROR(1058) +#define WERR_SERVICE_MARKED_FOR_DELETE W_ERROR(1072) +#define WERR_SERVICE_EXISTS W_ERROR(1073) #define WERR_SERVICE_NEVER_STARTED W_ERROR(1077) +#define WERR_DUPLICATE_SERVICE_NAME W_ERROR(1078) #define WERR_DEVICE_NOT_CONNECTED W_ERROR(1167) #define WERR_NOT_FOUND W_ERROR(1168) #define WERR_INVALID_COMPUTERNAME W_ERROR(1210) @@ -195,6 +198,7 @@ typedef uint32_t WERROR; /* Configuration Manager Errors */ /* Basically Win32 errors meanings are specific to the \ntsvcs pipe */ +#define WERR_CM_INVALID_POINTER W_ERROR(3) #define WERR_CM_BUFFER_SMALL W_ERROR(26) #define WERR_CM_NO_MORE_HW_PROFILES W_ERROR(35) #define WERR_CM_NO_SUCH_VALUE W_ERROR(37) |