← 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 libvmtools/vmtools.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:
libvmtools/vmtools.c
33
33
#endif
34
34
 
35
35
#include "vmware.h"
 
36
#include "vm_atomic.h"
36
37
#include "wiper.h"
37
38
#include "vmtoolsInt.h"
38
39
#include "vmware/tools/utils.h"
83
84
VMToolsDllInit(void *lib)
84
85
{
85
86
   Bool success;
86
 
#if defined(_WIN32)
87
87
   WiperInitData wiperData;
 
88
   Atomic_Init();
 
89
#if defined(_WIN32)
88
90
   wiperData.resourceModule = lib;
89
91
   success = (NetUtil_LoadIpHlpApiDll() == ERROR_SUCCESS);
90
92
   ASSERT(success);
91
93
   success = Wiper_Init(&wiperData);
92
94
   ASSERT(success);
93
95
#else
 
96
   (void) wiperData;
94
97
   success = Wiper_Init(NULL);
95
98
   ASSERT(success);
96
99
#endif