February 2013 - openSUSE Commits - openSUSE Mailing Lists

commit ntfs-3g_ntfsprogs for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '13

01 Feb '13

Hello community, here is the log from the commit of package ntfs-3g_ntfsprogs for openSUSE:Factory checked in at 2013-02-01 09:48:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ntfs-3g_ntfsprogs (Old) and /work/SRC/openSUSE:Factory/.ntfs-3g_ntfsprogs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ntfs-3g_ntfsprogs", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/ntfs-3g_ntfsprogs/ntfs-3g_ntfsprogs.changes 2012-11-28 11:14:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ntfs-3g_ntfsprogs.new/ntfs-3g_ntfsprogs.changes 2013-02-01 09:48:26.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Jan 31 21:04:14 UTC 2013 - badshah400(a)gmail.com + +- Add ntfs-3g_ntfsprogs-use-caution-with-fastboot.patch to + prevent partitions with metadata cached in Windows (when + FastBoot is enabled) from being mounted; patch taken from + upstream git and rebased (bnc#798337 / rh#859373). + +------------------------------------------------------------------- New: ---- ntfs-3g_ntfsprogs-use-caution-with-fastboot.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntfs-3g_ntfsprogs.spec ++++++ --- /var/tmp/diff_new_pack.2Imuqr/_old 2013-02-01 09:48:27.000000000 +0100 +++ /var/tmp/diff_new_pack.2Imuqr/_new 2013-02-01 09:48:27.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ntfs-3g_ntfsprogs # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,8 @@ Source: %{name}-%{version}.tar.bz2 Source1: buildall.sh Source2: 21-storage-ntfs-3g.fdi +# PATCH-FIX-UPSTREAM ntfs-3g_ntfsprogs-use-caution-with-fastboot.patch rh#859373 badshah400(a)gmail.com -- Prevent partitions with metadata cached in Windows from being mounted; patch taken from upstream git +Patch0: ntfs-3g_ntfsprogs-use-caution-with-fastboot.patch Url: http://ntfs-3g.org/ %if 0%{?sles_version} BuildRequires: fuse-devel >= 2.6.0 @@ -97,6 +99,7 @@ %prep %setup -q +%patch0 -p1 %build # ++++++ ntfs-3g_ntfsprogs-use-caution-with-fastboot.patch ++++++ >From 4d0b9163c9ef1f0cdbbf533317b291220c7fd1c7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jean-Pierre=20Andr=C3=A9?= <jpandre(a)users.sourceforge.net> Date: Wed, 12 Sep 2012 09:42:24 +0200 Subject: [PATCH] Accepted processing restart pages v 2.0 with no warning (used by Windows 8) In the $LogFile, Windows 8 defines restart pages with version 2.0. The checks designed for version 1.1 appear to apply, so accept v 2.0 and apply the usual checks. --- libntfs-3g/logfile.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) Index: ntfs-3g_ntfsprogs-2012.1.15/libntfs-3g/logfile.c =================================================================== --- ntfs-3g_ntfsprogs-2012.1.15.orig/libntfs-3g/logfile.c +++ ntfs-3g_ntfsprogs-2012.1.15/libntfs-3g/logfile.c @@ -84,13 +84,21 @@ static BOOL ntfs_check_restart_page_head "position in $LogFile.\n"); return FALSE; } - /* We only know how to handle version 1.1. */ - if (sle16_to_cpu(rp->major_ver) != 1 || - sle16_to_cpu(rp->minor_ver) != 1) { + /* + * We only know how to handle version 1.1 and 2.0, though + * version 2.0 is probably related to cached metadata in + * Windows 8, and we will refuse to mount. + * Nevertheless, do all the relevant checks before rejecting. + */ + if (((rp->major_ver != const_cpu_to_le16(1)) + || (rp->minor_ver != const_cpu_to_le16(1))) + && ((rp->major_ver != const_cpu_to_le16(2)) + || (rp->minor_ver != const_cpu_to_le16(0)))) { ntfs_log_error("$LogFile version %i.%i is not " - "supported. (This driver supports version " - "1.1 only.)\n", (int)sle16_to_cpu(rp->major_ver), - (int)sle16_to_cpu(rp->minor_ver)); + "supported.\n (This driver supports version " + "1.1 and 2.0 only.)\n", + (int)sle16_to_cpu(rp->major_ver), + (int)sle16_to_cpu(rp->minor_ver)); return FALSE; } /* Index: ntfs-3g_ntfsprogs-2012.1.15/libntfs-3g/volume.c =================================================================== --- ntfs-3g_ntfsprogs-2012.1.15.orig/libntfs-3g/volume.c +++ ntfs-3g_ntfsprogs-2012.1.15/libntfs-3g/volume.c @@ -89,13 +89,9 @@ static const char *corrupt_volume_msg = "for more details.\n"; static const char *hibernated_volume_msg = -"The NTFS partition is hibernated. Please resume and shutdown Windows\n" -"properly, or mount the volume read-only with the 'ro' mount option, or\n" -"mount the volume read-write with the 'remove_hiberfile' mount option.\n" -"For example type on the command line:\n" -"\n" -" mount -t ntfs-3g -o remove_hiberfile %s %s\n" -"\n"; +"The NTFS partition is in an unsafe state. Please resume and shutdown\n" +"Windows fully (no hibernation or fast restarting), or mount the volume\n" +"read-only with the 'ro' mount option.\n"; static const char *unclean_journal_msg = "Write access is denied because the disk wasn't safely powered\n" @@ -649,6 +645,24 @@ static int ntfs_volume_check_logfile(ntf if (!ntfs_check_logfile(na, &rp) || !ntfs_is_logfile_clean(na, rp)) err = EOPNOTSUPP; + /* + * If the latest restart page was identified as version + * 2.0, then Windows may have kept a cached copy of + * metadata for fast restarting, and we should not mount. + * Hibernation will be seen the same way on a non + * Windows-system partition, so we have to use the same + * error code (EPERM). + * The restart page may also be identified as version 2.0 + * when access to the file system is terminated abruptly + * by unplugging or power cut, so mounting is also rejected + * after such an event. + */ + if (rp + && (rp->major_ver == const_cpu_to_le16(2)) + && (rp->minor_ver == const_cpu_to_le16(0))) { + ntfs_log_error("Metadata kept in Windows cache, refused to mount.\n"); + err = EPERM; + } free(rp); ntfs_attr_close(na); out: @@ -1200,7 +1214,8 @@ ntfs_volume *ntfs_device_mount(struct nt ntfs_volume_check_hiberfile(vol, 1) < 0) goto error_exit; if (ntfs_volume_check_logfile(vol) < 0) { - if (!(flags & MS_RECOVER)) + /* Always reject cached metadata for now */ + if (!(flags & MS_RECOVER) || (errno == EPERM)) goto error_exit; ntfs_log_info("The file system wasn't safely " "closed on Windows. Fixing.\n"); @@ -1642,6 +1657,10 @@ int ntfs_volume_error(int err) ret = NTFS_VOLUME_CORRUPT; break; case EPERM: + /* + * Hibernation and fast restarting are seen the + * same way on a non Windows-system partition. + */ ret = NTFS_VOLUME_HIBERNATED; break; case EOPNOTSUPP: Index: ntfs-3g_ntfsprogs-2012.1.15/src/ntfs-3g.8.in =================================================================== --- ntfs-3g_ntfsprogs-2012.1.15.orig/src/ntfs-3g.8.in +++ ntfs-3g_ntfsprogs-2012.1.15/src/ntfs-3g.8.in @@ -36,6 +36,22 @@ a few differences mentioned below in rel .PP The \fIvolume\fR to be mounted can be either a block device or an image file. +.SS Windows hibernation and fast restarting +On computers which can be dual-booted into Windows or Linux, Windows has +to be fully shut down before booting into Linux, otherwise the NTFS file +systems on internal disks may be left in an inconsistent state and changes +made by Linux may be ignored by Windows. +.P +So, Windows may not be left in hibernation when starting Linux, in order +to avoid inconsistencies. Moreover, the fast restart feature available on +recent Windows systems has to be disabled. This can be achieved by issuing +as an Administrator the Windows command which disables both +hibernation and fast restarting : +.RS +.sp +powercfg /h off +.sp +.RE .SS Access Handling and Security By default, files and directories are owned by the effective user and group of the mounting process, and everybody has -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nant for openSUSE:12.3
by root＠hilbert.suse.de 01 Feb '13

01 Feb '13

Hello community, here is the log from the commit of package nant for openSUSE:12.3 checked in at 2013-02-01 09:47:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/nant (Old) and /work/SRC/openSUSE:12.3/.nant.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nant", Maintainer is "orphaned(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:12.3/nant/nant.changes 2013-01-31 16:49:05.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.nant.new/nant.changes 2013-02-01 09:47:30.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Jan 31 17:03:17 UTC 2013 - dimstar(a)opensuse.org + +- Filter out internal libs from the provides (e.g log4net.dll). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nant.spec ++++++ --- /var/tmp/diff_new_pack.wFejTo/_old 2013-02-01 09:47:30.000000000 +0100 +++ /var/tmp/diff_new_pack.wFejTo/_new 2013-02-01 09:47:30.000000000 +0100 @@ -30,6 +30,9 @@ BuildRequires: mono-data BuildRequires: mono-devel %define _use_internal_dependency_generator 0 +# ignore some bundled dlls +%define __find_provides env sh -c 'filelist=($(grep -v log4net.dll | grep -v scvs.exe | grep -v nunit | grep -v NDoc | grep -v neutral)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-provides && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-provides ; } | sort | uniq' +%define __find_requires env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-requires && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-requires ; } | sort | uniq' %description NAnt is a free .NET build tool. In theory it is kind of like make -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nant for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '13

01 Feb '13

Hello community, here is the log from the commit of package nant for openSUSE:Factory checked in at 2013-02-01 09:47:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nant (Old) and /work/SRC/openSUSE:Factory/.nant.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nant", Maintainer is "orphaned(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/nant/nant.changes 2013-01-31 16:48:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.nant.new/nant.changes 2013-02-01 09:47:20.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Jan 31 17:03:17 UTC 2013 - dimstar(a)opensuse.org + +- Filter out internal libs from the provides (e.g log4net.dll). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nant.spec ++++++ --- /var/tmp/diff_new_pack.Px7Uv0/_old 2013-02-01 09:47:21.000000000 +0100 +++ /var/tmp/diff_new_pack.Px7Uv0/_new 2013-02-01 09:47:21.000000000 +0100 @@ -30,6 +30,9 @@ BuildRequires: mono-data BuildRequires: mono-devel %define _use_internal_dependency_generator 0 +# ignore some bundled dlls +%define __find_provides env sh -c 'filelist=($(grep -v log4net.dll | grep -v scvs.exe | grep -v nunit | grep -v NDoc | grep -v neutral)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-provides && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-provides ; } | sort | uniq' +%define __find_requires env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-requires && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-requires ; } | sort | uniq' %description NAnt is a free .NET build tool. In theory it is kind of like make -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lightdm-gtk-greeter for openSUSE:12.3
by root＠hilbert.suse.de 01 Feb '13

01 Feb '13

Hello community, here is the log from the commit of package lightdm-gtk-greeter for openSUSE:12.3 checked in at 2013-02-01 09:46:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/lightdm-gtk-greeter (Old) and /work/SRC/openSUSE:12.3/.lightdm-gtk-greeter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lightdm-gtk-greeter", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.3/lightdm-gtk-greeter/lightdm-gtk-greeter.changes 2013-01-31 01:26:17.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.lightdm-gtk-greeter.new/lightdm-gtk-greeter.changes 2013-02-01 09:46:55.000000000 +0100 @@ -1,0 +2,17 @@ +Thu Jan 31 16:37:59 UTC 2013 - gber(a)opensuse.org + +- add lightdm-gtk-greeter-fix-cursor.patch in order to fix the + cursor theme by setting the cursor after selecting a GTK theme + (lp#1024482) +- add lightdm-gtk-greeter-fix-background.patch in order to fix the + background image not being displayed when the pixmap does not + have an alpha channel (lp#1086199) +- add lightdm-gtk-greeter-improve-background-scaling.patch which + scales the background pixmap while preserving the aspect until + width and height are at least as big as the screen width and + height, then clips as needed +- add lightdm-gtk-greeter-fix-ui.patch with various usability + fixes, in particular switch back to a tree view inside a scrolled + window in order make it usable with a lot of users + +------------------------------------------------------------------- New: ---- lightdm-gtk-greeter-fix-background.patch lightdm-gtk-greeter-fix-cursor.patch lightdm-gtk-greeter-fix-ui.patch lightdm-gtk-greeter-improve-background-scaling.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lightdm-gtk-greeter.spec ++++++ --- /var/tmp/diff_new_pack.U5qFol/_old 2013-02-01 09:46:56.000000000 +0100 +++ /var/tmp/diff_new_pack.U5qFol/_new 2013-02-01 09:46:56.000000000 +0100 @@ -27,6 +27,16 @@ Source0: %{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM lightdm-gtk-greeter-use-new-autologin-api.patch gber(a)opensuse.org -- Use the new autologin API in liblightdm-gobject-1 >= 1.3.5 (backported from upstream git) Patch0: lightdm-gtk-greeter-use-new-autologin-api.patch +# PATCH-FIX-UPSTREAM lightdm-gtk-greeter-fix-cursor.patch lp#1024482 gber(a)opensuse.org -- Fix the cursor theme by setting the cursor after selecting a GTK theme +Patch1: lightdm-gtk-greeter-fix-cursor.patch +# PATCH-FIX-UPSTREAM lightdm-gtk-greeter-fix-background.patch lp#1086199 gber(a)opensuse.org -- Fix the background image not being displayed when the pixmap does not have an alpha channel +Patch2: lightdm-gtk-greeter-fix-background.patch +# PATCH-FEATURE-UPSTREAM lightdm-gtk-greeter-improve-background-scaling.patch gber(a)opensuse.org -- Scale the background pixmap while preserving the aspect until width and height are at least as big as the screen width and height, then clip as needed +Patch3: lightdm-gtk-greeter-improve-background-scaling.patch +# PATCH-FEATURE-UPSTREAM lightdm-gtk-greeter-fix-ui.patch gber(a)opensuse.org -- Various usability fixes, in particular switch back to a tree view inside a scrolled window in order make it usable with a lot of users +Patch4: lightdm-gtk-greeter-fix-ui.patch +BuildRequires: gnome-common +BuildRequires: gobject-introspection BuildRequires: intltool BuildRequires: pkgconfig(gmodule-export-2.0) BuildRequires: pkgconfig(gtk+-3.0) @@ -65,8 +75,13 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build +autoreconf -fi %configure make %{?_smp_mflags} V=1 ++++++ lightdm-gtk-greeter-fix-background.patch ++++++ Index: lightdm-gtk-greeter-1.3.1/src/lightdm-gtk-greeter.c =================================================================== --- lightdm-gtk-greeter-1.3.1.orig/src/lightdm-gtk-greeter.c +++ lightdm-gtk-greeter-1.3.1/src/lightdm-gtk-greeter.c @@ -785,7 +785,14 @@ main (int argc, char **argv) g_debug ("Loading background %s", path); background_pixbuf = gdk_pixbuf_new_from_file (path, &error); - if (!background_pixbuf) + if (background_pixbuf) + { + /* Add alpha channel if it doesn't exist yet (lp#1024482) */ + GdkPixbuf *background_pixbuf_tmp = gdk_pixbuf_add_alpha (background_pixbuf, FALSE, 0, 0, 0); + g_object_unref (G_OBJECT (background_pixbuf)); + background_pixbuf = background_pixbuf_tmp; + } + else g_warning ("Failed to load background: %s", error->message); g_clear_error (&error); g_free (path); @@ -874,6 +881,12 @@ main (int argc, char **argv) g_object_set (gtk_settings_get_default (), "gtk-xft-rgba", value, NULL); g_free (value); + /* Set default cursor */ + GdkCursor *cursor; + cursor = gdk_cursor_new (GDK_LEFT_PTR); + gdk_window_set_cursor (gdk_get_default_root_window (), cursor); + g_object_unref(cursor); + builder = gtk_builder_new (); if (!gtk_builder_add_from_file (builder, GREETER_DATA_DIR "/greeter.ui", &error)) { @@ -882,13 +895,6 @@ main (int argc, char **argv) } g_clear_error (&error); - /* Set default cursor */ - // gdk_window_set_cursor (gdk_get_default_root_window (), gdk_cursor_new (GDK_LEFT_PTR)); - GdkCursor *cursor; - cursor = gdk_cursor_new (GDK_LEFT_PTR); - gdk_window_set_cursor (gdk_get_default_root_window (), cursor); - g_object_unref(cursor); - login_window = GTK_WINDOW (gtk_builder_get_object (builder, "login_window")); login_box = GTK_WIDGET (gtk_builder_get_object (builder, "login_box")); login_button = GTK_BUTTON (gtk_builder_get_object (builder, "login_button")); ++++++ lightdm-gtk-greeter-fix-cursor.patch ++++++ Index: lightdm-gtk-greeter-1.3.1/src/lightdm-gtk-greeter.c =================================================================== --- lightdm-gtk-greeter-1.3.1.orig/src/lightdm-gtk-greeter.c +++ lightdm-gtk-greeter-1.3.1/src/lightdm-gtk-greeter.c @@ -769,9 +769,6 @@ main (int argc, char **argv) if (!lightdm_greeter_connect_sync (greeter, NULL)) return EXIT_FAILURE; - /* Set default cursor */ - gdk_window_set_cursor (gdk_get_default_root_window (), gdk_cursor_new (GDK_LEFT_PTR)); - /* Load background */ value = g_key_file_get_value (config, "greeter", "background", NULL); if (!value) @@ -885,6 +882,13 @@ main (int argc, char **argv) } g_clear_error (&error); + /* Set default cursor */ + // gdk_window_set_cursor (gdk_get_default_root_window (), gdk_cursor_new (GDK_LEFT_PTR)); + GdkCursor *cursor; + cursor = gdk_cursor_new (GDK_LEFT_PTR); + gdk_window_set_cursor (gdk_get_default_root_window (), cursor); + g_object_unref(cursor); + login_window = GTK_WINDOW (gtk_builder_get_object (builder, "login_window")); login_box = GTK_WIDGET (gtk_builder_get_object (builder, "login_box")); login_button = GTK_BUTTON (gtk_builder_get_object (builder, "login_button")); ++++++ lightdm-gtk-greeter-fix-ui.patch ++++++ Index: lightdm-gtk-greeter-1.3.1/data/greeter.ui =================================================================== --- lightdm-gtk-greeter-1.3.1.orig/data/greeter.ui +++ lightdm-gtk-greeter-1.3.1/data/greeter.ui @@ -16,12 +16,13 @@ <property name="decorated">False</property> <property name="has_resize_grip">False</property> <child> - <object class="GtkNotebook" id="login_notebook"> - <property name="name">login_notebook</property> - <property name="width_request">400</property> + <object class="GtkFrame" id="login_frame"> + <property name="name">login_frame</property> + <property name="width_request">550</property> + <property name="height_request">250</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="show_tabs">False</property> + <property name="can_focus">False</property> + <property name="shadow_type">out</property> <child> <object class="GtkVBox" id="vbox2"> <property name="name">vbox2</property> @@ -51,17 +52,32 @@ <property name="label" comments="This is a placeholder string and will be replaced with the hostname of the system">[hostname]</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkComboBox" id="user_combobox"> - <property name="name">user_combobox</property> + <object class="GtkScrolledWindow" id="user_scrolledwindow"> + <property name="visible">True</property> <property name="can_focus">True</property> - <property name="model">user_liststore</property> - <signal name="changed" handler="user_combobox_active_changed_cb" swapped="no"/> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">etched-in</property> + <child> + <object class="GtkTreeView" id="user_treeview"> + <property name="name">user_treeview</property> + <property name="can_focus">True</property> + <property name="model">user_liststore</property> + <property name="headers_visible">False</property> + <property name="fixed_height_mode">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"> + <signal name="changed" handler="user_treeview_selection_changed_cb" swapped="no"/> + </object> + </child> + </object> + </child> </object> <packing> <property name="expand">True</property> @@ -110,7 +126,7 @@ </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> </packing> @@ -140,7 +156,7 @@ <property name="model">session_liststore</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> </packing> @@ -152,7 +168,7 @@ <property name="model">language_liststore</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -193,7 +209,7 @@ </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">2</property> </packing> @@ -207,9 +223,6 @@ </child> </object> </child> - <child type="tab"> - <placeholder/> - </child> </object> </child> </object> Index: lightdm-gtk-greeter-1.3.1/src/lightdm-gtk-greeter.c =================================================================== --- lightdm-gtk-greeter-1.3.1.orig/src/lightdm-gtk-greeter.c +++ lightdm-gtk-greeter-1.3.1/src/lightdm-gtk-greeter.c @@ -26,9 +26,9 @@ static gchar *state_filename; static GtkWindow *login_window, *panel_window; static GtkButton *login_button, *cancel_button; static GtkLabel *message_label, *prompt_label; +static GtkTreeView *user_view; static GtkWidget *login_box, *prompt_box; static GtkEntry *prompt_entry; -static GtkComboBox *user_combo; static GtkComboBox *session_combo; static GtkComboBox *language_combo; static gchar *default_font_name, *default_theme_name, *default_icon_theme_name; @@ -220,6 +220,7 @@ static void cancel_authentication (void) { GtkTreeModel *model; + GtkTreeSelection *selection; GtkTreeIter iter; gboolean other = FALSE; @@ -233,9 +234,9 @@ cancel_authentication (void) } /* Force refreshing the prompt_box for "Other" */ - model = gtk_combo_box_get_model (user_combo); - - if (gtk_combo_box_get_active_iter (user_combo, &iter)) + selection = gtk_tree_view_get_selection (user_view); + model = gtk_tree_view_get_model (user_view); + if (gtk_tree_selection_get_selected (selection, &model, &iter)) { gchar *user; @@ -248,7 +249,7 @@ cancel_authentication (void) if (other || lightdm_greeter_get_hide_users_hint (greeter)) start_authentication ("*other"); else - gtk_widget_grab_focus (GTK_WIDGET (user_combo)); + gtk_widget_grab_focus (GTK_WIDGET (user_view)); } static void @@ -291,17 +292,15 @@ start_session (void) g_free (session); } -void user_combobox_active_changed_cb (GtkComboBox *widget, LightDMGreeter *greeter); +void user_treeview_selection_changed_cb (GtkTreeSelection *selection); G_MODULE_EXPORT void -user_combobox_active_changed_cb (GtkComboBox *widget, LightDMGreeter *greeter) +user_treeview_selection_changed_cb (GtkTreeSelection *selection) { GtkTreeModel *model; GtkTreeIter iter; - model = gtk_combo_box_get_model (user_combo); - - if (gtk_combo_box_get_active_iter (user_combo, &iter)) + if (gtk_tree_selection_get_selected (selection, &model, &iter)) { gchar *user; @@ -480,7 +479,7 @@ user_added_cb (LightDMUserList *user_lis GtkTreeModel *model; GtkTreeIter iter; - model = gtk_combo_box_get_model (user_combo); + model = gtk_tree_view_get_model (user_view); gtk_list_store_append (GTK_LIST_STORE (model), &iter); gtk_list_store_set (GTK_LIST_STORE (model), &iter, @@ -495,7 +494,7 @@ get_user_iter (const gchar *username, Gt { GtkTreeModel *model; - model = gtk_combo_box_get_model (user_combo); + model = gtk_tree_view_get_model (user_view); if (!gtk_tree_model_get_iter_first (model, iter)) return FALSE; @@ -523,8 +522,7 @@ user_changed_cb (LightDMUserList *user_l if (!get_user_iter (lightdm_user_get_name (user), &iter)) return; - model = gtk_combo_box_get_model (user_combo); - + model = gtk_tree_view_get_model (user_view); gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, lightdm_user_get_name (user), 1, lightdm_user_get_display_name (user), @@ -541,7 +539,7 @@ user_removed_cb (LightDMUserList *user_l if (!get_user_iter (lightdm_user_get_name (user), &iter)) return; - model = gtk_combo_box_get_model (user_combo); + model = gtk_tree_view_get_model (user_view); gtk_list_store_remove (GTK_LIST_STORE (model), &iter); } @@ -613,7 +611,7 @@ load_user_list () g_signal_connect (lightdm_user_list_get_instance (), "user-changed", G_CALLBACK (user_changed_cb), NULL); g_signal_connect (lightdm_user_list_get_instance (), "user-removed", G_CALLBACK (user_removed_cb), NULL); - model = gtk_combo_box_get_model (user_combo); + model = gtk_tree_view_get_model (user_view); items = lightdm_user_list_get_users (lightdm_user_list_get_instance ()); for (item = items; item; item = item->next) { @@ -665,7 +663,7 @@ load_user_list () g_free (name); if (matched) { - gtk_combo_box_set_active_iter (user_combo, &iter); + gtk_tree_selection_select_iter (gtk_tree_view_get_selection (user_view), &iter); set_login_button_label (selected_user); start_authentication (selected_user); break; @@ -936,7 +934,6 @@ main (int argc, char **argv) prompt_label = GTK_LABEL (gtk_builder_get_object (builder, "prompt_label")); prompt_entry = GTK_ENTRY (gtk_builder_get_object (builder, "prompt_entry")); message_label = GTK_LABEL (gtk_builder_get_object (builder, "message_label")); - user_combo = GTK_COMBO_BOX (gtk_builder_get_object (builder, "user_combobox")); session_combo = GTK_COMBO_BOX (gtk_builder_get_object (builder, "session_combobox")); language_combo = GTK_COMBO_BOX (gtk_builder_get_object (builder, "language_combobox")); panel_window = GTK_WINDOW (gtk_builder_get_object (builder, "panel_window")); @@ -1053,18 +1050,16 @@ main (int argc, char **argv) set_language (NULL); } - renderer = gtk_cell_renderer_text_new(); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (user_combo), renderer, TRUE); - gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (user_combo), renderer, "text", 1); - gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (user_combo), renderer, "weight", 2); + user_view = GTK_TREE_VIEW (gtk_builder_get_object (builder, "user_treeview")); + gtk_tree_view_insert_column_with_attributes (user_view, -1, "Name", gtk_cell_renderer_text_new(), "text", 1, "weight", 2, NULL); if (lightdm_greeter_get_hide_users_hint (greeter)) start_authentication ("*other"); else { - load_user_list (); gtk_widget_hide (GTK_WIDGET (cancel_button)); - gtk_widget_show (GTK_WIDGET (user_combo)); + load_user_list (); + gtk_widget_show (GTK_WIDGET (user_view)); } gtk_builder_connect_signals(builder, greeter); ++++++ lightdm-gtk-greeter-improve-background-scaling.patch ++++++ Index: lightdm-gtk-greeter-1.3.1/src/lightdm-gtk-greeter.c =================================================================== --- lightdm-gtk-greeter-1.3.1.orig/src/lightdm-gtk-greeter.c +++ lightdm-gtk-greeter-1.3.1/src/lightdm-gtk-greeter.c @@ -10,6 +10,7 @@ */ #include <stdlib.h> +#include <math.h> #include <locale.h> #include <gtk/gtk.h> #include <glib/gi18n.h> @@ -819,9 +820,41 @@ main (int argc, char **argv) if (background_pixbuf) { - GdkPixbuf *pixbuf = gdk_pixbuf_scale_simple (background_pixbuf, monitor_geometry.width, monitor_geometry.height, GDK_INTERP_BILINEAR); + GdkPixbuf *pixbuf; + GdkPixbuf *scaled_pixbuf = NULL; + gdouble ratio_horiz, ratio_vert; + gint image_width, image_height, width, height; + gint offset_x = 0; + gint offset_y = 0; + + image_width = gdk_pixbuf_get_width(background_pixbuf); + image_height = gdk_pixbuf_get_height(background_pixbuf); + + if (image_width == monitor_geometry.width && image_height == monitor_geometry.height) + { + pixbuf = gdk_pixbuf_copy (background_pixbuf); + } else { + ratio_horiz = (gdouble) monitor_geometry.width / image_width; + ratio_vert = (gdouble) monitor_geometry.height / image_height; + if (ratio_vert > ratio_horiz) + { + width = (gint) round (image_width * ratio_vert); + height = (gint) round (image_height * ratio_vert); + offset_x = (gint) round (fabs ((gdouble) (monitor_geometry.width - width) / 2)); + } + else + { + width = (gint) round (image_width * ratio_horiz); + height = (gint) round (image_height * ratio_horiz); + offset_y = (gint) round (fabs ((gdouble) (monitor_geometry.height - height) / 2)); + } + scaled_pixbuf = gdk_pixbuf_scale_simple (background_pixbuf, width, height, GDK_INTERP_BILINEAR); + pixbuf = gdk_pixbuf_new_subpixbuf (scaled_pixbuf, offset_x, offset_y, monitor_geometry.width, monitor_geometry.height); + } gdk_cairo_set_source_pixbuf (c, pixbuf, monitor_geometry.x, monitor_geometry.y); g_object_unref (pixbuf); + if (scaled_pixbuf) + g_object_unref (scaled_pixbuf); } else gdk_cairo_set_source_rgba (c, &background_color); Index: lightdm-gtk-greeter-1.3.1/configure.ac =================================================================== --- lightdm-gtk-greeter-1.3.1.orig/configure.ac +++ lightdm-gtk-greeter-1.3.1/configure.ac @@ -17,6 +17,9 @@ dnl #################################### dnl Dependencies dnl ########################################################################### +AC_CHECK_HEADERS([math.h]) +AC_CHECK_LIB([m],[round]) + PKG_CHECK_MODULES(GREETER, [ gtk+-3.0 x11 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lightdm-gtk-greeter for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '13

01 Feb '13

Hello community, here is the log from the commit of package lightdm-gtk-greeter for openSUSE:Factory checked in at 2013-02-01 09:46:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lightdm-gtk-greeter (Old) and /work/SRC/openSUSE:Factory/.lightdm-gtk-greeter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lightdm-gtk-greeter", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/lightdm-gtk-greeter/lightdm-gtk-greeter.changes 2013-01-20 08:04:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lightdm-gtk-greeter.new/lightdm-gtk-greeter.changes 2013-02-01 09:46:52.000000000 +0100 @@ -1,0 +2,17 @@ +Thu Jan 31 16:37:59 UTC 2013 - gber(a)opensuse.org + +- add lightdm-gtk-greeter-fix-cursor.patch in order to fix the + cursor theme by setting the cursor after selecting a GTK theme + (lp#1024482) +- add lightdm-gtk-greeter-fix-background.patch in order to fix the + background image not being displayed when the pixmap does not + have an alpha channel (lp#1086199) +- add lightdm-gtk-greeter-improve-background-scaling.patch which + scales the background pixmap while preserving the aspect until + width and height are at least as big as the screen width and + height, then clips as needed +- add lightdm-gtk-greeter-fix-ui.patch with various usability + fixes, in particular switch back to a tree view inside a scrolled + window in order make it usable with a lot of users + +------------------------------------------------------------------- New: ---- lightdm-gtk-greeter-fix-background.patch lightdm-gtk-greeter-fix-cursor.patch lightdm-gtk-greeter-fix-ui.patch lightdm-gtk-greeter-improve-background-scaling.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lightdm-gtk-greeter.spec ++++++ --- /var/tmp/diff_new_pack.y7EaAC/_old 2013-02-01 09:46:53.000000000 +0100 +++ /var/tmp/diff_new_pack.y7EaAC/_new 2013-02-01 09:46:53.000000000 +0100 @@ -27,6 +27,16 @@ Source0: %{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM lightdm-gtk-greeter-use-new-autologin-api.patch gber(a)opensuse.org -- Use the new autologin API in liblightdm-gobject-1 >= 1.3.5 (backported from upstream git) Patch0: lightdm-gtk-greeter-use-new-autologin-api.patch +# PATCH-FIX-UPSTREAM lightdm-gtk-greeter-fix-cursor.patch lp#1024482 gber(a)opensuse.org -- Fix the cursor theme by setting the cursor after selecting a GTK theme +Patch1: lightdm-gtk-greeter-fix-cursor.patch +# PATCH-FIX-UPSTREAM lightdm-gtk-greeter-fix-background.patch lp#1086199 gber(a)opensuse.org -- Fix the background image not being displayed when the pixmap does not have an alpha channel +Patch2: lightdm-gtk-greeter-fix-background.patch +# PATCH-FEATURE-UPSTREAM lightdm-gtk-greeter-improve-background-scaling.patch gber(a)opensuse.org -- Scale the background pixmap while preserving the aspect until width and height are at least as big as the screen width and height, then clip as needed +Patch3: lightdm-gtk-greeter-improve-background-scaling.patch +# PATCH-FEATURE-UPSTREAM lightdm-gtk-greeter-fix-ui.patch gber(a)opensuse.org -- Various usability fixes, in particular switch back to a tree view inside a scrolled window in order make it usable with a lot of users +Patch4: lightdm-gtk-greeter-fix-ui.patch +BuildRequires: gnome-common +BuildRequires: gobject-introspection BuildRequires: intltool BuildRequires: pkgconfig(gmodule-export-2.0) BuildRequires: pkgconfig(gtk+-3.0) @@ -65,8 +75,13 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build +autoreconf -fi %configure make %{?_smp_mflags} V=1 ++++++ lightdm-gtk-greeter-fix-background.patch ++++++ Index: lightdm-gtk-greeter-1.3.1/src/lightdm-gtk-greeter.c =================================================================== --- lightdm-gtk-greeter-1.3.1.orig/src/lightdm-gtk-greeter.c +++ lightdm-gtk-greeter-1.3.1/src/lightdm-gtk-greeter.c @@ -785,7 +785,14 @@ main (int argc, char **argv) g_debug ("Loading background %s", path); background_pixbuf = gdk_pixbuf_new_from_file (path, &error); - if (!background_pixbuf) + if (background_pixbuf) + { + /* Add alpha channel if it doesn't exist yet (lp#1024482) */ + GdkPixbuf *background_pixbuf_tmp = gdk_pixbuf_add_alpha (background_pixbuf, FALSE, 0, 0, 0); + g_object_unref (G_OBJECT (background_pixbuf)); + background_pixbuf = background_pixbuf_tmp; + } + else g_warning ("Failed to load background: %s", error->message); g_clear_error (&error); g_free (path); @@ -874,6 +881,12 @@ main (int argc, char **argv) g_object_set (gtk_settings_get_default (), "gtk-xft-rgba", value, NULL); g_free (value); + /* Set default cursor */ + GdkCursor *cursor; + cursor = gdk_cursor_new (GDK_LEFT_PTR); + gdk_window_set_cursor (gdk_get_default_root_window (), cursor); + g_object_unref(cursor); + builder = gtk_builder_new (); if (!gtk_builder_add_from_file (builder, GREETER_DATA_DIR "/greeter.ui", &error)) { @@ -882,13 +895,6 @@ main (int argc, char **argv) } g_clear_error (&error); - /* Set default cursor */ - // gdk_window_set_cursor (gdk_get_default_root_window (), gdk_cursor_new (GDK_LEFT_PTR)); - GdkCursor *cursor; - cursor = gdk_cursor_new (GDK_LEFT_PTR); - gdk_window_set_cursor (gdk_get_default_root_window (), cursor); - g_object_unref(cursor); - login_window = GTK_WINDOW (gtk_builder_get_object (builder, "login_window")); login_box = GTK_WIDGET (gtk_builder_get_object (builder, "login_box")); login_button = GTK_BUTTON (gtk_builder_get_object (builder, "login_button")); ++++++ lightdm-gtk-greeter-fix-cursor.patch ++++++ Index: lightdm-gtk-greeter-1.3.1/src/lightdm-gtk-greeter.c =================================================================== --- lightdm-gtk-greeter-1.3.1.orig/src/lightdm-gtk-greeter.c +++ lightdm-gtk-greeter-1.3.1/src/lightdm-gtk-greeter.c @@ -769,9 +769,6 @@ main (int argc, char **argv) if (!lightdm_greeter_connect_sync (greeter, NULL)) return EXIT_FAILURE; - /* Set default cursor */ - gdk_window_set_cursor (gdk_get_default_root_window (), gdk_cursor_new (GDK_LEFT_PTR)); - /* Load background */ value = g_key_file_get_value (config, "greeter", "background", NULL); if (!value) @@ -885,6 +882,13 @@ main (int argc, char **argv) } g_clear_error (&error); + /* Set default cursor */ + // gdk_window_set_cursor (gdk_get_default_root_window (), gdk_cursor_new (GDK_LEFT_PTR)); + GdkCursor *cursor; + cursor = gdk_cursor_new (GDK_LEFT_PTR); + gdk_window_set_cursor (gdk_get_default_root_window (), cursor); + g_object_unref(cursor); + login_window = GTK_WINDOW (gtk_builder_get_object (builder, "login_window")); login_box = GTK_WIDGET (gtk_builder_get_object (builder, "login_box")); login_button = GTK_BUTTON (gtk_builder_get_object (builder, "login_button")); ++++++ lightdm-gtk-greeter-fix-ui.patch ++++++ Index: lightdm-gtk-greeter-1.3.1/data/greeter.ui =================================================================== --- lightdm-gtk-greeter-1.3.1.orig/data/greeter.ui +++ lightdm-gtk-greeter-1.3.1/data/greeter.ui @@ -16,12 +16,13 @@ <property name="decorated">False</property> <property name="has_resize_grip">False</property> <child> - <object class="GtkNotebook" id="login_notebook"> - <property name="name">login_notebook</property> - <property name="width_request">400</property> + <object class="GtkFrame" id="login_frame"> + <property name="name">login_frame</property> + <property name="width_request">550</property> + <property name="height_request">250</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="show_tabs">False</property> + <property name="can_focus">False</property> + <property name="shadow_type">out</property> <child> <object class="GtkVBox" id="vbox2"> <property name="name">vbox2</property> @@ -51,17 +52,32 @@ <property name="label" comments="This is a placeholder string and will be replaced with the hostname of the system">[hostname]</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkComboBox" id="user_combobox"> - <property name="name">user_combobox</property> + <object class="GtkScrolledWindow" id="user_scrolledwindow"> + <property name="visible">True</property> <property name="can_focus">True</property> - <property name="model">user_liststore</property> - <signal name="changed" handler="user_combobox_active_changed_cb" swapped="no"/> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">etched-in</property> + <child> + <object class="GtkTreeView" id="user_treeview"> + <property name="name">user_treeview</property> + <property name="can_focus">True</property> + <property name="model">user_liststore</property> + <property name="headers_visible">False</property> + <property name="fixed_height_mode">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"> + <signal name="changed" handler="user_treeview_selection_changed_cb" swapped="no"/> + </object> + </child> + </object> + </child> </object> <packing> <property name="expand">True</property> @@ -110,7 +126,7 @@ </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> </packing> @@ -140,7 +156,7 @@ <property name="model">session_liststore</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> </packing> @@ -152,7 +168,7 @@ <property name="model">language_liststore</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -193,7 +209,7 @@ </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">2</property> </packing> @@ -207,9 +223,6 @@ </child> </object> </child> - <child type="tab"> - <placeholder/> - </child> </object> </child> </object> Index: lightdm-gtk-greeter-1.3.1/src/lightdm-gtk-greeter.c =================================================================== --- lightdm-gtk-greeter-1.3.1.orig/src/lightdm-gtk-greeter.c +++ lightdm-gtk-greeter-1.3.1/src/lightdm-gtk-greeter.c @@ -26,9 +26,9 @@ static gchar *state_filename; static GtkWindow *login_window, *panel_window; static GtkButton *login_button, *cancel_button; static GtkLabel *message_label, *prompt_label; +static GtkTreeView *user_view; static GtkWidget *login_box, *prompt_box; static GtkEntry *prompt_entry; -static GtkComboBox *user_combo; static GtkComboBox *session_combo; static GtkComboBox *language_combo; static gchar *default_font_name, *default_theme_name, *default_icon_theme_name; @@ -220,6 +220,7 @@ static void cancel_authentication (void) { GtkTreeModel *model; + GtkTreeSelection *selection; GtkTreeIter iter; gboolean other = FALSE; @@ -233,9 +234,9 @@ cancel_authentication (void) } /* Force refreshing the prompt_box for "Other" */ - model = gtk_combo_box_get_model (user_combo); - - if (gtk_combo_box_get_active_iter (user_combo, &iter)) + selection = gtk_tree_view_get_selection (user_view); + model = gtk_tree_view_get_model (user_view); + if (gtk_tree_selection_get_selected (selection, &model, &iter)) { gchar *user; @@ -248,7 +249,7 @@ cancel_authentication (void) if (other || lightdm_greeter_get_hide_users_hint (greeter)) start_authentication ("*other"); else - gtk_widget_grab_focus (GTK_WIDGET (user_combo)); + gtk_widget_grab_focus (GTK_WIDGET (user_view)); } static void @@ -291,17 +292,15 @@ start_session (void) g_free (session); } -void user_combobox_active_changed_cb (GtkComboBox *widget, LightDMGreeter *greeter); +void user_treeview_selection_changed_cb (GtkTreeSelection *selection); G_MODULE_EXPORT void -user_combobox_active_changed_cb (GtkComboBox *widget, LightDMGreeter *greeter) +user_treeview_selection_changed_cb (GtkTreeSelection *selection) { GtkTreeModel *model; GtkTreeIter iter; - model = gtk_combo_box_get_model (user_combo); - - if (gtk_combo_box_get_active_iter (user_combo, &iter)) + if (gtk_tree_selection_get_selected (selection, &model, &iter)) { gchar *user; @@ -480,7 +479,7 @@ user_added_cb (LightDMUserList *user_lis GtkTreeModel *model; GtkTreeIter iter; - model = gtk_combo_box_get_model (user_combo); + model = gtk_tree_view_get_model (user_view); gtk_list_store_append (GTK_LIST_STORE (model), &iter); gtk_list_store_set (GTK_LIST_STORE (model), &iter, @@ -495,7 +494,7 @@ get_user_iter (const gchar *username, Gt { GtkTreeModel *model; - model = gtk_combo_box_get_model (user_combo); + model = gtk_tree_view_get_model (user_view); if (!gtk_tree_model_get_iter_first (model, iter)) return FALSE; @@ -523,8 +522,7 @@ user_changed_cb (LightDMUserList *user_l if (!get_user_iter (lightdm_user_get_name (user), &iter)) return; - model = gtk_combo_box_get_model (user_combo); - + model = gtk_tree_view_get_model (user_view); gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, lightdm_user_get_name (user), 1, lightdm_user_get_display_name (user), @@ -541,7 +539,7 @@ user_removed_cb (LightDMUserList *user_l if (!get_user_iter (lightdm_user_get_name (user), &iter)) return; - model = gtk_combo_box_get_model (user_combo); + model = gtk_tree_view_get_model (user_view); gtk_list_store_remove (GTK_LIST_STORE (model), &iter); } @@ -613,7 +611,7 @@ load_user_list () g_signal_connect (lightdm_user_list_get_instance (), "user-changed", G_CALLBACK (user_changed_cb), NULL); g_signal_connect (lightdm_user_list_get_instance (), "user-removed", G_CALLBACK (user_removed_cb), NULL); - model = gtk_combo_box_get_model (user_combo); + model = gtk_tree_view_get_model (user_view); items = lightdm_user_list_get_users (lightdm_user_list_get_instance ()); for (item = items; item; item = item->next) { @@ -665,7 +663,7 @@ load_user_list () g_free (name); if (matched) { - gtk_combo_box_set_active_iter (user_combo, &iter); + gtk_tree_selection_select_iter (gtk_tree_view_get_selection (user_view), &iter); set_login_button_label (selected_user); start_authentication (selected_user); break; @@ -936,7 +934,6 @@ main (int argc, char **argv) prompt_label = GTK_LABEL (gtk_builder_get_object (builder, "prompt_label")); prompt_entry = GTK_ENTRY (gtk_builder_get_object (builder, "prompt_entry")); message_label = GTK_LABEL (gtk_builder_get_object (builder, "message_label")); - user_combo = GTK_COMBO_BOX (gtk_builder_get_object (builder, "user_combobox")); session_combo = GTK_COMBO_BOX (gtk_builder_get_object (builder, "session_combobox")); language_combo = GTK_COMBO_BOX (gtk_builder_get_object (builder, "language_combobox")); panel_window = GTK_WINDOW (gtk_builder_get_object (builder, "panel_window")); @@ -1053,18 +1050,16 @@ main (int argc, char **argv) set_language (NULL); } - renderer = gtk_cell_renderer_text_new(); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (user_combo), renderer, TRUE); - gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (user_combo), renderer, "text", 1); - gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (user_combo), renderer, "weight", 2); + user_view = GTK_TREE_VIEW (gtk_builder_get_object (builder, "user_treeview")); + gtk_tree_view_insert_column_with_attributes (user_view, -1, "Name", gtk_cell_renderer_text_new(), "text", 1, "weight", 2, NULL); if (lightdm_greeter_get_hide_users_hint (greeter)) start_authentication ("*other"); else { - load_user_list (); gtk_widget_hide (GTK_WIDGET (cancel_button)); - gtk_widget_show (GTK_WIDGET (user_combo)); + load_user_list (); + gtk_widget_show (GTK_WIDGET (user_view)); } gtk_builder_connect_signals(builder, greeter); ++++++ lightdm-gtk-greeter-improve-background-scaling.patch ++++++ Index: lightdm-gtk-greeter-1.3.1/src/lightdm-gtk-greeter.c =================================================================== --- lightdm-gtk-greeter-1.3.1.orig/src/lightdm-gtk-greeter.c +++ lightdm-gtk-greeter-1.3.1/src/lightdm-gtk-greeter.c @@ -10,6 +10,7 @@ */ #include <stdlib.h> +#include <math.h> #include <locale.h> #include <gtk/gtk.h> #include <glib/gi18n.h> @@ -819,9 +820,41 @@ main (int argc, char **argv) if (background_pixbuf) { - GdkPixbuf *pixbuf = gdk_pixbuf_scale_simple (background_pixbuf, monitor_geometry.width, monitor_geometry.height, GDK_INTERP_BILINEAR); + GdkPixbuf *pixbuf; + GdkPixbuf *scaled_pixbuf = NULL; + gdouble ratio_horiz, ratio_vert; + gint image_width, image_height, width, height; + gint offset_x = 0; + gint offset_y = 0; + + image_width = gdk_pixbuf_get_width(background_pixbuf); + image_height = gdk_pixbuf_get_height(background_pixbuf); + + if (image_width == monitor_geometry.width && image_height == monitor_geometry.height) + { + pixbuf = gdk_pixbuf_copy (background_pixbuf); + } else { + ratio_horiz = (gdouble) monitor_geometry.width / image_width; + ratio_vert = (gdouble) monitor_geometry.height / image_height; + if (ratio_vert > ratio_horiz) + { + width = (gint) round (image_width * ratio_vert); + height = (gint) round (image_height * ratio_vert); + offset_x = (gint) round (fabs ((gdouble) (monitor_geometry.width - width) / 2)); + } + else + { + width = (gint) round (image_width * ratio_horiz); + height = (gint) round (image_height * ratio_horiz); + offset_y = (gint) round (fabs ((gdouble) (monitor_geometry.height - height) / 2)); + } + scaled_pixbuf = gdk_pixbuf_scale_simple (background_pixbuf, width, height, GDK_INTERP_BILINEAR); + pixbuf = gdk_pixbuf_new_subpixbuf (scaled_pixbuf, offset_x, offset_y, monitor_geometry.width, monitor_geometry.height); + } gdk_cairo_set_source_pixbuf (c, pixbuf, monitor_geometry.x, monitor_geometry.y); g_object_unref (pixbuf); + if (scaled_pixbuf) + g_object_unref (scaled_pixbuf); } else gdk_cairo_set_source_rgba (c, &background_color); Index: lightdm-gtk-greeter-1.3.1/configure.ac =================================================================== --- lightdm-gtk-greeter-1.3.1.orig/configure.ac +++ lightdm-gtk-greeter-1.3.1/configure.ac @@ -17,6 +17,9 @@ dnl #################################### dnl Dependencies dnl ########################################################################### +AC_CHECK_HEADERS([math.h]) +AC_CHECK_LIB([m],[round]) + PKG_CHECK_MODULES(GREETER, [ gtk+-3.0 x11 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lightdm for openSUSE:12.3
by root＠hilbert.suse.de 01 Feb '13

01 Feb '13

Hello community, here is the log from the commit of package lightdm for openSUSE:12.3 checked in at 2013-02-01 09:45:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/lightdm (Old) and /work/SRC/openSUSE:12.3/.lightdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lightdm", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.3/lightdm/lightdm.changes 2013-01-31 10:27:24.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.lightdm.new/lightdm.changes 2013-02-01 09:45:33.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Jan 31 18:17:14 UTC 2013 - gber(a)opensuse.org + +- added lightdm-use-fine-grained-memory-locking.patch in order to + use libgcrypt to selectively secure password memory instead of + the big-hammer approach of mlockall (backported from upstrem bzr) +- added lightdm-fix-determining-active-display.patch in order to + correctly work out the active display from the active VT when it + exits so a greeter starts (backported from upstrem bzr) + +------------------------------------------------------------------- New: ---- lightdm-fix-determining-active-display.patch lightdm-use-fine-grained-memory-locking.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lightdm.spec ++++++ --- /var/tmp/diff_new_pack.xQnL96/_old 2013-02-01 09:45:33.000000000 +0100 +++ /var/tmp/diff_new_pack.xQnL96/_new 2013-02-01 09:45:33.000000000 +0100 @@ -60,6 +60,10 @@ Patch8: lightdm-do-not-strip-codeset-from-language.patch # PATCH-FIX-OPENSUSE lightdm-use-run-dir.patch gber(a)opensuse.org -- Use /run instead of /var/run Patch9: lightdm-use-run-dir.patch +# PATCH-FIX-UPSTREAM lightdm-fix-determining-active-display.patch gber(a)opensuse.org -- Correctly work out the active display from the active VT when it exits so a greeter starts (backported from upstrem bzr) +Patch10: lightdm-fix-determining-active-display.patch +# PATCH-FIX-UPSTREAM lightdm-use-fine-grained-memory-locking.patch gber(a)opensuse.org -- Use libgcrypt to selectively secure password memory instead of the big-hammer approach of mlockall (backported from upstrem bzr) +Patch11: lightdm-use-fine-grained-memory-locking.patch BuildRequires: gcc-c++ BuildRequires: gnome-common BuildRequires: gtk-doc @@ -72,6 +76,7 @@ BuildRequires: xdm %endif BuildRequires: polkit +BuildRequires: libgcrypt-devel BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gio-unix-2.0) @@ -158,6 +163,8 @@ %if 0%{?suse_version} >= 1230 %patch9 -p1 %endif +%patch10 -p1 +%patch11 -p1 %build ./autogen.sh ++++++ lightdm-fix-determining-active-display.patch ++++++ # HG changeset patch # User Robert Ancell <robert.ancell(a)canonical.com> # Date 1354075156 -46800 # Branch lightdm # Node ID ed6e0407be07304f9a7e95b1723205363e2914f7 # Parent a2ded106d9a556fbadb661003e300cd3d0c49a1f Correctly work out the active display from the active VT when it exits so a greeter starts diff --git a/src/display.c b/src/display.c --- a/src/display.c +++ b/src/display.c @@ -112,8 +112,11 @@ static void user_session_stopped_cb (Ses Display * display_new (DisplayServer *display_server) { - Display *display = g_object_new (DISPLAY_TYPE, NULL); + Display *display; + g_return_val_if_fail (display_server != NULL, NULL); + + display = g_object_new (DISPLAY_TYPE, NULL); display->priv->display_server = g_object_ref (display_server); return display; @@ -604,7 +607,7 @@ greeter_session_stopped_cb (Session *ses return; } - if (!display->priv->display_server) + if (display_server_get_is_stopped (display->priv->display_server)) return; /* Start the session for the authenticated user */ @@ -764,10 +767,6 @@ display_server_stopped_cb (DisplayServer { g_debug ("Display server stopped"); - g_signal_handlers_disconnect_matched (display->priv->display_server, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, display); - g_object_unref (display->priv->display_server); - display->priv->display_server = NULL; - /* Stop this display, it will be restarted by the seat if necessary */ display_stop (display); } @@ -835,47 +834,6 @@ display_start (Display *display) return TRUE; } -void -display_stop (Display *display) -{ - g_return_if_fail (display != NULL); - - if (display->priv->stopped) - return; - - if (!display->priv->stopping) - { - g_debug ("Stopping display"); - display->priv->stopping = TRUE; - } - - /* Stop the session first */ - if (display->priv->session) - { - session_stop (display->priv->session); - if (display->priv->session && !session_get_is_stopped (display->priv->session)) - return; - g_signal_handlers_disconnect_matched (display->priv->session, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, display); - g_object_unref (display->priv->session); - display->priv->session = NULL; - } - - /* Stop the display server after that */ - if (display->priv->display_server) - { - display_server_stop (display->priv->display_server); - if (display->priv->display_server && !display_server_get_is_stopped (display->priv->display_server)) - return; - g_signal_handlers_disconnect_matched (display->priv->display_server, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, display); - g_object_unref (display->priv->display_server); - display->priv->display_server = NULL; - } - - display->priv->stopped = TRUE; - g_debug ("Display stopped"); - g_signal_emit (display, signals[STOPPED], 0); -} - gboolean display_get_is_ready (Display *display) { @@ -910,6 +868,51 @@ display_unlock (Display *display) session_unlock (display->priv->session); } +void +display_stop (Display *display) +{ + g_return_if_fail (display != NULL); + + if (display->priv->stopped) + return; + + if (!display->priv->stopping) + { + g_debug ("Stopping display"); + display->priv->stopping = TRUE; + } + + /* Stop the session first */ + if (display->priv->session) + { + session_stop (display->priv->session); + if (display->priv->session && !session_get_is_stopped (display->priv->session)) + return; + g_signal_handlers_disconnect_matched (display->priv->session, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, display); + g_object_unref (display->priv->session); + display->priv->session = NULL; + } + + /* Stop the display server after that */ + if (!display_server_get_is_stopped (display->priv->display_server)) + { + display_server_stop (display->priv->display_server); + if (!display_server_get_is_stopped (display->priv->display_server)) + return; + } + + display->priv->stopped = TRUE; + g_debug ("Display stopped"); + g_signal_emit (display, signals[STOPPED], 0); +} + +gboolean +display_get_is_stopped (Display *display) +{ + g_return_val_if_fail (display != NULL, FALSE); + return display->priv->stopped; +} + static gboolean display_real_switch_to_user (Display *display, User *user) { @@ -941,11 +944,8 @@ display_finalize (GObject *object) self = DISPLAY (object); - if (self->priv->display_server) - { - g_signal_handlers_disconnect_matched (self->priv->display_server, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, self); - g_object_unref (self->priv->display_server); - } + g_signal_handlers_disconnect_matched (self->priv->display_server, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, self); + g_object_unref (self->priv->display_server); g_free (self->priv->greeter_session); if (self->priv->greeter) { diff --git a/src/display.h b/src/display.h --- a/src/display.h +++ b/src/display.h @@ -90,6 +90,8 @@ void display_unlock (Display *display); void display_stop (Display *display); +gboolean display_get_is_stopped (Display *display); + G_END_DECLS #endif /* _DISPLAY_H_ */ diff --git a/src/seat-xdmcp-session.c b/src/seat-xdmcp-session.c --- a/src/seat-xdmcp-session.c +++ b/src/seat-xdmcp-session.c @@ -64,12 +64,6 @@ seat_xdmcp_session_create_session (Seat } static void -seat_xdmcp_session_display_removed (Seat *seat, Display *display) -{ - seat_stop (seat); -} - -static void seat_xdmcp_session_init (SeatXDMCPSession *seat) { seat->priv = G_TYPE_INSTANCE_GET_PRIVATE (seat, SEAT_XDMCP_SESSION_TYPE, SeatXDMCPSessionPrivate); @@ -95,7 +89,6 @@ seat_xdmcp_session_class_init (SeatXDMCP seat_class->create_display_server = seat_xdmcp_session_create_display_server; seat_class->create_session = seat_xdmcp_session_create_session; - seat_class->display_removed = seat_xdmcp_session_display_removed; object_class->finalize = seat_xdmcp_session_finalize; g_type_class_add_private (klass, sizeof (SeatXDMCPSessionPrivate)); diff --git a/src/seat-xlocal.c b/src/seat-xlocal.c --- a/src/seat-xlocal.c +++ b/src/seat-xlocal.c @@ -125,13 +125,36 @@ seat_xlocal_create_session (Seat *seat, static void seat_xlocal_set_active_display (Seat *seat, Display *display) { - gint number = xserver_local_get_vt (XSERVER_LOCAL (XSERVER (display_get_display_server (display)))); - if (number >= 0) - vt_set_active (number); + gint vt = xserver_local_get_vt (XSERVER_LOCAL (display_get_display_server (display))); + if (vt >= 0) + vt_set_active (vt); SEAT_CLASS (seat_xlocal_parent_class)->set_active_display (seat, display); } +static Display * +seat_xlocal_get_active_display (Seat *seat) +{ + gint vt; + GList *link; + + vt = vt_get_active (); + if (vt < 0) + return NULL; + + for (link = seat_get_displays (seat); link; link = link->next) + { + Display *display = link->data; + XServerLocal *xserver; + + xserver = XSERVER_LOCAL (display_get_display_server (display)); + if (xserver_local_get_vt (xserver) == vt) + return display; + } + + return NULL; +} + static void seat_xlocal_run_script (Seat *seat, Display *display, Process *script) { @@ -151,28 +174,6 @@ seat_xlocal_run_script (Seat *seat, Disp } static void -seat_xlocal_display_removed (Seat *seat, Display *display) -{ - if (seat_get_is_stopping (seat)) - return; - - /* If this is the only display and it failed to start then stop this seat */ - if (g_list_length (seat_get_displays (seat)) == 0 && !display_get_is_ready (display)) - { - g_debug ("Stopping X local seat, failed to start a display"); - seat_stop (seat); - return; - } - - /* Show a new greeter */ - if (display == seat_get_active_display (seat)) - { - g_debug ("Active display stopped, switching to greeter"); - seat_switch_to_greeter (seat); - } -} - -static void seat_xlocal_init (SeatXLocal *seat) { } @@ -186,6 +187,6 @@ seat_xlocal_class_init (SeatXLocalClass seat_class->create_display_server = seat_xlocal_create_display_server; seat_class->create_session = seat_xlocal_create_session; seat_class->set_active_display = seat_xlocal_set_active_display; + seat_class->get_active_display = seat_xlocal_get_active_display; seat_class->run_script = seat_xlocal_run_script; - seat_class->display_removed = seat_xlocal_display_removed; } diff --git a/src/seat-xremote.c b/src/seat-xremote.c --- a/src/seat-xremote.c +++ b/src/seat-xremote.c @@ -71,13 +71,6 @@ seat_xremote_run_script (Seat *seat, Dis } static void -seat_xremote_display_removed (Seat *seat, Display *display) -{ - /* Can't restart the display, so remove this seat */ - seat_stop (seat); -} - -static void seat_xremote_init (SeatXRemote *seat) { } @@ -91,5 +84,4 @@ seat_xremote_class_init (SeatXRemoteClas seat_class->create_display_server = seat_xremote_create_display_server; seat_class->create_session = seat_xremote_create_session; seat_class->run_script = seat_xremote_run_script; - seat_class->display_removed = seat_xremote_display_removed; } diff --git a/src/seat-xvnc.c b/src/seat-xvnc.c --- a/src/seat-xvnc.c +++ b/src/seat-xvnc.c @@ -104,12 +104,6 @@ seat_xvnc_run_script (Seat *seat, Displa } static void -seat_xvnc_display_removed (Seat *seat, Display *display) -{ - seat_stop (seat); -} - -static void seat_xvnc_init (SeatXVNC *seat) { seat->priv = G_TYPE_INSTANCE_GET_PRIVATE (seat, SEAT_XVNC_TYPE, SeatXVNCPrivate); @@ -136,7 +130,6 @@ seat_xvnc_class_init (SeatXVNCClass *kla seat_class->create_display_server = seat_xvnc_create_display_server; seat_class->create_session = seat_xvnc_create_session; seat_class->run_script = seat_xvnc_run_script; - seat_class->display_removed = seat_xvnc_display_removed; object_class->finalize = seat_xdmcp_session_finalize; g_type_class_add_private (klass, sizeof (SeatXVNCPrivate)); diff --git a/src/seat.c b/src/seat.c --- a/src/seat.c +++ b/src/seat.c @@ -38,9 +38,6 @@ struct SeatPrivate /* The displays for this seat */ GList *displays; - /* The active display */ - Display *active_display; - /* TRUE if stopping this seat (waiting for displays to stop) */ gboolean stopping; @@ -162,7 +159,7 @@ Display * seat_get_active_display (Seat *seat) { g_return_val_if_fail (seat != NULL, NULL); - return seat->priv->active_display; + return SEAT_GET_CLASS (seat)->get_active_display (seat); } gboolean @@ -196,6 +193,9 @@ switch_to_user (Seat *seat, const gchar { Display *display = link->data; + if (display_get_is_stopped (display)) + continue; + /* If already logged in, then switch to that display */ if (g_strcmp0 (display_get_username (display), username) == 0) { @@ -427,11 +427,51 @@ check_stopped (Seat *seat) static void display_stopped_cb (Display *display, Seat *seat) { + gboolean is_active; + + is_active = display == seat_get_active_display (seat); + + g_signal_handlers_disconnect_matched (display, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, seat); seat->priv->displays = g_list_remove (seat->priv->displays, display); - g_signal_handlers_disconnect_matched (display, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, seat); - g_signal_emit (seat, signals[DISPLAY_REMOVED], 0, display); g_object_unref (display); + g_signal_emit (seat, signals[DISPLAY_REMOVED], 0, display); + + /* If no more displays running either start a greeter or stop the seat */ + if (!seat->priv->stopping) + { + if (g_list_length (seat->priv->displays) == 0) + { + /* If failed to start then stop this seat */ + if (!display_get_is_ready (display)) + { + g_debug ("Stopping seat, failed to start a display"); + seat_stop (seat); + } + /* Attempt to start a greeter */ + else if (!seat->priv->can_switch) + { + g_debug ("Stopping seat, display stopped"); + seat_stop (seat); + } + + else if (!seat_switch_to_greeter (seat)) + { + g_debug ("Stopping seat, unable to start greeter"); + seat_stop (seat); + } + } + else if (is_active) + { + g_debug ("Active display stopped, switching to greeter"); + if (!seat_switch_to_greeter (seat)) + { + g_debug ("Stopping seat, unable to start greeter"); + seat_stop (seat); + } + } + } + check_stopped (seat); } @@ -502,7 +542,7 @@ switch_to_user_or_start_greeter (Seat *s g_signal_emit (seat, signals[DISPLAY_ADDED], 0, display); /* Switch to this display if currently not looking at anything */ - if (!seat->priv->active_display) + if (seat_get_active_display (seat) == NULL) seat_set_active_display (seat, display); return display_start (display); @@ -610,25 +650,30 @@ seat_real_start (Seat *seat) static void seat_real_set_active_display (Seat *seat, Display *display) { - if (display == seat->priv->active_display) - return; + GList *link; - if (seat->priv->active_display) + for (link = seat->priv->displays; link; link = link->next) { - /* Stop the existing display if it is a greeter */ - if (!display_get_username (seat->priv->active_display)) + Display *d = link->data; + + if (d == display) + continue; + + /* Stop any greeters and lock any other sessions */ + if (!display_get_username (d)) { - g_debug ("Stopping greeter display being switched from"); - display_stop (seat->priv->active_display); + g_debug ("Stopping background greeter"); + display_stop (d); } - /* Otherwise lock it */ else - { - display_lock (seat->priv->active_display); - } - g_object_unref (seat->priv->active_display); - } - seat->priv->active_display = g_object_ref (display); + display_lock (d); + } +} + +static Display * +seat_real_get_active_display (Seat *seat) +{ + return NULL; } static void @@ -664,8 +709,6 @@ seat_finalize (GObject *object) g_hash_table_unref (self->priv->properties); g_free (self->priv->guest_username); g_list_free_full (self->priv->displays, g_object_unref); - if (self->priv->active_display) - g_object_unref (self->priv->active_display); G_OBJECT_CLASS (seat_parent_class)->finalize (object); } @@ -678,6 +721,7 @@ seat_class_init (SeatClass *klass) klass->setup = seat_real_setup; klass->start = seat_real_start; klass->set_active_display = seat_real_set_active_display; + klass->get_active_display = seat_real_get_active_display; klass->run_script = seat_real_run_script; klass->stop = seat_real_stop; diff --git a/src/seat.h b/src/seat.h --- a/src/seat.h +++ b/src/seat.h @@ -40,6 +40,7 @@ typedef struct DisplayServer *(*create_display_server) (Seat *seat); Session *(*create_session) (Seat *seat, Display *display); void (*set_active_display)(Seat *seat, Display *display); + Display *(*get_active_display)(Seat *seat); void (*run_script)(Seat *seat, Display *display, Process *script); void (*stop)(Seat *seat); diff --git a/src/xserver-local.c b/src/xserver-local.c --- a/src/xserver-local.c +++ b/src/xserver-local.c @@ -61,6 +61,9 @@ struct XServerLocalPrivate /* VT to run on */ gint vt; + /* TRUE if holding a reference to the VT */ + gboolean have_vt_ref; + /* TRUE if replacing Plymouth */ gboolean replacing_plymouth; }; @@ -148,7 +151,10 @@ xserver_local_new (void) if (self->priv->vt < 0) self->priv->vt = vt_get_unused (); if (self->priv->vt >= 0) + { vt_ref (self->priv->vt); + self->priv->have_vt_ref = TRUE; + } return self; } @@ -316,9 +322,6 @@ stopped_cb (Process *process, XServerLoc { g_debug ("X server stopped"); - g_object_unref (server->priv->xserver_process); - server->priv->xserver_process = NULL; - xserver_local_release_display_number (xserver_get_display_number (XSERVER (server))); if (xserver_get_authority (XSERVER (server)) && server->priv->authority_file) @@ -339,11 +342,11 @@ stopped_cb (Process *process, XServerLoc server->priv->authority_file = NULL; } - if (server->priv->vt >= 0) + if (server->priv->have_vt_ref) { vt_unref (server->priv->vt); - server->priv->vt = -1; - } + server->priv->have_vt_ref = FALSE; + } if (server->priv->replacing_plymouth && plymouth_get_is_running ()) { @@ -546,7 +549,7 @@ xserver_local_finalize (GObject *object) g_free (self->priv->xdmcp_key); if (self->priv->authority_file) g_object_unref (self->priv->authority_file); - if (self->priv->vt >= 0) + if (self->priv->have_vt_ref) vt_unref (self->priv->vt); G_OBJECT_CLASS (xserver_local_parent_class)->finalize (object); ++++++ lightdm-use-fine-grained-memory-locking.patch ++++++ # HG changeset patch # User Michael Terry <michael.terry(a)canonical.com> # Date 1359392941 18000 # Branch precise-mlock # Node ID 5b070d44540db1caad11c998a8678aafb1a2f4a5 # Parent ce5521d07555b291eb3a9cdc56a13e634dd951a9 Use libgcrypt to selectively secure password memory instead of the big-hammer approach of mlockall diff --git a/src/Makefile.am b/src/Makefile.am --- a/src/Makefile.am +++ b/src/Makefile.am @@ -95,6 +95,7 @@ lightdm_CFLAGS = \ lightdm_LDADD = \ $(LIGHTDM_LIBS) \ + -lgcrypt \ -lpam pkglibexec_PROGRAMS = lightdm-guest-session-wrapper diff --git a/src/greeter.c b/src/greeter.c --- a/src/greeter.c +++ b/src/greeter.c @@ -15,6 +15,7 @@ #include <string.h> #include <errno.h> #include <fcntl.h> +#include <gcrypt.h> #include "greeter.h" #include "ldm-marshal.h" @@ -40,6 +41,7 @@ struct GreeterPrivate /* Buffer for data read from greeter */ guint8 *read_buffer; gsize n_read; + gboolean use_secure_memory; /* Hints for the greeter */ GHashTable *hints; @@ -105,6 +107,7 @@ greeter_new (Session *session, const gch greeter->priv->session = g_object_ref (session); greeter->priv->pam_service = g_strdup (pam_service); greeter->priv->autologin_pam_service = g_strdup (autologin_pam_service); + greeter->priv->use_secure_memory = config_get_boolean (config_get_instance (), "LightDM", "lock-memory"); return greeter; } @@ -121,6 +124,33 @@ greeter_set_hint (Greeter *greeter, cons g_hash_table_insert (greeter->priv->hints, g_strdup (name), g_strdup (value)); } +static void * +secure_malloc (Greeter *greeter, size_t n) +{ + if (greeter->priv->use_secure_memory) + return gcry_malloc_secure (n); + else + return g_malloc (n); +} + +static void * +secure_realloc (Greeter *greeter, void *ptr, size_t n) +{ + if (greeter->priv->use_secure_memory) + return gcry_realloc (ptr, n); + else + return g_realloc (ptr, n); +} + +static void +secure_free (Greeter *greeter, void *ptr) +{ + if (greeter->priv->use_secure_memory) + return gcry_free (ptr); + else + return g_free (ptr); +} + static guint32 int_length () { @@ -259,6 +289,7 @@ pam_messages_cb (Session *session, Greet struct pam_response *response; response = calloc (messages_length, sizeof (struct pam_response)); session_respond (greeter->priv->authentication_session, response); + free (response); } } @@ -490,12 +521,18 @@ handle_continue_authentication (Greeter int msg_style = messages[i].msg_style; if (msg_style == PAM_PROMPT_ECHO_OFF || msg_style == PAM_PROMPT_ECHO_ON) { - response[i].resp = strdup (secrets[j]); // FIXME: Need to convert from UTF-8 + size_t secret_length = strlen (secrets[j]) + 1; + response[i].resp = secure_malloc (greeter, secret_length); + memcpy (response[i].resp, secrets[j], secret_length); // FIXME: Need to convert from UTF-8 j++; } } session_respond (greeter->priv->authentication_session, response); + + for (i = 0; i < messages_length; i++) + secure_free (greeter, response[i].resp); + free (response); } static void @@ -587,7 +624,7 @@ read_int (Greeter *greeter, gsize *offse } static gchar * -read_string (Greeter *greeter, gsize *offset) +read_string_full (Greeter *greeter, gsize *offset, void* (*alloc_fn)(size_t n)) { guint32 length; gchar *value; @@ -599,7 +636,7 @@ read_string (Greeter *greeter, gsize *of return g_strdup (""); } - value = g_malloc (sizeof (gchar *) * (length + 1)); + value = (*alloc_fn) (sizeof (gchar *) * (length + 1)); memcpy (value, greeter->priv->read_buffer + *offset, length); value[length] = '\0'; *offset += length; @@ -607,6 +644,21 @@ read_string (Greeter *greeter, gsize *of return value; } +static gchar * +read_string (Greeter *greeter, gsize *offset) +{ + return read_string_full (greeter, offset, g_malloc); +} + +static gchar * +read_secret (Greeter *greeter, gsize *offset) +{ + if (greeter->priv->use_secure_memory) + return read_string_full (greeter, offset, gcry_malloc_secure); + else + return read_string_full (greeter, offset, g_malloc); +} + static gboolean read_cb (GIOChannel *source, GIOCondition condition, gpointer data) { @@ -654,7 +706,7 @@ read_cb (GIOChannel *source, GIOConditio n_to_read = read_int (greeter, &offset); if (n_to_read > 0) { - greeter->priv->read_buffer = g_realloc (greeter->priv->read_buffer, HEADER_SIZE + n_to_read); + greeter->priv->read_buffer = secure_realloc (greeter, greeter->priv->read_buffer, HEADER_SIZE + n_to_read); read_cb (source, condition, greeter); return TRUE; } @@ -690,10 +742,12 @@ read_cb (GIOChannel *source, GIOConditio n_secrets = read_int (greeter, &offset); secrets = g_malloc (sizeof (gchar *) * (n_secrets + 1)); for (i = 0; i < n_secrets; i++) - secrets[i] = read_string (greeter, &offset); + secrets[i] = read_secret (greeter, &offset); secrets[i] = NULL; handle_continue_authentication (greeter, secrets); - g_strfreev (secrets); + for (i = 0; i < n_secrets; i++) + secure_free (greeter, secrets[i]); + g_free (secrets); break; case GREETER_MESSAGE_CANCEL_AUTHENTICATION: handle_cancel_authentication (greeter); @@ -796,7 +850,7 @@ static void greeter_init (Greeter *greeter) { greeter->priv = G_TYPE_INSTANCE_GET_PRIVATE (greeter, GREETER_TYPE, GreeterPrivate); - greeter->priv->read_buffer = g_malloc (HEADER_SIZE); + greeter->priv->read_buffer = secure_malloc (greeter, HEADER_SIZE); greeter->priv->hints = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); } @@ -811,7 +865,7 @@ greeter_finalize (GObject *object) g_object_unref (self->priv->session); g_free (self->priv->pam_service); g_free (self->priv->autologin_pam_service); - g_free (self->priv->read_buffer); + secure_free (self, self->priv->read_buffer); g_hash_table_unref (self->priv->hints); g_free (self->priv->remote_session); if (self->priv->authentication_session) diff --git a/src/lightdm.c b/src/lightdm.c --- a/src/lightdm.c +++ b/src/lightdm.c @@ -19,7 +19,6 @@ #include <unistd.h> #include <fcntl.h> #include <sys/stat.h> -#include <sys/mman.h> #include "configuration.h" #include "opensuse-sysconfig.h" @@ -1194,12 +1193,6 @@ main (int argc, char **argv) NULL, NULL); - if (config_get_boolean (config_get_instance (), "LightDM", "lock-memory")) - { - /* Protect memory from being paged to disk, as we deal with passwords */ - mlockall (MCL_CURRENT | MCL_FUTURE); - } - if (getuid () != 0) g_debug ("Running in user mode"); if (getenv ("DISPLAY")) diff --git a/src/session-child.c b/src/session-child.c --- a/src/session-child.c +++ b/src/session-child.c @@ -67,7 +67,7 @@ read_data (void *buf, size_t count) } static gchar * -read_string () +read_string_full (void* (*alloc_fn)(size_t n)) { int length; char *value; @@ -82,13 +82,19 @@ read_string () return NULL; } - value = g_malloc (sizeof (char) * (length + 1)); + value = (*alloc_fn) (sizeof (char) * (length + 1)); read_data (value, length); value[length] = '\0'; return value; } +static gchar * +read_string () +{ + return read_string_full (g_malloc); +} + static int pam_conv_cb (int msg_length, const struct pam_message **msg, struct pam_response **resp, void *app_data) { @@ -139,7 +145,9 @@ pam_conv_cb (int msg_length, const struc for (i = 0; i < msg_length; i++) { struct pam_response *r = &response[i]; - r->resp = read_string (); + // callers of this function inside pam will expect to be able to call + // free() on the strings we give back. So alloc with malloc. + r->resp = read_string_full (malloc); read_data (&r->resp_retcode, sizeof (r->resp_retcode)); } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lightdm for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '13

01 Feb '13

Hello community, here is the log from the commit of package lightdm for openSUSE:Factory checked in at 2013-02-01 09:45:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lightdm (Old) and /work/SRC/openSUSE:Factory/.lightdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lightdm", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/lightdm/lightdm.changes 2013-01-31 10:27:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lightdm.new/lightdm.changes 2013-02-01 09:45:29.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Jan 31 18:17:14 UTC 2013 - gber(a)opensuse.org + +- added lightdm-use-fine-grained-memory-locking.patch in order to + use libgcrypt to selectively secure password memory instead of + the big-hammer approach of mlockall (backported from upstrem bzr) +- added lightdm-fix-determining-active-display.patch in order to + correctly work out the active display from the active VT when it + exits so a greeter starts (backported from upstrem bzr) + +------------------------------------------------------------------- New: ---- lightdm-fix-determining-active-display.patch lightdm-use-fine-grained-memory-locking.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lightdm.spec ++++++ --- /var/tmp/diff_new_pack.xqQdPy/_old 2013-02-01 09:45:32.000000000 +0100 +++ /var/tmp/diff_new_pack.xqQdPy/_new 2013-02-01 09:45:32.000000000 +0100 @@ -60,6 +60,10 @@ Patch8: lightdm-do-not-strip-codeset-from-language.patch # PATCH-FIX-OPENSUSE lightdm-use-run-dir.patch gber(a)opensuse.org -- Use /run instead of /var/run Patch9: lightdm-use-run-dir.patch +# PATCH-FIX-UPSTREAM lightdm-fix-determining-active-display.patch gber(a)opensuse.org -- Correctly work out the active display from the active VT when it exits so a greeter starts (backported from upstrem bzr) +Patch10: lightdm-fix-determining-active-display.patch +# PATCH-FIX-UPSTREAM lightdm-use-fine-grained-memory-locking.patch gber(a)opensuse.org -- Use libgcrypt to selectively secure password memory instead of the big-hammer approach of mlockall (backported from upstrem bzr) +Patch11: lightdm-use-fine-grained-memory-locking.patch BuildRequires: gcc-c++ BuildRequires: gnome-common BuildRequires: gtk-doc @@ -72,6 +76,7 @@ BuildRequires: xdm %endif BuildRequires: polkit +BuildRequires: libgcrypt-devel BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gio-unix-2.0) @@ -158,6 +163,8 @@ %if 0%{?suse_version} >= 1230 %patch9 -p1 %endif +%patch10 -p1 +%patch11 -p1 %build ./autogen.sh ++++++ lightdm-fix-determining-active-display.patch ++++++ # HG changeset patch # User Robert Ancell <robert.ancell(a)canonical.com> # Date 1354075156 -46800 # Branch lightdm # Node ID ed6e0407be07304f9a7e95b1723205363e2914f7 # Parent a2ded106d9a556fbadb661003e300cd3d0c49a1f Correctly work out the active display from the active VT when it exits so a greeter starts diff --git a/src/display.c b/src/display.c --- a/src/display.c +++ b/src/display.c @@ -112,8 +112,11 @@ static void user_session_stopped_cb (Ses Display * display_new (DisplayServer *display_server) { - Display *display = g_object_new (DISPLAY_TYPE, NULL); + Display *display; + g_return_val_if_fail (display_server != NULL, NULL); + + display = g_object_new (DISPLAY_TYPE, NULL); display->priv->display_server = g_object_ref (display_server); return display; @@ -604,7 +607,7 @@ greeter_session_stopped_cb (Session *ses return; } - if (!display->priv->display_server) + if (display_server_get_is_stopped (display->priv->display_server)) return; /* Start the session for the authenticated user */ @@ -764,10 +767,6 @@ display_server_stopped_cb (DisplayServer { g_debug ("Display server stopped"); - g_signal_handlers_disconnect_matched (display->priv->display_server, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, display); - g_object_unref (display->priv->display_server); - display->priv->display_server = NULL; - /* Stop this display, it will be restarted by the seat if necessary */ display_stop (display); } @@ -835,47 +834,6 @@ display_start (Display *display) return TRUE; } -void -display_stop (Display *display) -{ - g_return_if_fail (display != NULL); - - if (display->priv->stopped) - return; - - if (!display->priv->stopping) - { - g_debug ("Stopping display"); - display->priv->stopping = TRUE; - } - - /* Stop the session first */ - if (display->priv->session) - { - session_stop (display->priv->session); - if (display->priv->session && !session_get_is_stopped (display->priv->session)) - return; - g_signal_handlers_disconnect_matched (display->priv->session, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, display); - g_object_unref (display->priv->session); - display->priv->session = NULL; - } - - /* Stop the display server after that */ - if (display->priv->display_server) - { - display_server_stop (display->priv->display_server); - if (display->priv->display_server && !display_server_get_is_stopped (display->priv->display_server)) - return; - g_signal_handlers_disconnect_matched (display->priv->display_server, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, display); - g_object_unref (display->priv->display_server); - display->priv->display_server = NULL; - } - - display->priv->stopped = TRUE; - g_debug ("Display stopped"); - g_signal_emit (display, signals[STOPPED], 0); -} - gboolean display_get_is_ready (Display *display) { @@ -910,6 +868,51 @@ display_unlock (Display *display) session_unlock (display->priv->session); } +void +display_stop (Display *display) +{ + g_return_if_fail (display != NULL); + + if (display->priv->stopped) + return; + + if (!display->priv->stopping) + { + g_debug ("Stopping display"); + display->priv->stopping = TRUE; + } + + /* Stop the session first */ + if (display->priv->session) + { + session_stop (display->priv->session); + if (display->priv->session && !session_get_is_stopped (display->priv->session)) + return; + g_signal_handlers_disconnect_matched (display->priv->session, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, display); + g_object_unref (display->priv->session); + display->priv->session = NULL; + } + + /* Stop the display server after that */ + if (!display_server_get_is_stopped (display->priv->display_server)) + { + display_server_stop (display->priv->display_server); + if (!display_server_get_is_stopped (display->priv->display_server)) + return; + } + + display->priv->stopped = TRUE; + g_debug ("Display stopped"); + g_signal_emit (display, signals[STOPPED], 0); +} + +gboolean +display_get_is_stopped (Display *display) +{ + g_return_val_if_fail (display != NULL, FALSE); + return display->priv->stopped; +} + static gboolean display_real_switch_to_user (Display *display, User *user) { @@ -941,11 +944,8 @@ display_finalize (GObject *object) self = DISPLAY (object); - if (self->priv->display_server) - { - g_signal_handlers_disconnect_matched (self->priv->display_server, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, self); - g_object_unref (self->priv->display_server); - } + g_signal_handlers_disconnect_matched (self->priv->display_server, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, self); + g_object_unref (self->priv->display_server); g_free (self->priv->greeter_session); if (self->priv->greeter) { diff --git a/src/display.h b/src/display.h --- a/src/display.h +++ b/src/display.h @@ -90,6 +90,8 @@ void display_unlock (Display *display); void display_stop (Display *display); +gboolean display_get_is_stopped (Display *display); + G_END_DECLS #endif /* _DISPLAY_H_ */ diff --git a/src/seat-xdmcp-session.c b/src/seat-xdmcp-session.c --- a/src/seat-xdmcp-session.c +++ b/src/seat-xdmcp-session.c @@ -64,12 +64,6 @@ seat_xdmcp_session_create_session (Seat } static void -seat_xdmcp_session_display_removed (Seat *seat, Display *display) -{ - seat_stop (seat); -} - -static void seat_xdmcp_session_init (SeatXDMCPSession *seat) { seat->priv = G_TYPE_INSTANCE_GET_PRIVATE (seat, SEAT_XDMCP_SESSION_TYPE, SeatXDMCPSessionPrivate); @@ -95,7 +89,6 @@ seat_xdmcp_session_class_init (SeatXDMCP seat_class->create_display_server = seat_xdmcp_session_create_display_server; seat_class->create_session = seat_xdmcp_session_create_session; - seat_class->display_removed = seat_xdmcp_session_display_removed; object_class->finalize = seat_xdmcp_session_finalize; g_type_class_add_private (klass, sizeof (SeatXDMCPSessionPrivate)); diff --git a/src/seat-xlocal.c b/src/seat-xlocal.c --- a/src/seat-xlocal.c +++ b/src/seat-xlocal.c @@ -125,13 +125,36 @@ seat_xlocal_create_session (Seat *seat, static void seat_xlocal_set_active_display (Seat *seat, Display *display) { - gint number = xserver_local_get_vt (XSERVER_LOCAL (XSERVER (display_get_display_server (display)))); - if (number >= 0) - vt_set_active (number); + gint vt = xserver_local_get_vt (XSERVER_LOCAL (display_get_display_server (display))); + if (vt >= 0) + vt_set_active (vt); SEAT_CLASS (seat_xlocal_parent_class)->set_active_display (seat, display); } +static Display * +seat_xlocal_get_active_display (Seat *seat) +{ + gint vt; + GList *link; + + vt = vt_get_active (); + if (vt < 0) + return NULL; + + for (link = seat_get_displays (seat); link; link = link->next) + { + Display *display = link->data; + XServerLocal *xserver; + + xserver = XSERVER_LOCAL (display_get_display_server (display)); + if (xserver_local_get_vt (xserver) == vt) + return display; + } + + return NULL; +} + static void seat_xlocal_run_script (Seat *seat, Display *display, Process *script) { @@ -151,28 +174,6 @@ seat_xlocal_run_script (Seat *seat, Disp } static void -seat_xlocal_display_removed (Seat *seat, Display *display) -{ - if (seat_get_is_stopping (seat)) - return; - - /* If this is the only display and it failed to start then stop this seat */ - if (g_list_length (seat_get_displays (seat)) == 0 && !display_get_is_ready (display)) - { - g_debug ("Stopping X local seat, failed to start a display"); - seat_stop (seat); - return; - } - - /* Show a new greeter */ - if (display == seat_get_active_display (seat)) - { - g_debug ("Active display stopped, switching to greeter"); - seat_switch_to_greeter (seat); - } -} - -static void seat_xlocal_init (SeatXLocal *seat) { } @@ -186,6 +187,6 @@ seat_xlocal_class_init (SeatXLocalClass seat_class->create_display_server = seat_xlocal_create_display_server; seat_class->create_session = seat_xlocal_create_session; seat_class->set_active_display = seat_xlocal_set_active_display; + seat_class->get_active_display = seat_xlocal_get_active_display; seat_class->run_script = seat_xlocal_run_script; - seat_class->display_removed = seat_xlocal_display_removed; } diff --git a/src/seat-xremote.c b/src/seat-xremote.c --- a/src/seat-xremote.c +++ b/src/seat-xremote.c @@ -71,13 +71,6 @@ seat_xremote_run_script (Seat *seat, Dis } static void -seat_xremote_display_removed (Seat *seat, Display *display) -{ - /* Can't restart the display, so remove this seat */ - seat_stop (seat); -} - -static void seat_xremote_init (SeatXRemote *seat) { } @@ -91,5 +84,4 @@ seat_xremote_class_init (SeatXRemoteClas seat_class->create_display_server = seat_xremote_create_display_server; seat_class->create_session = seat_xremote_create_session; seat_class->run_script = seat_xremote_run_script; - seat_class->display_removed = seat_xremote_display_removed; } diff --git a/src/seat-xvnc.c b/src/seat-xvnc.c --- a/src/seat-xvnc.c +++ b/src/seat-xvnc.c @@ -104,12 +104,6 @@ seat_xvnc_run_script (Seat *seat, Displa } static void -seat_xvnc_display_removed (Seat *seat, Display *display) -{ - seat_stop (seat); -} - -static void seat_xvnc_init (SeatXVNC *seat) { seat->priv = G_TYPE_INSTANCE_GET_PRIVATE (seat, SEAT_XVNC_TYPE, SeatXVNCPrivate); @@ -136,7 +130,6 @@ seat_xvnc_class_init (SeatXVNCClass *kla seat_class->create_display_server = seat_xvnc_create_display_server; seat_class->create_session = seat_xvnc_create_session; seat_class->run_script = seat_xvnc_run_script; - seat_class->display_removed = seat_xvnc_display_removed; object_class->finalize = seat_xdmcp_session_finalize; g_type_class_add_private (klass, sizeof (SeatXVNCPrivate)); diff --git a/src/seat.c b/src/seat.c --- a/src/seat.c +++ b/src/seat.c @@ -38,9 +38,6 @@ struct SeatPrivate /* The displays for this seat */ GList *displays; - /* The active display */ - Display *active_display; - /* TRUE if stopping this seat (waiting for displays to stop) */ gboolean stopping; @@ -162,7 +159,7 @@ Display * seat_get_active_display (Seat *seat) { g_return_val_if_fail (seat != NULL, NULL); - return seat->priv->active_display; + return SEAT_GET_CLASS (seat)->get_active_display (seat); } gboolean @@ -196,6 +193,9 @@ switch_to_user (Seat *seat, const gchar { Display *display = link->data; + if (display_get_is_stopped (display)) + continue; + /* If already logged in, then switch to that display */ if (g_strcmp0 (display_get_username (display), username) == 0) { @@ -427,11 +427,51 @@ check_stopped (Seat *seat) static void display_stopped_cb (Display *display, Seat *seat) { + gboolean is_active; + + is_active = display == seat_get_active_display (seat); + + g_signal_handlers_disconnect_matched (display, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, seat); seat->priv->displays = g_list_remove (seat->priv->displays, display); - g_signal_handlers_disconnect_matched (display, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, seat); - g_signal_emit (seat, signals[DISPLAY_REMOVED], 0, display); g_object_unref (display); + g_signal_emit (seat, signals[DISPLAY_REMOVED], 0, display); + + /* If no more displays running either start a greeter or stop the seat */ + if (!seat->priv->stopping) + { + if (g_list_length (seat->priv->displays) == 0) + { + /* If failed to start then stop this seat */ + if (!display_get_is_ready (display)) + { + g_debug ("Stopping seat, failed to start a display"); + seat_stop (seat); + } + /* Attempt to start a greeter */ + else if (!seat->priv->can_switch) + { + g_debug ("Stopping seat, display stopped"); + seat_stop (seat); + } + + else if (!seat_switch_to_greeter (seat)) + { + g_debug ("Stopping seat, unable to start greeter"); + seat_stop (seat); + } + } + else if (is_active) + { + g_debug ("Active display stopped, switching to greeter"); + if (!seat_switch_to_greeter (seat)) + { + g_debug ("Stopping seat, unable to start greeter"); + seat_stop (seat); + } + } + } + check_stopped (seat); } @@ -502,7 +542,7 @@ switch_to_user_or_start_greeter (Seat *s g_signal_emit (seat, signals[DISPLAY_ADDED], 0, display); /* Switch to this display if currently not looking at anything */ - if (!seat->priv->active_display) + if (seat_get_active_display (seat) == NULL) seat_set_active_display (seat, display); return display_start (display); @@ -610,25 +650,30 @@ seat_real_start (Seat *seat) static void seat_real_set_active_display (Seat *seat, Display *display) { - if (display == seat->priv->active_display) - return; + GList *link; - if (seat->priv->active_display) + for (link = seat->priv->displays; link; link = link->next) { - /* Stop the existing display if it is a greeter */ - if (!display_get_username (seat->priv->active_display)) + Display *d = link->data; + + if (d == display) + continue; + + /* Stop any greeters and lock any other sessions */ + if (!display_get_username (d)) { - g_debug ("Stopping greeter display being switched from"); - display_stop (seat->priv->active_display); + g_debug ("Stopping background greeter"); + display_stop (d); } - /* Otherwise lock it */ else - { - display_lock (seat->priv->active_display); - } - g_object_unref (seat->priv->active_display); - } - seat->priv->active_display = g_object_ref (display); + display_lock (d); + } +} + +static Display * +seat_real_get_active_display (Seat *seat) +{ + return NULL; } static void @@ -664,8 +709,6 @@ seat_finalize (GObject *object) g_hash_table_unref (self->priv->properties); g_free (self->priv->guest_username); g_list_free_full (self->priv->displays, g_object_unref); - if (self->priv->active_display) - g_object_unref (self->priv->active_display); G_OBJECT_CLASS (seat_parent_class)->finalize (object); } @@ -678,6 +721,7 @@ seat_class_init (SeatClass *klass) klass->setup = seat_real_setup; klass->start = seat_real_start; klass->set_active_display = seat_real_set_active_display; + klass->get_active_display = seat_real_get_active_display; klass->run_script = seat_real_run_script; klass->stop = seat_real_stop; diff --git a/src/seat.h b/src/seat.h --- a/src/seat.h +++ b/src/seat.h @@ -40,6 +40,7 @@ typedef struct DisplayServer *(*create_display_server) (Seat *seat); Session *(*create_session) (Seat *seat, Display *display); void (*set_active_display)(Seat *seat, Display *display); + Display *(*get_active_display)(Seat *seat); void (*run_script)(Seat *seat, Display *display, Process *script); void (*stop)(Seat *seat); diff --git a/src/xserver-local.c b/src/xserver-local.c --- a/src/xserver-local.c +++ b/src/xserver-local.c @@ -61,6 +61,9 @@ struct XServerLocalPrivate /* VT to run on */ gint vt; + /* TRUE if holding a reference to the VT */ + gboolean have_vt_ref; + /* TRUE if replacing Plymouth */ gboolean replacing_plymouth; }; @@ -148,7 +151,10 @@ xserver_local_new (void) if (self->priv->vt < 0) self->priv->vt = vt_get_unused (); if (self->priv->vt >= 0) + { vt_ref (self->priv->vt); + self->priv->have_vt_ref = TRUE; + } return self; } @@ -316,9 +322,6 @@ stopped_cb (Process *process, XServerLoc { g_debug ("X server stopped"); - g_object_unref (server->priv->xserver_process); - server->priv->xserver_process = NULL; - xserver_local_release_display_number (xserver_get_display_number (XSERVER (server))); if (xserver_get_authority (XSERVER (server)) && server->priv->authority_file) @@ -339,11 +342,11 @@ stopped_cb (Process *process, XServerLoc server->priv->authority_file = NULL; } - if (server->priv->vt >= 0) + if (server->priv->have_vt_ref) { vt_unref (server->priv->vt); - server->priv->vt = -1; - } + server->priv->have_vt_ref = FALSE; + } if (server->priv->replacing_plymouth && plymouth_get_is_running ()) { @@ -546,7 +549,7 @@ xserver_local_finalize (GObject *object) g_free (self->priv->xdmcp_key); if (self->priv->authority_file) g_object_unref (self->priv->authority_file); - if (self->priv->vt >= 0) + if (self->priv->have_vt_ref) vt_unref (self->priv->vt); G_OBJECT_CLASS (xserver_local_parent_class)->finalize (object); ++++++ lightdm-use-fine-grained-memory-locking.patch ++++++ # HG changeset patch # User Michael Terry <michael.terry(a)canonical.com> # Date 1359392941 18000 # Branch precise-mlock # Node ID 5b070d44540db1caad11c998a8678aafb1a2f4a5 # Parent ce5521d07555b291eb3a9cdc56a13e634dd951a9 Use libgcrypt to selectively secure password memory instead of the big-hammer approach of mlockall diff --git a/src/Makefile.am b/src/Makefile.am --- a/src/Makefile.am +++ b/src/Makefile.am @@ -95,6 +95,7 @@ lightdm_CFLAGS = \ lightdm_LDADD = \ $(LIGHTDM_LIBS) \ + -lgcrypt \ -lpam pkglibexec_PROGRAMS = lightdm-guest-session-wrapper diff --git a/src/greeter.c b/src/greeter.c --- a/src/greeter.c +++ b/src/greeter.c @@ -15,6 +15,7 @@ #include <string.h> #include <errno.h> #include <fcntl.h> +#include <gcrypt.h> #include "greeter.h" #include "ldm-marshal.h" @@ -40,6 +41,7 @@ struct GreeterPrivate /* Buffer for data read from greeter */ guint8 *read_buffer; gsize n_read; + gboolean use_secure_memory; /* Hints for the greeter */ GHashTable *hints; @@ -105,6 +107,7 @@ greeter_new (Session *session, const gch greeter->priv->session = g_object_ref (session); greeter->priv->pam_service = g_strdup (pam_service); greeter->priv->autologin_pam_service = g_strdup (autologin_pam_service); + greeter->priv->use_secure_memory = config_get_boolean (config_get_instance (), "LightDM", "lock-memory"); return greeter; } @@ -121,6 +124,33 @@ greeter_set_hint (Greeter *greeter, cons g_hash_table_insert (greeter->priv->hints, g_strdup (name), g_strdup (value)); } +static void * +secure_malloc (Greeter *greeter, size_t n) +{ + if (greeter->priv->use_secure_memory) + return gcry_malloc_secure (n); + else + return g_malloc (n); +} + +static void * +secure_realloc (Greeter *greeter, void *ptr, size_t n) +{ + if (greeter->priv->use_secure_memory) + return gcry_realloc (ptr, n); + else + return g_realloc (ptr, n); +} + +static void +secure_free (Greeter *greeter, void *ptr) +{ + if (greeter->priv->use_secure_memory) + return gcry_free (ptr); + else + return g_free (ptr); +} + static guint32 int_length () { @@ -259,6 +289,7 @@ pam_messages_cb (Session *session, Greet struct pam_response *response; response = calloc (messages_length, sizeof (struct pam_response)); session_respond (greeter->priv->authentication_session, response); + free (response); } } @@ -490,12 +521,18 @@ handle_continue_authentication (Greeter int msg_style = messages[i].msg_style; if (msg_style == PAM_PROMPT_ECHO_OFF || msg_style == PAM_PROMPT_ECHO_ON) { - response[i].resp = strdup (secrets[j]); // FIXME: Need to convert from UTF-8 + size_t secret_length = strlen (secrets[j]) + 1; + response[i].resp = secure_malloc (greeter, secret_length); + memcpy (response[i].resp, secrets[j], secret_length); // FIXME: Need to convert from UTF-8 j++; } } session_respond (greeter->priv->authentication_session, response); + + for (i = 0; i < messages_length; i++) + secure_free (greeter, response[i].resp); + free (response); } static void @@ -587,7 +624,7 @@ read_int (Greeter *greeter, gsize *offse } static gchar * -read_string (Greeter *greeter, gsize *offset) +read_string_full (Greeter *greeter, gsize *offset, void* (*alloc_fn)(size_t n)) { guint32 length; gchar *value; @@ -599,7 +636,7 @@ read_string (Greeter *greeter, gsize *of return g_strdup (""); } - value = g_malloc (sizeof (gchar *) * (length + 1)); + value = (*alloc_fn) (sizeof (gchar *) * (length + 1)); memcpy (value, greeter->priv->read_buffer + *offset, length); value[length] = '\0'; *offset += length; @@ -607,6 +644,21 @@ read_string (Greeter *greeter, gsize *of return value; } +static gchar * +read_string (Greeter *greeter, gsize *offset) +{ + return read_string_full (greeter, offset, g_malloc); +} + +static gchar * +read_secret (Greeter *greeter, gsize *offset) +{ + if (greeter->priv->use_secure_memory) + return read_string_full (greeter, offset, gcry_malloc_secure); + else + return read_string_full (greeter, offset, g_malloc); +} + static gboolean read_cb (GIOChannel *source, GIOCondition condition, gpointer data) { @@ -654,7 +706,7 @@ read_cb (GIOChannel *source, GIOConditio n_to_read = read_int (greeter, &offset); if (n_to_read > 0) { - greeter->priv->read_buffer = g_realloc (greeter->priv->read_buffer, HEADER_SIZE + n_to_read); + greeter->priv->read_buffer = secure_realloc (greeter, greeter->priv->read_buffer, HEADER_SIZE + n_to_read); read_cb (source, condition, greeter); return TRUE; } @@ -690,10 +742,12 @@ read_cb (GIOChannel *source, GIOConditio n_secrets = read_int (greeter, &offset); secrets = g_malloc (sizeof (gchar *) * (n_secrets + 1)); for (i = 0; i < n_secrets; i++) - secrets[i] = read_string (greeter, &offset); + secrets[i] = read_secret (greeter, &offset); secrets[i] = NULL; handle_continue_authentication (greeter, secrets); - g_strfreev (secrets); + for (i = 0; i < n_secrets; i++) + secure_free (greeter, secrets[i]); + g_free (secrets); break; case GREETER_MESSAGE_CANCEL_AUTHENTICATION: handle_cancel_authentication (greeter); @@ -796,7 +850,7 @@ static void greeter_init (Greeter *greeter) { greeter->priv = G_TYPE_INSTANCE_GET_PRIVATE (greeter, GREETER_TYPE, GreeterPrivate); - greeter->priv->read_buffer = g_malloc (HEADER_SIZE); + greeter->priv->read_buffer = secure_malloc (greeter, HEADER_SIZE); greeter->priv->hints = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); } @@ -811,7 +865,7 @@ greeter_finalize (GObject *object) g_object_unref (self->priv->session); g_free (self->priv->pam_service); g_free (self->priv->autologin_pam_service); - g_free (self->priv->read_buffer); + secure_free (self, self->priv->read_buffer); g_hash_table_unref (self->priv->hints); g_free (self->priv->remote_session); if (self->priv->authentication_session) diff --git a/src/lightdm.c b/src/lightdm.c --- a/src/lightdm.c +++ b/src/lightdm.c @@ -19,7 +19,6 @@ #include <unistd.h> #include <fcntl.h> #include <sys/stat.h> -#include <sys/mman.h> #include "configuration.h" #include "opensuse-sysconfig.h" @@ -1194,12 +1193,6 @@ main (int argc, char **argv) NULL, NULL); - if (config_get_boolean (config_get_instance (), "LightDM", "lock-memory")) - { - /* Protect memory from being paged to disk, as we deal with passwords */ - mlockall (MCL_CURRENT | MCL_FUTURE); - } - if (getuid () != 0) g_debug ("Running in user mode"); if (getenv ("DISPLAY")) diff --git a/src/session-child.c b/src/session-child.c --- a/src/session-child.c +++ b/src/session-child.c @@ -67,7 +67,7 @@ read_data (void *buf, size_t count) } static gchar * -read_string () +read_string_full (void* (*alloc_fn)(size_t n)) { int length; char *value; @@ -82,13 +82,19 @@ read_string () return NULL; } - value = g_malloc (sizeof (char) * (length + 1)); + value = (*alloc_fn) (sizeof (char) * (length + 1)); read_data (value, length); value[length] = '\0'; return value; } +static gchar * +read_string () +{ + return read_string_full (g_malloc); +} + static int pam_conv_cb (int msg_length, const struct pam_message **msg, struct pam_response **resp, void *app_data) { @@ -139,7 +145,9 @@ pam_conv_cb (int msg_length, const struc for (i = 0; i < msg_length; i++) { struct pam_response *r = &response[i]; - r->resp = read_string (); + // callers of this function inside pam will expect to be able to call + // free() on the strings we give back. So alloc with malloc. + r->resp = read_string_full (malloc); read_data (&r->resp_retcode, sizeof (r->resp_retcode)); } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ldapcpplib for openSUSE:12.3
by root＠hilbert.suse.de 01 Feb '13

01 Feb '13

Hello community, here is the log from the commit of package ldapcpplib for openSUSE:12.3 checked in at 2013-02-01 09:45:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/ldapcpplib (Old) and /work/SRC/openSUSE:12.3/.ldapcpplib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ldapcpplib", Maintainer is "rhafer(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/ldapcpplib/ldapcpplib.changes 2013-01-31 01:22:56.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.ldapcpplib.new/ldapcpplib.changes 2013-02-01 09:45:18.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Jan 31 13:50:52 UTC 2013 - rhafer(a)suse.com + +- Update to 0.3.1: + * obsoletes ldapcpplib-gcc47.patch (has been included upstream) + * Added some checks for existence of certificate files and + directories when setting TLS options (bnc#801065) + +------------------------------------------------------------------- Old: ---- ldapcpplib-0.3.0.tar.bz2 ldapcpplib-gcc47.patch New: ---- ldapcpplib-0.3.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ldapcpplib.spec ++++++ --- /var/tmp/diff_new_pack.AVnURV/_old 2013-02-01 09:45:18.000000000 +0100 +++ /var/tmp/diff_new_pack.AVnURV/_new 2013-02-01 09:45:18.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ldapcpplib # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,10 +25,9 @@ Summary: C++ API for LDAPv3 License: OLDAP-2.8 Group: Development/Libraries/C and C++ -Version: 0.3.0 +Version: 0.3.1 Release: 0 Source: %{name}-%{version}.tar.bz2 -Patch0: ldapcpplib-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -79,7 +78,6 @@ %prep %setup -q -%patch0 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" ++++++ ldapcpplib-0.3.0.tar.bz2 -> ldapcpplib-0.3.1.tar.bz2 ++++++ ++++ 4215 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/COPYRIGHT new/ldapcpplib-0.3.1/COPYRIGHT --- old/ldapcpplib-0.3.0/COPYRIGHT 2011-06-15 15:32:50.000000000 +0200 +++ new/ldapcpplib-0.3.1/COPYRIGHT 2013-01-31 14:43:27.000000000 +0100 @@ -1,5 +1,4 @@ -Copyright 1998-2011 The OpenLDAP Foundation -All rights reserved. +Copyright 1998-2013 The OpenLDAP Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted only as authorized by the OpenLDAP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/Makefile.am new/ldapcpplib-0.3.1/Makefile.am --- old/ldapcpplib-0.3.0/Makefile.am 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/Makefile.am 2013-01-31 14:40:08.000000000 +0100 @@ -1,7 +1,7 @@ # $OpenLDAP$ ## -# Copyright 2000-2011 The OpenLDAP Foundation. All Rights Reserved. +# Copyright 2000-2013 The OpenLDAP Foundation. All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT file ## diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/configure.in new/ldapcpplib-0.3.1/configure.in --- old/ldapcpplib-0.3.0/configure.in 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/configure.in 2013-01-31 14:40:08.000000000 +0100 @@ -1,13 +1,13 @@ dnl $OpenLDAP$ -dnl Copyright 2000-2011 The OpenLDAP Foundation. All Rights Reserved. +dnl Copyright 2000-2013 The OpenLDAP Foundation. All Rights Reserved. dnl COPYING RESTRICTIONS APPLY, see COPYRIGHT file dnl Process this file with autoconf to produce a configure script. -AC_COPYRIGHT([[Copyright 2000-2011 The OpenLDAP Foundation. All rights reserved. +AC_COPYRIGHT([[Copyright 2000-2013 The OpenLDAP Foundation. All rights reserved. Restrictions apply, see COPYRIGHT and LICENSE files.]]) -AC_REVISION([$Id: 1725c1ccd6cda19fe04c0d97ceb18ea97cb5eb97 $]) +AC_REVISION([$Id: 8574e5abc725b2dc4c2d231eaf8ac885e441e038 $]) AC_INIT(ldapcpplib, [] , [http://www.openldap.org/its/] ) AC_CONFIG_SRCDIR(src/LDAPConnection.h) AM_INIT_AUTOMAKE(foreign) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/examples/Makefile.am new/ldapcpplib-0.3.1/examples/Makefile.am --- old/ldapcpplib-0.3.0/examples/Makefile.am 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/examples/Makefile.am 2013-01-31 14:40:08.000000000 +0100 @@ -1,7 +1,7 @@ # $OpenLDAP$ ## -# Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved. +# Copyright 2003-2013 The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT file ## AM_CPPFLAGS = -I$(top_srcdir)/src diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/examples/main.cpp new/ldapcpplib-0.3.1/examples/main.cpp --- old/ldapcpplib-0.3.0/examples/main.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/examples/main.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/examples/readSchema.cpp new/ldapcpplib-0.3.1/examples/readSchema.cpp --- old/ldapcpplib-0.3.0/examples/readSchema.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/examples/readSchema.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2008-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2008-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/examples/startTls.cpp new/ldapcpplib-0.3.1/examples/startTls.cpp --- old/ldapcpplib-0.3.0/examples/startTls.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/examples/startTls.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2010-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2010-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ @@ -27,7 +27,7 @@ tls.setOption( TlsOptions::REQUIRE_CERT, TlsOptions::DEMAND ); std::cout << " CaCertfile: " << tls.getStringOption( TlsOptions::CACERTFILE ) << std::endl; std::cout << " Require Cert: " << tls.getIntOption( TlsOptions::REQUIRE_CERT ) << std::endl; - + try { // 1. connect using global options LDAPAsynConnection l(uri); @@ -40,8 +40,8 @@ } // 2. connect using connection specific option - l = LDAPAsynConnection(uri); - tls=l.getTlsOptions(); + LDAPAsynConnection l1(uri); + tls=l1.getTlsOptions(); std::cout << "Current connection specific settings:" << std::endl; std::cout << " CaCertfile: " << tls.getStringOption( TlsOptions::CACERTFILE) << std::endl; std::cout << " CaCertDir: " << tls.getStringOption( TlsOptions::CACERTDIR ) << std::endl; @@ -52,13 +52,13 @@ std::cout << " CaCertDir: " << tls.getStringOption( TlsOptions::CACERTDIR ) << std::endl; std::cout << " Require Cert: " << tls.getIntOption( TlsOptions::REQUIRE_CERT ) << std::endl; try { - l.start_tls(); + l1.start_tls(); std::cout << "StartTLS successful." << std::endl; - l.unbind(); + l1.unbind(); } catch ( LDAPException e ) { std::cerr << e << std::endl; } - + // 3. and once again using the globals try { LDAPAsynConnection l2(uri); @@ -76,4 +76,4 @@ } catch ( LDAPException e ) { std::cerr << e << std::endl; } -} +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/examples/urlTest.cpp new/ldapcpplib-0.3.1/examples/urlTest.cpp --- old/ldapcpplib-0.3.0/examples/urlTest.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/examples/urlTest.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2008-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2008-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPAddRequest.cpp new/ldapcpplib-0.3.1/src/LDAPAddRequest.cpp --- old/ldapcpplib-0.3.0/src/LDAPAddRequest.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPAddRequest.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPAddRequest.h new/ldapcpplib-0.3.1/src/LDAPAddRequest.h --- old/ldapcpplib-0.3.0/src/LDAPAddRequest.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPAddRequest.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPAsynConnection.cpp new/ldapcpplib-0.3.1/src/LDAPAsynConnection.cpp --- old/ldapcpplib-0.3.0/src/LDAPAsynConnection.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPAsynConnection.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPAsynConnection.h new/ldapcpplib-0.3.1/src/LDAPAsynConnection.h --- old/ldapcpplib-0.3.0/src/LDAPAsynConnection.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPAsynConnection.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPAttrType.cpp new/ldapcpplib-0.3.1/src/LDAPAttrType.cpp --- old/ldapcpplib-0.3.0/src/LDAPAttrType.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPAttrType.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2003-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPAttrType.h new/ldapcpplib-0.3.1/src/LDAPAttrType.h --- old/ldapcpplib-0.3.0/src/LDAPAttrType.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPAttrType.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2003-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPAttribute.cpp new/ldapcpplib-0.3.1/src/LDAPAttribute.cpp --- old/ldapcpplib-0.3.0/src/LDAPAttribute.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPAttribute.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPAttribute.h new/ldapcpplib-0.3.1/src/LDAPAttribute.h --- old/ldapcpplib-0.3.0/src/LDAPAttribute.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPAttribute.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPAttributeList.cpp new/ldapcpplib-0.3.1/src/LDAPAttributeList.cpp --- old/ldapcpplib-0.3.0/src/LDAPAttributeList.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPAttributeList.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPAttributeList.h new/ldapcpplib-0.3.1/src/LDAPAttributeList.h --- old/ldapcpplib-0.3.0/src/LDAPAttributeList.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPAttributeList.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPBindRequest.cpp new/ldapcpplib-0.3.1/src/LDAPBindRequest.cpp --- old/ldapcpplib-0.3.0/src/LDAPBindRequest.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPBindRequest.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPBindRequest.h new/ldapcpplib-0.3.1/src/LDAPBindRequest.h --- old/ldapcpplib-0.3.0/src/LDAPBindRequest.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPBindRequest.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPCompareRequest.cpp new/ldapcpplib-0.3.1/src/LDAPCompareRequest.cpp --- old/ldapcpplib-0.3.0/src/LDAPCompareRequest.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPCompareRequest.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPCompareRequest.h new/ldapcpplib-0.3.1/src/LDAPCompareRequest.h --- old/ldapcpplib-0.3.0/src/LDAPCompareRequest.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPCompareRequest.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPConnection.cpp new/ldapcpplib-0.3.1/src/LDAPConnection.cpp --- old/ldapcpplib-0.3.0/src/LDAPConnection.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPConnection.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPConnection.h new/ldapcpplib-0.3.1/src/LDAPConnection.h --- old/ldapcpplib-0.3.0/src/LDAPConnection.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPConnection.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPConstraints.cpp new/ldapcpplib-0.3.1/src/LDAPConstraints.cpp --- old/ldapcpplib-0.3.0/src/LDAPConstraints.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPConstraints.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPConstraints.h new/ldapcpplib-0.3.1/src/LDAPConstraints.h --- old/ldapcpplib-0.3.0/src/LDAPConstraints.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPConstraints.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPControl.cpp new/ldapcpplib-0.3.1/src/LDAPControl.cpp --- old/ldapcpplib-0.3.0/src/LDAPControl.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPControl.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPControl.h new/ldapcpplib-0.3.1/src/LDAPControl.h --- old/ldapcpplib-0.3.0/src/LDAPControl.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPControl.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPControlSet.cpp new/ldapcpplib-0.3.1/src/LDAPControlSet.cpp --- old/ldapcpplib-0.3.0/src/LDAPControlSet.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPControlSet.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPControlSet.h new/ldapcpplib-0.3.1/src/LDAPControlSet.h --- old/ldapcpplib-0.3.0/src/LDAPControlSet.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPControlSet.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPDeleteRequest.cpp new/ldapcpplib-0.3.1/src/LDAPDeleteRequest.cpp --- old/ldapcpplib-0.3.0/src/LDAPDeleteRequest.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPDeleteRequest.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPDeleteRequest.h new/ldapcpplib-0.3.1/src/LDAPDeleteRequest.h --- old/ldapcpplib-0.3.0/src/LDAPDeleteRequest.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPDeleteRequest.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPEntry.cpp new/ldapcpplib-0.3.1/src/LDAPEntry.cpp --- old/ldapcpplib-0.3.0/src/LDAPEntry.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPEntry.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPEntry.h new/ldapcpplib-0.3.1/src/LDAPEntry.h --- old/ldapcpplib-0.3.0/src/LDAPEntry.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPEntry.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPEntryList.cpp new/ldapcpplib-0.3.1/src/LDAPEntryList.cpp --- old/ldapcpplib-0.3.0/src/LDAPEntryList.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPEntryList.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPEntryList.h new/ldapcpplib-0.3.1/src/LDAPEntryList.h --- old/ldapcpplib-0.3.0/src/LDAPEntryList.h 2011-06-15 15:32:49.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPEntryList.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPException.cpp new/ldapcpplib-0.3.1/src/LDAPException.cpp --- old/ldapcpplib-0.3.0/src/LDAPException.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPException.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPException.h new/ldapcpplib-0.3.1/src/LDAPException.h --- old/ldapcpplib-0.3.0/src/LDAPException.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPException.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPExtRequest.cpp new/ldapcpplib-0.3.1/src/LDAPExtRequest.cpp --- old/ldapcpplib-0.3.0/src/LDAPExtRequest.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPExtRequest.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPExtRequest.h new/ldapcpplib-0.3.1/src/LDAPExtRequest.h --- old/ldapcpplib-0.3.0/src/LDAPExtRequest.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPExtRequest.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPExtResult.cpp new/ldapcpplib-0.3.1/src/LDAPExtResult.cpp --- old/ldapcpplib-0.3.0/src/LDAPExtResult.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPExtResult.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPExtResult.h new/ldapcpplib-0.3.1/src/LDAPExtResult.h --- old/ldapcpplib-0.3.0/src/LDAPExtResult.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPExtResult.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPMessage.cpp new/ldapcpplib-0.3.1/src/LDAPMessage.cpp --- old/ldapcpplib-0.3.0/src/LDAPMessage.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPMessage.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPMessage.h new/ldapcpplib-0.3.1/src/LDAPMessage.h --- old/ldapcpplib-0.3.0/src/LDAPMessage.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPMessage.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPMessageQueue.cpp new/ldapcpplib-0.3.1/src/LDAPMessageQueue.cpp --- old/ldapcpplib-0.3.0/src/LDAPMessageQueue.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPMessageQueue.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPMessageQueue.h new/ldapcpplib-0.3.1/src/LDAPMessageQueue.h --- old/ldapcpplib-0.3.0/src/LDAPMessageQueue.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPMessageQueue.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPModDNRequest.cpp new/ldapcpplib-0.3.1/src/LDAPModDNRequest.cpp --- old/ldapcpplib-0.3.0/src/LDAPModDNRequest.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPModDNRequest.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPModDNRequest.h new/ldapcpplib-0.3.1/src/LDAPModDNRequest.h --- old/ldapcpplib-0.3.0/src/LDAPModDNRequest.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPModDNRequest.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPModList.cpp new/ldapcpplib-0.3.1/src/LDAPModList.cpp --- old/ldapcpplib-0.3.0/src/LDAPModList.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPModList.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPModList.h new/ldapcpplib-0.3.1/src/LDAPModList.h --- old/ldapcpplib-0.3.0/src/LDAPModList.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPModList.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPModification.cpp new/ldapcpplib-0.3.1/src/LDAPModification.cpp --- old/ldapcpplib-0.3.0/src/LDAPModification.cpp 2011-06-15 15:32:49.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPModification.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPModification.h new/ldapcpplib-0.3.1/src/LDAPModification.h --- old/ldapcpplib-0.3.0/src/LDAPModification.h 2011-06-15 15:32:49.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPModification.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPModifyRequest.cpp new/ldapcpplib-0.3.1/src/LDAPModifyRequest.cpp --- old/ldapcpplib-0.3.0/src/LDAPModifyRequest.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPModifyRequest.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPModifyRequest.h new/ldapcpplib-0.3.1/src/LDAPModifyRequest.h --- old/ldapcpplib-0.3.0/src/LDAPModifyRequest.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPModifyRequest.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPObjClass.cpp new/ldapcpplib-0.3.1/src/LDAPObjClass.cpp --- old/ldapcpplib-0.3.0/src/LDAPObjClass.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPObjClass.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2003-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPObjClass.h new/ldapcpplib-0.3.1/src/LDAPObjClass.h --- old/ldapcpplib-0.3.0/src/LDAPObjClass.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPObjClass.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2003-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPRebind.cpp new/ldapcpplib-0.3.1/src/LDAPRebind.cpp --- old/ldapcpplib-0.3.0/src/LDAPRebind.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPRebind.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPRebind.h new/ldapcpplib-0.3.1/src/LDAPRebind.h --- old/ldapcpplib-0.3.0/src/LDAPRebind.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPRebind.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPRebindAuth.cpp new/ldapcpplib-0.3.1/src/LDAPRebindAuth.cpp --- old/ldapcpplib-0.3.0/src/LDAPRebindAuth.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPRebindAuth.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPRebindAuth.h new/ldapcpplib-0.3.1/src/LDAPRebindAuth.h --- old/ldapcpplib-0.3.0/src/LDAPRebindAuth.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPRebindAuth.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPReferenceList.cpp new/ldapcpplib-0.3.1/src/LDAPReferenceList.cpp --- old/ldapcpplib-0.3.0/src/LDAPReferenceList.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPReferenceList.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPReferenceList.h new/ldapcpplib-0.3.1/src/LDAPReferenceList.h --- old/ldapcpplib-0.3.0/src/LDAPReferenceList.h 2011-06-15 15:32:49.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPReferenceList.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPRequest.cpp new/ldapcpplib-0.3.1/src/LDAPRequest.cpp --- old/ldapcpplib-0.3.0/src/LDAPRequest.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPRequest.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPRequest.h new/ldapcpplib-0.3.1/src/LDAPRequest.h --- old/ldapcpplib-0.3.0/src/LDAPRequest.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPRequest.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPResult.cpp new/ldapcpplib-0.3.1/src/LDAPResult.cpp --- old/ldapcpplib-0.3.0/src/LDAPResult.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPResult.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPResult.h new/ldapcpplib-0.3.1/src/LDAPResult.h --- old/ldapcpplib-0.3.0/src/LDAPResult.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPResult.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPSaslBindResult.cpp new/ldapcpplib-0.3.1/src/LDAPSaslBindResult.cpp --- old/ldapcpplib-0.3.0/src/LDAPSaslBindResult.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPSaslBindResult.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2007-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2007-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPSaslBindResult.h new/ldapcpplib-0.3.1/src/LDAPSaslBindResult.h --- old/ldapcpplib-0.3.0/src/LDAPSaslBindResult.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPSaslBindResult.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2007-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2007-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPSchema.cpp new/ldapcpplib-0.3.1/src/LDAPSchema.cpp --- old/ldapcpplib-0.3.0/src/LDAPSchema.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPSchema.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2003-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPSchema.h new/ldapcpplib-0.3.1/src/LDAPSchema.h --- old/ldapcpplib-0.3.0/src/LDAPSchema.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPSchema.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2003-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPSearchReference.cpp new/ldapcpplib-0.3.1/src/LDAPSearchReference.cpp --- old/ldapcpplib-0.3.0/src/LDAPSearchReference.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPSearchReference.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPSearchReference.h new/ldapcpplib-0.3.1/src/LDAPSearchReference.h --- old/ldapcpplib-0.3.0/src/LDAPSearchReference.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPSearchReference.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPSearchRequest.cpp new/ldapcpplib-0.3.1/src/LDAPSearchRequest.cpp --- old/ldapcpplib-0.3.0/src/LDAPSearchRequest.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPSearchRequest.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPSearchRequest.h new/ldapcpplib-0.3.1/src/LDAPSearchRequest.h --- old/ldapcpplib-0.3.0/src/LDAPSearchRequest.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPSearchRequest.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPSearchResult.cpp new/ldapcpplib-0.3.1/src/LDAPSearchResult.cpp --- old/ldapcpplib-0.3.0/src/LDAPSearchResult.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPSearchResult.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPSearchResult.h new/ldapcpplib-0.3.1/src/LDAPSearchResult.h --- old/ldapcpplib-0.3.0/src/LDAPSearchResult.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPSearchResult.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPSearchResults.cpp new/ldapcpplib-0.3.1/src/LDAPSearchResults.cpp --- old/ldapcpplib-0.3.0/src/LDAPSearchResults.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPSearchResults.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPSearchResults.h new/ldapcpplib-0.3.1/src/LDAPSearchResults.h --- old/ldapcpplib-0.3.0/src/LDAPSearchResults.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPSearchResults.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPUrl.cpp new/ldapcpplib-0.3.1/src/LDAPUrl.cpp --- old/ldapcpplib-0.3.0/src/LDAPUrl.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPUrl.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPUrl.h new/ldapcpplib-0.3.1/src/LDAPUrl.h --- old/ldapcpplib-0.3.0/src/LDAPUrl.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPUrl.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPUrlList.cpp new/ldapcpplib-0.3.1/src/LDAPUrlList.cpp --- old/ldapcpplib-0.3.0/src/LDAPUrlList.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPUrlList.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPUrlList.h new/ldapcpplib-0.3.1/src/LDAPUrlList.h --- old/ldapcpplib-0.3.0/src/LDAPUrlList.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPUrlList.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LdifReader.cpp new/ldapcpplib-0.3.1/src/LdifReader.cpp --- old/ldapcpplib-0.3.0/src/LdifReader.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LdifReader.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2008-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2008-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LdifReader.h new/ldapcpplib-0.3.1/src/LdifReader.h --- old/ldapcpplib-0.3.0/src/LdifReader.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LdifReader.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2008-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2008-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LdifWriter.cpp new/ldapcpplib-0.3.1/src/LdifWriter.cpp --- old/ldapcpplib-0.3.0/src/LdifWriter.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LdifWriter.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2008-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2008-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LdifWriter.h new/ldapcpplib-0.3.1/src/LdifWriter.h --- old/ldapcpplib-0.3.0/src/LdifWriter.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LdifWriter.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2008-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2008-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/Makefile.am new/ldapcpplib-0.3.1/src/Makefile.am --- old/ldapcpplib-0.3.0/src/Makefile.am 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/Makefile.am 2013-01-31 14:40:08.000000000 +0100 @@ -1,7 +1,7 @@ # $OpenLDAP$ ### -# Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. +# Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT file ## diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/SaslInteraction.cpp new/ldapcpplib-0.3.1/src/SaslInteraction.cpp --- old/ldapcpplib-0.3.0/src/SaslInteraction.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/SaslInteraction.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2007-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2007-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/SaslInteraction.h new/ldapcpplib-0.3.1/src/SaslInteraction.h --- old/ldapcpplib-0.3.0/src/SaslInteraction.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/SaslInteraction.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2007-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2007-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/SaslInteractionHandler.cpp new/ldapcpplib-0.3.1/src/SaslInteractionHandler.cpp --- old/ldapcpplib-0.3.0/src/SaslInteractionHandler.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/SaslInteractionHandler.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2007-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2007-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ @@ -11,6 +11,7 @@ #ifdef HAVE_TERMIOS_H #include <termios.h> +#include <unistd.h> #include <cstdio> #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/SaslInteractionHandler.h new/ldapcpplib-0.3.1/src/SaslInteractionHandler.h --- old/ldapcpplib-0.3.0/src/SaslInteractionHandler.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/SaslInteractionHandler.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2007-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2007-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/StringList.cpp new/ldapcpplib-0.3.1/src/StringList.cpp --- old/ldapcpplib-0.3.0/src/StringList.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/StringList.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/StringList.h new/ldapcpplib-0.3.1/src/StringList.h --- old/ldapcpplib-0.3.0/src/StringList.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/StringList.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/TlsOptions.cpp new/ldapcpplib-0.3.1/src/TlsOptions.cpp --- old/ldapcpplib-0.3.0/src/TlsOptions.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/TlsOptions.cpp 2013-01-31 14:43:27.000000000 +0100 @@ -1,9 +1,16 @@ // $OpenLDAP$ /* - * Copyright 2010-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2010-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ +#include <fstream> +#include <sstream> +#include <sys/types.h> +#include <sys/stat.h> +#include <errno.h> +#include <unistd.h> +#include <cstring> #include "TlsOptions.h" #include "LDAPException.h" @@ -54,6 +61,41 @@ void TlsOptions::setOption( tls_option opt, const std::string& value ) const { checkOpt(opt, STRING); + switch(opt) { + case TlsOptions::CACERTFILE : + case TlsOptions::CERTFILE : + case TlsOptions::KEYFILE : + { + // check if the supplied file is actually readable + std::ifstream ifile(value.c_str()); + if ( !ifile ) { + throw( LDAPException( LDAP_LOCAL_ERROR, "Unable to open the supplied file for reading" ) ); + } + } + break; + case TlsOptions::CACERTDIR : + { + struct stat st; + std::ostringstream msg; + bool fail=false; + int err = stat(value.c_str(),&st); + if ( err ) { + msg << strerror(errno); + fail = true; + } else { + if ( !S_ISDIR(st.st_mode) ){ + msg << "The supplied path is not a directory."; + fail = true; + } + } + if ( fail ) { + std::ostringstream errstr; + errstr << "Error while setting Certificate Directory (" << value << "): " << msg.str(); + throw( LDAPException( LDAP_LOCAL_ERROR, errstr.str() ) ); + } + } + break; + } this->setOption( opt, value.empty() ? NULL : (void*) value.c_str() ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/TlsOptions.h new/ldapcpplib-0.3.1/src/TlsOptions.h --- old/ldapcpplib-0.3.0/src/TlsOptions.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/TlsOptions.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2010-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2010-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ #ifndef TLS_OPTIONS_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/ac/time.h new/ldapcpplib-0.3.1/src/ac/time.h --- old/ldapcpplib-0.3.0/src/ac/time.h 2011-05-26 17:01:16.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/ac/time.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,7 +1,7 @@ /* Generic time.h */ /* $OpenLDAP$ */ /* - * Copyright 1998-2011 The OpenLDAP Foundation, Redwood City, California, USA + * Copyright 1998-2013 The OpenLDAP Foundation, Redwood City, California, USA * All rights reserved. * * Redistribution and use in source and binary forms are permitted only diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/config.h.in new/ldapcpplib-0.3.1/src/config.h.in --- old/ldapcpplib-0.3.0/src/config.h.in 2011-06-15 12:08:48.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/config.h.in 2013-01-31 14:44:44.000000000 +0100 @@ -54,6 +54,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/debug.h new/ldapcpplib-0.3.1/src/debug.h --- old/ldapcpplib-0.3.0/src/debug.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/debug.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/version.sh new/ldapcpplib-0.3.1/version.sh --- old/ldapcpplib-0.3.0/version.sh 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/version.sh 2013-01-31 14:40:08.000000000 +0100 @@ -1,7 +1,7 @@ #! /bin/sh # $OpenLDAP$ # -# Copyright 2008-2011 The OpenLDAP Foundation. All Rights Reserved. +# Copyright 2008-2013 The OpenLDAP Foundation. All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT file DIR=`dirname $0` . $DIR/version.var diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/version.var new/ldapcpplib-0.3.1/version.var --- old/ldapcpplib-0.3.0/version.var 2011-06-15 15:37:59.000000000 +0200 +++ new/ldapcpplib-0.3.1/version.var 2013-01-31 14:43:54.000000000 +0100 @@ -1,13 +1,13 @@ #! /bin/sh # $OpenLDAP$ # -# Copyright 2008-2011 The OpenLDAP Foundation. All Rights Reserved. +# Copyright 2008-2013 The OpenLDAP Foundation. All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT file ol_cpp_api_rel_major=0 ol_cpp_api_rel_minor=3 -ol_cpp_api_rel_patch=0 +ol_cpp_api_rel_patch=1 ol_cpp_api_current=4 -ol_cpp_api_revision=0 +ol_cpp_api_revision=1 ol_cpp_api_age=3 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ldapcpplib for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '13

01 Feb '13

Hello community, here is the log from the commit of package ldapcpplib for openSUSE:Factory checked in at 2013-02-01 09:45:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ldapcpplib (Old) and /work/SRC/openSUSE:Factory/.ldapcpplib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ldapcpplib", Maintainer is "rhafer(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/ldapcpplib/ldapcpplib.changes 2012-04-23 16:11:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ldapcpplib.new/ldapcpplib.changes 2013-02-01 09:45:12.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Jan 31 13:50:52 UTC 2013 - rhafer(a)suse.com + +- Update to 0.3.1: + * obsoletes ldapcpplib-gcc47.patch (has been included upstream) + * Added some checks for existence of certificate files and + directories when setting TLS options (bnc#801065) + +------------------------------------------------------------------- Old: ---- ldapcpplib-0.3.0.tar.bz2 ldapcpplib-gcc47.patch New: ---- ldapcpplib-0.3.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ldapcpplib.spec ++++++ --- /var/tmp/diff_new_pack.LxGfUB/_old 2013-02-01 09:45:13.000000000 +0100 +++ /var/tmp/diff_new_pack.LxGfUB/_new 2013-02-01 09:45:13.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ldapcpplib # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,10 +25,9 @@ Summary: C++ API for LDAPv3 License: OLDAP-2.8 Group: Development/Libraries/C and C++ -Version: 0.3.0 +Version: 0.3.1 Release: 0 Source: %{name}-%{version}.tar.bz2 -Patch0: ldapcpplib-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -79,7 +78,6 @@ %prep %setup -q -%patch0 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" ++++++ ldapcpplib-0.3.0.tar.bz2 -> ldapcpplib-0.3.1.tar.bz2 ++++++ ++++ 4215 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/COPYRIGHT new/ldapcpplib-0.3.1/COPYRIGHT --- old/ldapcpplib-0.3.0/COPYRIGHT 2011-06-15 15:32:50.000000000 +0200 +++ new/ldapcpplib-0.3.1/COPYRIGHT 2013-01-31 14:43:27.000000000 +0100 @@ -1,5 +1,4 @@ -Copyright 1998-2011 The OpenLDAP Foundation -All rights reserved. +Copyright 1998-2013 The OpenLDAP Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted only as authorized by the OpenLDAP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/Makefile.am new/ldapcpplib-0.3.1/Makefile.am --- old/ldapcpplib-0.3.0/Makefile.am 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/Makefile.am 2013-01-31 14:40:08.000000000 +0100 @@ -1,7 +1,7 @@ # $OpenLDAP$ ## -# Copyright 2000-2011 The OpenLDAP Foundation. All Rights Reserved. +# Copyright 2000-2013 The OpenLDAP Foundation. All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT file ## diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/configure.in new/ldapcpplib-0.3.1/configure.in --- old/ldapcpplib-0.3.0/configure.in 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/configure.in 2013-01-31 14:40:08.000000000 +0100 @@ -1,13 +1,13 @@ dnl $OpenLDAP$ -dnl Copyright 2000-2011 The OpenLDAP Foundation. All Rights Reserved. +dnl Copyright 2000-2013 The OpenLDAP Foundation. All Rights Reserved. dnl COPYING RESTRICTIONS APPLY, see COPYRIGHT file dnl Process this file with autoconf to produce a configure script. -AC_COPYRIGHT([[Copyright 2000-2011 The OpenLDAP Foundation. All rights reserved. +AC_COPYRIGHT([[Copyright 2000-2013 The OpenLDAP Foundation. All rights reserved. Restrictions apply, see COPYRIGHT and LICENSE files.]]) -AC_REVISION([$Id: 1725c1ccd6cda19fe04c0d97ceb18ea97cb5eb97 $]) +AC_REVISION([$Id: 8574e5abc725b2dc4c2d231eaf8ac885e441e038 $]) AC_INIT(ldapcpplib, [] , [http://www.openldap.org/its/] ) AC_CONFIG_SRCDIR(src/LDAPConnection.h) AM_INIT_AUTOMAKE(foreign) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/examples/Makefile.am new/ldapcpplib-0.3.1/examples/Makefile.am --- old/ldapcpplib-0.3.0/examples/Makefile.am 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/examples/Makefile.am 2013-01-31 14:40:08.000000000 +0100 @@ -1,7 +1,7 @@ # $OpenLDAP$ ## -# Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved. +# Copyright 2003-2013 The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT file ## AM_CPPFLAGS = -I$(top_srcdir)/src diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/examples/main.cpp new/ldapcpplib-0.3.1/examples/main.cpp --- old/ldapcpplib-0.3.0/examples/main.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/examples/main.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/examples/readSchema.cpp new/ldapcpplib-0.3.1/examples/readSchema.cpp --- old/ldapcpplib-0.3.0/examples/readSchema.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/examples/readSchema.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2008-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2008-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/examples/startTls.cpp new/ldapcpplib-0.3.1/examples/startTls.cpp --- old/ldapcpplib-0.3.0/examples/startTls.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/examples/startTls.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2010-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2010-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ @@ -27,7 +27,7 @@ tls.setOption( TlsOptions::REQUIRE_CERT, TlsOptions::DEMAND ); std::cout << " CaCertfile: " << tls.getStringOption( TlsOptions::CACERTFILE ) << std::endl; std::cout << " Require Cert: " << tls.getIntOption( TlsOptions::REQUIRE_CERT ) << std::endl; - + try { // 1. connect using global options LDAPAsynConnection l(uri); @@ -40,8 +40,8 @@ } // 2. connect using connection specific option - l = LDAPAsynConnection(uri); - tls=l.getTlsOptions(); + LDAPAsynConnection l1(uri); + tls=l1.getTlsOptions(); std::cout << "Current connection specific settings:" << std::endl; std::cout << " CaCertfile: " << tls.getStringOption( TlsOptions::CACERTFILE) << std::endl; std::cout << " CaCertDir: " << tls.getStringOption( TlsOptions::CACERTDIR ) << std::endl; @@ -52,13 +52,13 @@ std::cout << " CaCertDir: " << tls.getStringOption( TlsOptions::CACERTDIR ) << std::endl; std::cout << " Require Cert: " << tls.getIntOption( TlsOptions::REQUIRE_CERT ) << std::endl; try { - l.start_tls(); + l1.start_tls(); std::cout << "StartTLS successful." << std::endl; - l.unbind(); + l1.unbind(); } catch ( LDAPException e ) { std::cerr << e << std::endl; } - + // 3. and once again using the globals try { LDAPAsynConnection l2(uri); @@ -76,4 +76,4 @@ } catch ( LDAPException e ) { std::cerr << e << std::endl; } -} +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/examples/urlTest.cpp new/ldapcpplib-0.3.1/examples/urlTest.cpp --- old/ldapcpplib-0.3.0/examples/urlTest.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/examples/urlTest.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2008-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2008-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPAddRequest.cpp new/ldapcpplib-0.3.1/src/LDAPAddRequest.cpp --- old/ldapcpplib-0.3.0/src/LDAPAddRequest.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPAddRequest.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPAddRequest.h new/ldapcpplib-0.3.1/src/LDAPAddRequest.h --- old/ldapcpplib-0.3.0/src/LDAPAddRequest.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPAddRequest.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPAsynConnection.cpp new/ldapcpplib-0.3.1/src/LDAPAsynConnection.cpp --- old/ldapcpplib-0.3.0/src/LDAPAsynConnection.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPAsynConnection.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPAsynConnection.h new/ldapcpplib-0.3.1/src/LDAPAsynConnection.h --- old/ldapcpplib-0.3.0/src/LDAPAsynConnection.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPAsynConnection.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPAttrType.cpp new/ldapcpplib-0.3.1/src/LDAPAttrType.cpp --- old/ldapcpplib-0.3.0/src/LDAPAttrType.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPAttrType.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2003-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPAttrType.h new/ldapcpplib-0.3.1/src/LDAPAttrType.h --- old/ldapcpplib-0.3.0/src/LDAPAttrType.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPAttrType.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2003-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPAttribute.cpp new/ldapcpplib-0.3.1/src/LDAPAttribute.cpp --- old/ldapcpplib-0.3.0/src/LDAPAttribute.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPAttribute.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPAttribute.h new/ldapcpplib-0.3.1/src/LDAPAttribute.h --- old/ldapcpplib-0.3.0/src/LDAPAttribute.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPAttribute.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPAttributeList.cpp new/ldapcpplib-0.3.1/src/LDAPAttributeList.cpp --- old/ldapcpplib-0.3.0/src/LDAPAttributeList.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPAttributeList.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPAttributeList.h new/ldapcpplib-0.3.1/src/LDAPAttributeList.h --- old/ldapcpplib-0.3.0/src/LDAPAttributeList.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPAttributeList.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPBindRequest.cpp new/ldapcpplib-0.3.1/src/LDAPBindRequest.cpp --- old/ldapcpplib-0.3.0/src/LDAPBindRequest.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPBindRequest.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPBindRequest.h new/ldapcpplib-0.3.1/src/LDAPBindRequest.h --- old/ldapcpplib-0.3.0/src/LDAPBindRequest.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPBindRequest.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPCompareRequest.cpp new/ldapcpplib-0.3.1/src/LDAPCompareRequest.cpp --- old/ldapcpplib-0.3.0/src/LDAPCompareRequest.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPCompareRequest.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPCompareRequest.h new/ldapcpplib-0.3.1/src/LDAPCompareRequest.h --- old/ldapcpplib-0.3.0/src/LDAPCompareRequest.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPCompareRequest.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPConnection.cpp new/ldapcpplib-0.3.1/src/LDAPConnection.cpp --- old/ldapcpplib-0.3.0/src/LDAPConnection.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPConnection.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPConnection.h new/ldapcpplib-0.3.1/src/LDAPConnection.h --- old/ldapcpplib-0.3.0/src/LDAPConnection.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPConnection.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPConstraints.cpp new/ldapcpplib-0.3.1/src/LDAPConstraints.cpp --- old/ldapcpplib-0.3.0/src/LDAPConstraints.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPConstraints.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPConstraints.h new/ldapcpplib-0.3.1/src/LDAPConstraints.h --- old/ldapcpplib-0.3.0/src/LDAPConstraints.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPConstraints.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPControl.cpp new/ldapcpplib-0.3.1/src/LDAPControl.cpp --- old/ldapcpplib-0.3.0/src/LDAPControl.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPControl.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPControl.h new/ldapcpplib-0.3.1/src/LDAPControl.h --- old/ldapcpplib-0.3.0/src/LDAPControl.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPControl.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPControlSet.cpp new/ldapcpplib-0.3.1/src/LDAPControlSet.cpp --- old/ldapcpplib-0.3.0/src/LDAPControlSet.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPControlSet.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPControlSet.h new/ldapcpplib-0.3.1/src/LDAPControlSet.h --- old/ldapcpplib-0.3.0/src/LDAPControlSet.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPControlSet.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPDeleteRequest.cpp new/ldapcpplib-0.3.1/src/LDAPDeleteRequest.cpp --- old/ldapcpplib-0.3.0/src/LDAPDeleteRequest.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPDeleteRequest.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPDeleteRequest.h new/ldapcpplib-0.3.1/src/LDAPDeleteRequest.h --- old/ldapcpplib-0.3.0/src/LDAPDeleteRequest.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPDeleteRequest.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPEntry.cpp new/ldapcpplib-0.3.1/src/LDAPEntry.cpp --- old/ldapcpplib-0.3.0/src/LDAPEntry.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPEntry.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPEntry.h new/ldapcpplib-0.3.1/src/LDAPEntry.h --- old/ldapcpplib-0.3.0/src/LDAPEntry.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPEntry.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPEntryList.cpp new/ldapcpplib-0.3.1/src/LDAPEntryList.cpp --- old/ldapcpplib-0.3.0/src/LDAPEntryList.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPEntryList.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPEntryList.h new/ldapcpplib-0.3.1/src/LDAPEntryList.h --- old/ldapcpplib-0.3.0/src/LDAPEntryList.h 2011-06-15 15:32:49.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPEntryList.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPException.cpp new/ldapcpplib-0.3.1/src/LDAPException.cpp --- old/ldapcpplib-0.3.0/src/LDAPException.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPException.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPException.h new/ldapcpplib-0.3.1/src/LDAPException.h --- old/ldapcpplib-0.3.0/src/LDAPException.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPException.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPExtRequest.cpp new/ldapcpplib-0.3.1/src/LDAPExtRequest.cpp --- old/ldapcpplib-0.3.0/src/LDAPExtRequest.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPExtRequest.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPExtRequest.h new/ldapcpplib-0.3.1/src/LDAPExtRequest.h --- old/ldapcpplib-0.3.0/src/LDAPExtRequest.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPExtRequest.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPExtResult.cpp new/ldapcpplib-0.3.1/src/LDAPExtResult.cpp --- old/ldapcpplib-0.3.0/src/LDAPExtResult.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPExtResult.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPExtResult.h new/ldapcpplib-0.3.1/src/LDAPExtResult.h --- old/ldapcpplib-0.3.0/src/LDAPExtResult.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPExtResult.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPMessage.cpp new/ldapcpplib-0.3.1/src/LDAPMessage.cpp --- old/ldapcpplib-0.3.0/src/LDAPMessage.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPMessage.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPMessage.h new/ldapcpplib-0.3.1/src/LDAPMessage.h --- old/ldapcpplib-0.3.0/src/LDAPMessage.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPMessage.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPMessageQueue.cpp new/ldapcpplib-0.3.1/src/LDAPMessageQueue.cpp --- old/ldapcpplib-0.3.0/src/LDAPMessageQueue.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPMessageQueue.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPMessageQueue.h new/ldapcpplib-0.3.1/src/LDAPMessageQueue.h --- old/ldapcpplib-0.3.0/src/LDAPMessageQueue.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPMessageQueue.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPModDNRequest.cpp new/ldapcpplib-0.3.1/src/LDAPModDNRequest.cpp --- old/ldapcpplib-0.3.0/src/LDAPModDNRequest.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPModDNRequest.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPModDNRequest.h new/ldapcpplib-0.3.1/src/LDAPModDNRequest.h --- old/ldapcpplib-0.3.0/src/LDAPModDNRequest.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPModDNRequest.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPModList.cpp new/ldapcpplib-0.3.1/src/LDAPModList.cpp --- old/ldapcpplib-0.3.0/src/LDAPModList.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPModList.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPModList.h new/ldapcpplib-0.3.1/src/LDAPModList.h --- old/ldapcpplib-0.3.0/src/LDAPModList.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPModList.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPModification.cpp new/ldapcpplib-0.3.1/src/LDAPModification.cpp --- old/ldapcpplib-0.3.0/src/LDAPModification.cpp 2011-06-15 15:32:49.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPModification.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPModification.h new/ldapcpplib-0.3.1/src/LDAPModification.h --- old/ldapcpplib-0.3.0/src/LDAPModification.h 2011-06-15 15:32:49.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPModification.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPModifyRequest.cpp new/ldapcpplib-0.3.1/src/LDAPModifyRequest.cpp --- old/ldapcpplib-0.3.0/src/LDAPModifyRequest.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPModifyRequest.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPModifyRequest.h new/ldapcpplib-0.3.1/src/LDAPModifyRequest.h --- old/ldapcpplib-0.3.0/src/LDAPModifyRequest.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPModifyRequest.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPObjClass.cpp new/ldapcpplib-0.3.1/src/LDAPObjClass.cpp --- old/ldapcpplib-0.3.0/src/LDAPObjClass.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPObjClass.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2003-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPObjClass.h new/ldapcpplib-0.3.1/src/LDAPObjClass.h --- old/ldapcpplib-0.3.0/src/LDAPObjClass.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPObjClass.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2003-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPRebind.cpp new/ldapcpplib-0.3.1/src/LDAPRebind.cpp --- old/ldapcpplib-0.3.0/src/LDAPRebind.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPRebind.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPRebind.h new/ldapcpplib-0.3.1/src/LDAPRebind.h --- old/ldapcpplib-0.3.0/src/LDAPRebind.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPRebind.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPRebindAuth.cpp new/ldapcpplib-0.3.1/src/LDAPRebindAuth.cpp --- old/ldapcpplib-0.3.0/src/LDAPRebindAuth.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPRebindAuth.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPRebindAuth.h new/ldapcpplib-0.3.1/src/LDAPRebindAuth.h --- old/ldapcpplib-0.3.0/src/LDAPRebindAuth.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPRebindAuth.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPReferenceList.cpp new/ldapcpplib-0.3.1/src/LDAPReferenceList.cpp --- old/ldapcpplib-0.3.0/src/LDAPReferenceList.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPReferenceList.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPReferenceList.h new/ldapcpplib-0.3.1/src/LDAPReferenceList.h --- old/ldapcpplib-0.3.0/src/LDAPReferenceList.h 2011-06-15 15:32:49.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPReferenceList.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPRequest.cpp new/ldapcpplib-0.3.1/src/LDAPRequest.cpp --- old/ldapcpplib-0.3.0/src/LDAPRequest.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPRequest.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPRequest.h new/ldapcpplib-0.3.1/src/LDAPRequest.h --- old/ldapcpplib-0.3.0/src/LDAPRequest.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPRequest.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPResult.cpp new/ldapcpplib-0.3.1/src/LDAPResult.cpp --- old/ldapcpplib-0.3.0/src/LDAPResult.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPResult.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPResult.h new/ldapcpplib-0.3.1/src/LDAPResult.h --- old/ldapcpplib-0.3.0/src/LDAPResult.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPResult.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPSaslBindResult.cpp new/ldapcpplib-0.3.1/src/LDAPSaslBindResult.cpp --- old/ldapcpplib-0.3.0/src/LDAPSaslBindResult.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPSaslBindResult.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2007-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2007-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPSaslBindResult.h new/ldapcpplib-0.3.1/src/LDAPSaslBindResult.h --- old/ldapcpplib-0.3.0/src/LDAPSaslBindResult.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPSaslBindResult.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2007-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2007-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPSchema.cpp new/ldapcpplib-0.3.1/src/LDAPSchema.cpp --- old/ldapcpplib-0.3.0/src/LDAPSchema.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPSchema.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2003-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPSchema.h new/ldapcpplib-0.3.1/src/LDAPSchema.h --- old/ldapcpplib-0.3.0/src/LDAPSchema.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPSchema.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2003-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPSearchReference.cpp new/ldapcpplib-0.3.1/src/LDAPSearchReference.cpp --- old/ldapcpplib-0.3.0/src/LDAPSearchReference.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPSearchReference.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPSearchReference.h new/ldapcpplib-0.3.1/src/LDAPSearchReference.h --- old/ldapcpplib-0.3.0/src/LDAPSearchReference.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPSearchReference.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPSearchRequest.cpp new/ldapcpplib-0.3.1/src/LDAPSearchRequest.cpp --- old/ldapcpplib-0.3.0/src/LDAPSearchRequest.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPSearchRequest.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPSearchRequest.h new/ldapcpplib-0.3.1/src/LDAPSearchRequest.h --- old/ldapcpplib-0.3.0/src/LDAPSearchRequest.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPSearchRequest.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPSearchResult.cpp new/ldapcpplib-0.3.1/src/LDAPSearchResult.cpp --- old/ldapcpplib-0.3.0/src/LDAPSearchResult.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPSearchResult.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPSearchResult.h new/ldapcpplib-0.3.1/src/LDAPSearchResult.h --- old/ldapcpplib-0.3.0/src/LDAPSearchResult.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPSearchResult.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPSearchResults.cpp new/ldapcpplib-0.3.1/src/LDAPSearchResults.cpp --- old/ldapcpplib-0.3.0/src/LDAPSearchResults.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPSearchResults.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPSearchResults.h new/ldapcpplib-0.3.1/src/LDAPSearchResults.h --- old/ldapcpplib-0.3.0/src/LDAPSearchResults.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPSearchResults.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPUrl.cpp new/ldapcpplib-0.3.1/src/LDAPUrl.cpp --- old/ldapcpplib-0.3.0/src/LDAPUrl.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPUrl.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPUrl.h new/ldapcpplib-0.3.1/src/LDAPUrl.h --- old/ldapcpplib-0.3.0/src/LDAPUrl.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPUrl.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPUrlList.cpp new/ldapcpplib-0.3.1/src/LDAPUrlList.cpp --- old/ldapcpplib-0.3.0/src/LDAPUrlList.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPUrlList.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LDAPUrlList.h new/ldapcpplib-0.3.1/src/LDAPUrlList.h --- old/ldapcpplib-0.3.0/src/LDAPUrlList.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LDAPUrlList.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LdifReader.cpp new/ldapcpplib-0.3.1/src/LdifReader.cpp --- old/ldapcpplib-0.3.0/src/LdifReader.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LdifReader.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2008-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2008-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LdifReader.h new/ldapcpplib-0.3.1/src/LdifReader.h --- old/ldapcpplib-0.3.0/src/LdifReader.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LdifReader.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2008-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2008-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LdifWriter.cpp new/ldapcpplib-0.3.1/src/LdifWriter.cpp --- old/ldapcpplib-0.3.0/src/LdifWriter.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LdifWriter.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2008-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2008-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/LdifWriter.h new/ldapcpplib-0.3.1/src/LdifWriter.h --- old/ldapcpplib-0.3.0/src/LdifWriter.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/LdifWriter.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2008-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2008-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/Makefile.am new/ldapcpplib-0.3.1/src/Makefile.am --- old/ldapcpplib-0.3.0/src/Makefile.am 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/Makefile.am 2013-01-31 14:40:08.000000000 +0100 @@ -1,7 +1,7 @@ # $OpenLDAP$ ### -# Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. +# Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT file ## diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/SaslInteraction.cpp new/ldapcpplib-0.3.1/src/SaslInteraction.cpp --- old/ldapcpplib-0.3.0/src/SaslInteraction.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/SaslInteraction.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2007-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2007-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/SaslInteraction.h new/ldapcpplib-0.3.1/src/SaslInteraction.h --- old/ldapcpplib-0.3.0/src/SaslInteraction.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/SaslInteraction.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2007-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2007-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/SaslInteractionHandler.cpp new/ldapcpplib-0.3.1/src/SaslInteractionHandler.cpp --- old/ldapcpplib-0.3.0/src/SaslInteractionHandler.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/SaslInteractionHandler.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2007-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2007-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ @@ -11,6 +11,7 @@ #ifdef HAVE_TERMIOS_H #include <termios.h> +#include <unistd.h> #include <cstdio> #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/SaslInteractionHandler.h new/ldapcpplib-0.3.1/src/SaslInteractionHandler.h --- old/ldapcpplib-0.3.0/src/SaslInteractionHandler.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/SaslInteractionHandler.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2007-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2007-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/StringList.cpp new/ldapcpplib-0.3.1/src/StringList.cpp --- old/ldapcpplib-0.3.0/src/StringList.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/StringList.cpp 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/StringList.h new/ldapcpplib-0.3.1/src/StringList.h --- old/ldapcpplib-0.3.0/src/StringList.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/StringList.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/TlsOptions.cpp new/ldapcpplib-0.3.1/src/TlsOptions.cpp --- old/ldapcpplib-0.3.0/src/TlsOptions.cpp 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/TlsOptions.cpp 2013-01-31 14:43:27.000000000 +0100 @@ -1,9 +1,16 @@ // $OpenLDAP$ /* - * Copyright 2010-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2010-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ +#include <fstream> +#include <sstream> +#include <sys/types.h> +#include <sys/stat.h> +#include <errno.h> +#include <unistd.h> +#include <cstring> #include "TlsOptions.h" #include "LDAPException.h" @@ -54,6 +61,41 @@ void TlsOptions::setOption( tls_option opt, const std::string& value ) const { checkOpt(opt, STRING); + switch(opt) { + case TlsOptions::CACERTFILE : + case TlsOptions::CERTFILE : + case TlsOptions::KEYFILE : + { + // check if the supplied file is actually readable + std::ifstream ifile(value.c_str()); + if ( !ifile ) { + throw( LDAPException( LDAP_LOCAL_ERROR, "Unable to open the supplied file for reading" ) ); + } + } + break; + case TlsOptions::CACERTDIR : + { + struct stat st; + std::ostringstream msg; + bool fail=false; + int err = stat(value.c_str(),&st); + if ( err ) { + msg << strerror(errno); + fail = true; + } else { + if ( !S_ISDIR(st.st_mode) ){ + msg << "The supplied path is not a directory."; + fail = true; + } + } + if ( fail ) { + std::ostringstream errstr; + errstr << "Error while setting Certificate Directory (" << value << "): " << msg.str(); + throw( LDAPException( LDAP_LOCAL_ERROR, errstr.str() ) ); + } + } + break; + } this->setOption( opt, value.empty() ? NULL : (void*) value.c_str() ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/TlsOptions.h new/ldapcpplib-0.3.1/src/TlsOptions.h --- old/ldapcpplib-0.3.0/src/TlsOptions.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/TlsOptions.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2010-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2010-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ #ifndef TLS_OPTIONS_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/ac/time.h new/ldapcpplib-0.3.1/src/ac/time.h --- old/ldapcpplib-0.3.0/src/ac/time.h 2011-05-26 17:01:16.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/ac/time.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,7 +1,7 @@ /* Generic time.h */ /* $OpenLDAP$ */ /* - * Copyright 1998-2011 The OpenLDAP Foundation, Redwood City, California, USA + * Copyright 1998-2013 The OpenLDAP Foundation, Redwood City, California, USA * All rights reserved. * * Redistribution and use in source and binary forms are permitted only diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/config.h.in new/ldapcpplib-0.3.1/src/config.h.in --- old/ldapcpplib-0.3.0/src/config.h.in 2011-06-15 12:08:48.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/config.h.in 2013-01-31 14:44:44.000000000 +0100 @@ -54,6 +54,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/src/debug.h new/ldapcpplib-0.3.1/src/debug.h --- old/ldapcpplib-0.3.0/src/debug.h 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/src/debug.h 2013-01-31 14:40:08.000000000 +0100 @@ -1,6 +1,6 @@ // $OpenLDAP$ /* - * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2013 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/version.sh new/ldapcpplib-0.3.1/version.sh --- old/ldapcpplib-0.3.0/version.sh 2011-05-30 11:04:58.000000000 +0200 +++ new/ldapcpplib-0.3.1/version.sh 2013-01-31 14:40:08.000000000 +0100 @@ -1,7 +1,7 @@ #! /bin/sh # $OpenLDAP$ # -# Copyright 2008-2011 The OpenLDAP Foundation. All Rights Reserved. +# Copyright 2008-2013 The OpenLDAP Foundation. All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT file DIR=`dirname $0` . $DIR/version.var diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ldapcpplib-0.3.0/version.var new/ldapcpplib-0.3.1/version.var --- old/ldapcpplib-0.3.0/version.var 2011-06-15 15:37:59.000000000 +0200 +++ new/ldapcpplib-0.3.1/version.var 2013-01-31 14:43:54.000000000 +0100 @@ -1,13 +1,13 @@ #! /bin/sh # $OpenLDAP$ # -# Copyright 2008-2011 The OpenLDAP Foundation. All Rights Reserved. +# Copyright 2008-2013 The OpenLDAP Foundation. All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT file ol_cpp_api_rel_major=0 ol_cpp_api_rel_minor=3 -ol_cpp_api_rel_patch=0 +ol_cpp_api_rel_patch=1 ol_cpp_api_current=4 -ol_cpp_api_revision=0 +ol_cpp_api_revision=1 ol_cpp_api_age=3 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdelibs4 for openSUSE:12.3
by root＠hilbert.suse.de 01 Feb '13

01 Feb '13

Hello community, here is the log from the commit of package kdelibs4 for openSUSE:12.3 checked in at 2013-02-01 09:43:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/kdelibs4 (Old) and /work/SRC/openSUSE:12.3/.kdelibs4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdelibs4", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:12.3/kdelibs4/kdelibs4.changes 2013-01-31 01:22:02.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.kdelibs4.new/kdelibs4.changes 2013-02-01 09:43:23.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Jan 29 12:17:59 UTC 2013 - lnt-sysadmin(a)lists.lrz.de + +- Add kio_revert_slow_filesystems.patch to work around bnc#776141. + This is a workaround, reverting to KDE 4.7.3 behavior. + A fix should come from upstream (kde#288824). + +------------------------------------------------------------------- New: ---- kio_revert_slow_filesystems.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.GxRMOj/_old 2013-02-01 09:43:24.000000000 +0100 +++ /var/tmp/diff_new_pack.GxRMOj/_new 2013-02-01 09:43:24.000000000 +0100 @@ -113,6 +113,7 @@ Patch26: fix_kdeclarative_install_location.diff # PATCH-FIX-OPENSUSE make-plasma-widgets-respect-plasma-button-colors.patch hrvoje.senjan(a)gmail.com -- Fixes Plasma::Checkox, so it uses plasma theme color (example - nm plasmoid) Patch27: make-plasma-widgets-respect-plasma-button-colors.patch +Patch28: kio_revert_slow_filesystems.patch PreReq: permissions Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`) Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`) @@ -182,6 +183,7 @@ %patch24 %patch26 -p1 %patch27 -p1 +%patch28 -p1 # # define KDE version exactly ++++++ kio_revert_slow_filesystems.patch ++++++ --- a/kio/kio/kfileitem.cpp 2012-12-17 15:14:16.000000000 +0100 +++ b/kio/kio/kfileitem.cpp 2013-01-29 13:14:49.699629861 +0100 @@ -750,8 +750,7 @@ bool KFileItemPrivate::isSlow() const if (m_slow == SlowUnknown) { const QString path = localPath(); if (!path.isEmpty()) { - const KFileSystemType::Type fsType = KFileSystemType::fileSystemType(path); - m_slow = (fsType == KFileSystemType::Nfs || fsType == KFileSystemType::Smb) ? Slow : Fast; + m_slow = Fast; } else { m_slow = Slow; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0