The branch, master has been updated via a4e8869 Fix service control for non-internal services. via 7542b63 libreplace: Bug 8107, Fix poll replacement to become a msleep replacement from ffd61e2 ldb: bump version to 1.1.13 so the 4.0 release can get the isprint fix
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit a4e8869f7c93f30dd7014ff83d6d2f2b5afc2d64 Author: Vladimir Marek <vladimir.ma...@oracle.com> Date: Mon Sep 17 13:50:55 2012 -0700 Fix service control for non-internal services. Signed-off-by: Jeremy Allison <j...@samba.org> Autobuild-User(master): Jeremy Allison <j...@samba.org> Autobuild-Date(master): Tue Sep 18 01:42:23 CEST 2012 on sn-devel-104 commit 7542b63188f7e73588c9abb40e36a910c87bc534 Author: Joachim Schmitz <schm...@hp.com> Date: Mon Sep 17 05:26:31 2012 -0700 libreplace: Bug 8107, Fix poll replacement to become a msleep replacement Signed-off-by: Jeremy Allison <j...@samba.org> ----------------------------------------------------------------------- Summary of changes: lib/replace/poll.c | 2 +- source3/rpc_server/svcctl/srv_svcctl_reg.c | 4 ---- 2 files changed, 1 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/replace/poll.c b/lib/replace/poll.c index 95b2f88..27876bb 100644 --- a/lib/replace/poll.c +++ b/lib/replace/poll.c @@ -46,7 +46,7 @@ int rep_poll(struct pollfd *fds, nfds_t nfds, int timeout) int rc; nfds_t i; - if (fds == NULL) { + if ((fds == NULL) && (nfds != 0)) { errno = EFAULT; return -1; } diff --git a/source3/rpc_server/svcctl/srv_svcctl_reg.c b/source3/rpc_server/svcctl/srv_svcctl_reg.c index c3ce43f..930c327 100644 --- a/source3/rpc_server/svcctl/srv_svcctl_reg.c +++ b/source3/rpc_server/svcctl/srv_svcctl_reg.c @@ -392,10 +392,6 @@ static bool svcctl_add_service(TALLOC_CTX *mem_ctx, } } - if (ipath == NULL || dname == NULL || description == NULL) { - goto done; - } - /* Default to an external service if we haven't found a match */ if (builtin_svcs[i].servicename == NULL) { struct rcinit_file_information *init_info = NULL; -- Samba Shared Repository