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/lib | |
| 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/lib')
| -rw-r--r-- | source3/lib/messages.c | 2 | ||||
| -rw-r--r-- | source3/lib/privileges.c | 5 | ||||
| -rw-r--r-- | source3/lib/select.c | 7 |
3 files changed, 11 insertions, 3 deletions
diff --git a/source3/lib/messages.c b/source3/lib/messages.c index dca4b94844..21b5531c89 100644 --- a/source3/lib/messages.c +++ b/source3/lib/messages.c @@ -76,7 +76,7 @@ static struct dispatch_fns { static void sig_usr1(void) { received_signal = 1; - sys_select_signal(); + sys_select_signal(SIGUSR1); } /**************************************************************************** diff --git a/source3/lib/privileges.c b/source3/lib/privileges.c index e01561de06..ae98d8940f 100644 --- a/source3/lib/privileges.c +++ b/source3/lib/privileges.c @@ -39,6 +39,7 @@ const SE_PRIV se_print_operator = SE_PRINT_OPERATOR; const SE_PRIV se_add_users = SE_ADD_USERS; const SE_PRIV se_disk_operators = SE_DISK_OPERATOR; const SE_PRIV se_remote_shutdown = SE_REMOTE_SHUTDOWN; +const SE_PRIV se_restore = SE_RESTORE; /******************************************************************** This is a list of privileges reported by a WIndows 2000 SP4 AD DC @@ -91,6 +92,9 @@ PRIVS privs[] = { {SE_ADD_USERS, "SeAddUsersPrivilege", "Add users and groups to the domain"}, {SE_REMOTE_SHUTDOWN, "SeRemoteShutdownPrivilege", "Force shutdown from a remote system"}, {SE_DISK_OPERATOR, "SeDiskOperatorPrivilege", "Manage disk shares"}, + {SE_BACKUP, "SeBackupPrivilege", "Back up files and directories"}, + {SE_RESTORE, "SeRestorePrivilege", "Restore files and directories"}, + {SE_TAKE_OWNERSHIP, "SeTakeOwnershipPrivilege", "Take ownership of files or other objects"}, {SE_END, "", ""} }; @@ -636,6 +640,7 @@ NTSTATUS privilege_create_account(const DOM_SID *sid ) /**************************************************************************** initialise a privilege list and set the talloc context ****************************************************************************/ + NTSTATUS privilege_set_init(PRIVILEGE_SET *priv_set) { TALLOC_CTX *mem_ctx; diff --git a/source3/lib/select.c b/source3/lib/select.c index 2e55f9753d..f63221f7cf 100644 --- a/source3/lib/select.c +++ b/source3/lib/select.c @@ -38,9 +38,8 @@ static VOLATILE unsigned pipe_written, pipe_read; nasty signal race condition. ********************************************************************/ -void sys_select_signal(void) +void sys_select_signal(char c) { - char c = 1; if (!initialised) return; if (pipe_written > pipe_read+256) return; @@ -111,6 +110,10 @@ int sys_select(int maxfd, fd_set *readfds, fd_set *writefds, fd_set *errorfds, s byte in the pipe and lose the signal. JRA. */ ret = -1; +#if 0 + /* JRA - we can use this to debug the signal messaging... */ + DEBUG(0,("select got %u signal\n", (unsigned int)c)); +#endif errno = EINTR; } else { FD_CLR(select_pipe[0], readfds2); |