diff options
| author | Gerald Carter <jerry@samba.org> | 2005-06-09 15:20:11 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:57:09 -0500 |
| commit | 129b461673ecd0ad4d16c0c99585dd5c067172df (patch) | |
| tree | 1a87e9c9f5e6f89c70488e3a8fa0efb8c7e8c83d /source3/include | |
| parent | d197ddd4c331d12c6b1d4d582a37c49768cba856 (diff) | |
| download | samba-129b461673ecd0ad4d16c0c99585dd5c067172df.tar.gz samba-129b461673ecd0ad4d16c0c99585dd5c067172df.tar.bz2 samba-129b461673ecd0ad4d16c0c99585dd5c067172df.zip | |
r7440: * merge registry server changes from trunk (so far) for more
printmig.exe work
* merge the sys_select_signal(char c) change from trunk
in order to keeo the winbind code in sync
(This used to be commit a112c5570a7f8ddddde1af0fa665f40a6067e8cf)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/doserr.h | 3 | ||||
| -rw-r--r-- | source3/include/privileges.h | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/source3/include/doserr.h b/source3/include/doserr.h index 60a3c335ec..38cd87515e 100644 --- a/source3/include/doserr.h +++ b/source3/include/doserr.h @@ -185,6 +185,9 @@ #define WERR_INVALID_OWNER W_ERROR(1307) #define WERR_IO_PENDING W_ERROR(997) #define WERR_CAN_NOT_COMPLETE W_ERROR(1003) +#define WERR_REG_CORRUPT W_ERROR(1015) +#define WERR_REG_IO_FAILURE W_ERROR(1016) +#define WERR_REG_FILE_INVALID W_ERROR(1017) #define WERR_NO_SUCH_SERVICE W_ERROR(1060) #define WERR_INVALID_SERVICE_CONTROL W_ERROR(1052) #define WERR_INVALID_SECURITY_DESCRIPTOR W_ERROR(1338) diff --git a/source3/include/privileges.h b/source3/include/privileges.h index c7a9b0560d..38edee84e8 100644 --- a/source3/include/privileges.h +++ b/source3/include/privileges.h @@ -57,6 +57,9 @@ typedef struct { #define SE_ADD_USERS { { 0x00000040, 0x00000000, 0x00000000, 0x00000000 } } #define SE_DISK_OPERATOR { { 0x00000080, 0x00000000, 0x00000000, 0x00000000 } } #define SE_REMOTE_SHUTDOWN { { 0x00000100, 0x00000000, 0x00000000, 0x00000000 } } +#define SE_BACKUP { { 0x00000200, 0x00000000, 0x00000000, 0x00000000 } } +#define SE_RESTORE { { 0x00000400, 0x00000000, 0x00000000, 0x00000000 } } +#define SE_TAKE_OWNERSHIP { { 0x00000800, 0x00000000, 0x00000000, 0x00000000 } } /* defined in lib/privilegs.c */ @@ -66,6 +69,7 @@ extern const SE_PRIV se_print_operator; extern const SE_PRIV se_add_users; extern const SE_PRIV se_disk_operators; extern const SE_PRIV se_remote_shutdown; +extern const SE_PRIV se_restore; /* |