← 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 services/vmtoolsd/toolsRpc.c

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Baumann
  • Date: 2009-12-06 07:45:05 UTC
  • mfrom: (1.1.8 upstream) (2.4.10 sid)
  • Revision ID: james.westby@ubuntu.com-20091206074505-43rp7oejjgp0y2re
Tags: 2009.11.16-210370-1
http://bugs.debian.org/545222
http://bugs.debian.org/549044
http://bugs.debian.org/551626
* Merging upstream version 2009.11.16-210370.
* Moving vmusr plugins from open-vm-tools to open-vm-toolbox (Closes:
  #539282, #557215).
* Correcting plugin location (Closes: #545222, #549044).
* Dropping la files (Closes: #551626).
* Adding open-vm-toolbox lintian overrides.
* Removing test plugin.
* Removing unused plugin symlinks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
services/vmtoolsd/toolsRpc.c
32
32
#include "str.h"
33
33
#include "strutil.h"
34
34
#include "toolsCoreInt.h"
35
 
#include "vmtools.h"
36
35
#include "vm_tools_version.h"
 
36
#include "vmware/tools/utils.h"
37
37
 
38
38
 
39
39
/**
96
96
 * @return TRUE.
97
97
 */
98
98
 
99
 
static Bool
 
99
static gboolean
100
100
ToolsCoreRpcCapReg(RpcInData *data)
101
101
{
102
102
   char *confPath = GuestApp_GetConfPath();
163
163
 *
164
164
 * @param[in]  data     The RPC data.
165
165
 *
166
 
 * @return TRUE.
 
166
 * @return Whether the option was successfully processed.
167
167
 */
168
168
 
169
 
static Bool
 
169
static gboolean
170
170
ToolsCoreRpcSetOption(RpcInData *data)
171
171
{
172
172
 
204
204
   } else {
205
205
      RPCIN_SETRETVALS(data, "Unknown or invalid option", retVal);
206
206
   }
207
 
   return (Bool) retVal;
 
207
   return retVal;
208
208
}
209
209
 
210
210