← 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/misc/posixDlopen.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/misc/posixDlopen.c
21
21
#include <stdlib.h>
22
22
#include <errno.h>
23
23
 
24
 
#if defined(__APPLE__) || defined(linux)
 
24
#if defined(__APPLE__) || defined(linux) || defined(sun)
25
25
#include <dlfcn.h>
26
26
#endif
27
27
 
29
29
#include "posixInt.h"
30
30
 
31
31
 
32
 
#if defined(__APPLE__) || defined(linux)
 
32
#if defined(__APPLE__) || defined(linux) || defined(sun)
33
33
/*
34
34
 *----------------------------------------------------------------------
35
35
 *
36
 
 * FileIO_Dlopen --
 
36
 * Posix_Dlopen --
37
37
 *
38
38
 *      POSIX dlopen()
39
39
 *