Attachment 9808 Details for Bug 48427 – 1.diff

[patch] 1.diff

1.diff (text/plain), 2.73 KB, created by Arvid Requate on 2019-01-21 19:19:59 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2019-01-21 19:19:59 CET

Size: 2.73 KB

patch

obsolete

>diff --git a/management/univention-directory-notifier/02univention-directory-notifier.inst b/management/univention-directory-notifier/02univention-directory-notifier.inst
>index 1672be4b4a..d4162ce1be 100755
>--- a/management/univention-directory-notifier/02univention-directory-notifier.inst
>+++ b/management/univention-directory-notifier/02univention-directory-notifier.inst
>@@ -37,6 +37,8 @@ joinscript_init
> 
> ln -snf /etc/runit/univention-directory-notifier /etc/runit/univention/univention-directory-notifier
> 
>+ucs_registerLDAPExtension "$@" --schema /usr/share/univention-ldap/schema/univention-translog.schema
>+
> /etc/init.d/univention-directory-notifier start
> 
> joinscript_save_current_version
>diff --git a/management/univention-directory-notifier/debian/univention-directory-notifier.postinst b/management/univention-directory-notifier/debian/univention-directory-notifier.postinst
>index 0d2bfca0e1..a3d19c3c1a 100644
>--- a/management/univention-directory-notifier/debian/univention-directory-notifier.postinst
>+++ b/management/univention-directory-notifier/debian/univention-directory-notifier.postinst
>@@ -101,10 +101,10 @@ then
> 			if /etc/init.d/univention-directory-notifier status >/dev/null
> 			then
> 				/etc/init.d/univention-directory-notifier stop
>-				univention-translog --lenient import
>+				/usr/share/univention-directory-notifier/univention-translog --lenient import
> 				/etc/init.d/univention-directory-notifier start
> 			else
>-				univention-translog --lenient import
>+				/usr/share/univention-directory-notifier/univention-translog --lenient import
> 			fi
> 		else
> 			/etc/init.d/univention-directory-notifier crestart || :
>diff --git a/management/univention-directory-notifier/src/network.c b/management/univention-directory-notifier/src/network.c
>index 160b70f2db..73bc2d6934 100644
>--- a/management/univention-directory-notifier/src/network.c
>+++ b/management/univention-directory-notifier/src/network.c
>@@ -221,7 +221,7 @@ int network_client_main_loop(callback_check check_callbacks) {
> 
> 	/* main loop */
> 	while (1) {
>-		int n, nfds = epoll_wait(epollfd, events, MAX_EVENTS, -1);
>+		int n, nfds = epoll_wait(epollfd, events, MAX_EVENTS, 0);
> 		if (nfds == -1) {
> 			if (errno == EINTR)
> 				continue;
>diff --git a/management/univention-directory-notifier/src/notify.c b/management/univention-directory-notifier/src/notify.c
>index fc69bd571b..c6fd16d375 100644
>--- a/management/univention-directory-notifier/src/notify.c
>+++ b/management/univention-directory-notifier/src/notify.c
>@@ -227,7 +227,7 @@ static int sasl_proc(LDAP *ld, unsigned flags, void *defaults, void *in) {
> }
> 
> /*
>- * Write entries to files.
>+ * Write entries to cn=translog.
>  * :param trans: Linked list of entries to write.
>  */
> static void notify_dump_to_ldap(NotifyEntry_t *trans) {

Actions: View | Diff

Attachments on bug 48427: 9808