mastervolkov

--- /tmp/DDDD/jabberd-2.2.17/jabberd-2.2.17/storage/storage_ldapvcard.c 2012-05-04 18:51:08.000000000 +0400
+++ RPM/BUILD/jabberd-2.2.17/storage/storage_ldapvcard.c        2012-11-30 10:43:11.348482828 +0400
@@ -430,7 +430,7 @@
                     ldap_value_free(vals);
                     continue;
                 }
-                if (data->groupattr_regex != NULL && processregex(vals[0],data->groupattr_regex,2,1,group,sizeof(group),drv) !=0) {
+                if ( (data->groupattr_regex != NULL && processregex(vals[0],data->groupattr_regex,2,1,group,sizeof(group),drv) !=0) || data->groupattr_regex == NULL) {
                     strncpy(group,vals[0],sizeof(group)-1);
                 }

mastervolkov

diff -ur orig/etc/router.xml.dist.in newe/etc/router.xml.dist.in
--- orig/etc/router.xml.dist.in 2012-11-30 17:08:49.025714271 +0400
+++ newe/etc/router.xml.dist.in 2012-11-30 17:56:56.786760601 +0400
@@ -200,14 +200,152 @@
 
   </aci>
 
-  <!-- Simple message logging to flat file
-       Remove <enabled/> tag to disable logging -->
-  <!--

mastervolkov

diff -u ../../NMORIG/network-manager-l2tp-0.9.8.5/src/nm-l2tp-service.c src/nm-l2tp-service.c 
--- ../../NMORIG/network-manager-l2tp-0.9.8.5/src/nm-l2tp-service.c     2013-10-28 05:21:20.000000000 +0400
+++ src/nm-l2tp-service.c       2013-12-13 10:52:16.469778938 +0400
@@ -853,6 +853,7 @@
        char session_name[128];
        GPtrArray *whack_argv;
 
+       g_message("ipsec prepare for shut down");
        if (!(ipsec_binary=nm_find_ipsec())) return;
 

mastervolkov

diff -urb NMORIG/network-manager-l2tp-0.9.8.5/auth-dialog/main.c NMB/network-manager-l2tp-0.9.8.5_AUTH_FIX/auth-dialog/main.c
--- NMORIG/network-manager-l2tp-0.9.8.5/auth-dialog/main.c	2013-10-28 05:21:20.000000000 +0400
+++ NMB/network-manager-l2tp-0.9.8.5_AUTH_FIX/auth-dialog/main.c	2014-11-17 10:39:06.251843918 +0300
@@ -30,47 +30,61 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include <gnome-keyring.h>
-#include <gnome-keyring-memory.h>
+