← Back to branch summary

~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-precise.sid-merge1

« back to all changes in this revision

Viewing changes to lib/backdoor/backdoor.c

  • Committer: Bazaar Package Importer
  • Author(s): Serge Hallyn
  • Date: 2011-03-31 14:20:05 UTC
  • mfrom: (1.4.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20110331142005-3n9red91p7ogkweo
Tags: 2011.03.28-387002-0ubuntu1
https://launchpad.net/bugs/727342
https://launchpad.net/bugs/332323
https://launchpad.net/bugs/332323
* Merge latest upstream git tag.  This has the unlocked_ioctl change
  needed to fix dkms build failures (LP: #727342)
* Changes in debian/rules:
  - work around a bug in toolbox/Makefile, where install-exec-hook is
    not happening.  This needs to get fixed the right way.
  - don't install 'vmware-user' which seems to no longer exist
  - move /etc/xdg into open-vm-toolbox (which should be done using .install)
* debian/open-vm-tools.init: add 'modprobe [-r] vmblock'. (LP: #332323)
* debian/rules and debian/open-vm-toolbox.lintian-overrides:
  - Make vmware-user-suid-wrapper suid-root (LP: #332323)

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/backdoor/backdoor.c
45
45
extern "C" {
46
46
#endif
47
47
 
48
 
#if defined(__KERNEL__) || defined(_KERNEL)
49
 
#else
50
 
#   include "debug.h"
51
 
#endif
52
 
 
53
48
#include "backdoor_def.h"
54
49
#include "backdoor.h"
55
50
#include "backdoorInt.h"
56
51
 
57
52
#if defined(BACKDOOR_DEBUG) && defined(USERLEVEL)
 
53
#if defined(__KERNEL__) || defined(_KERNEL)
 
54
#else
 
55
#   include "debug.h"
 
56
#endif
58
57
#   include <stdio.h>
59
58
#   define BACKDOOR_LOG(args) Debug args
60
59
#   define BACKDOOR_LOG_PROTO_STRUCT(x) BackdoorPrintProtoStruct((x))