~ubuntu-branches/ubuntu/precise/likewise-open/precise

Viewing changes to debian/patches/abstractions_cleanup.diff

Committer: Bazaar Package Importer
Author(s): Thierry Carrez
Date: 2009-04-08 17:32:39 UTC
Revision ID: james.westby@ubuntu.com-20090408173239-2dfaasu4857yevsh

Tags: 4.1.2982-0ubuntu2

* debian/patches/ask-for-reboot.diff: Ask for a reboot after domain join
  since it is necessary before domain graphical logins (LP: #352934)
* Removed debian/patches/graceful_dbus_restart.diff since it is not
  sufficient and we now ask for a reboot
* debian/patches/abstractions-cleanup.diff: Use more precision when removing
  likewise mods from appamor.d/abstractions/nameservice file, to avoid
  very destructive cleanup (LP: #354498)
* Added debian/patches/autoconf-ftbfs-fix.diff to fix FTBFS

files added:
debian/patches/abstractions_cleanup.diff

debian/patches/ask-for-reboot.diff

debian/patches/autoconf-ftbfs-fix.diff

files modified:
debian/changelog

debian/patches/series

Show diffs side-by-side

added added

removed removed

debian/patches/abstractions_cleanup.diff

Index: likewise-open-4.1.2982/domainjoin/libdomainjoin/src/djnsswitch.c

===================================================================

--- likewise-open-4.1.2982.orig/domainjoin/libdomainjoin/src/djnsswitch.c 2009-04-08 16:56:17.000000000 +0200

+++ likewise-open-4.1.2982/domainjoin/libdomainjoin/src/djnsswitch.c 2009-04-08 16:57:08.000000000 +0200

@@ -852,7 +852,7 @@

LW_CLEANUP_CTERR(exc, CTSafeReplaceFile(APPARMOR_NSSWITCH, APPARMOR_NSSWITCH ".new"));

}

else

- LW_CLEANUP_CTERR(exc, CTRunSedOnFile(APPARMOR_NSSWITCH, APPARMOR_NSSWITCH, FALSE, "/^[ \t]*#[ \t]*likewise[ \t]*$/,/^[ \t]*#[ \t]*end likewise[ \t]*$/d"));

+ LW_CLEANUP_CTERR(exc, CTRunSedOnFile(APPARMOR_NSSWITCH, APPARMOR_NSSWITCH, FALSE, "/^#[ \t]*likewise[ \t]*$/,/^#[ \t]*end likewise[ \t]*$/d"));

ceError = CTFindFileInPath("rcapparmor", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", &restartPath);

Older »