From: Yiwen Zhang <yizhang@vmware.com>
Date: Wed, 24 Sep 2008 07:05:50 +0000 (+0800)
Subject: Fix according to Marcelo's comments Change parameter name of GuestApp_ControlRecord... 
X-Git-Tag: 2008.10.10-123053~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f6fbd8d6ef4ba613b915b367c60fd45c48b69f75;p=thirdparty%2Fopen-vm-tools.git

Fix according to Marcelo's comments Change parameter name of GuestApp_ControlRecord Remove root protection for record Fix mnemonic conflict in record tab
---

diff --git a/open-vm-tools/lib/guestApp/guestApp.c b/open-vm-tools/lib/guestApp/guestApp.c
index 1a1d44a75..2cd2afdce 100644
--- a/open-vm-tools/lib/guestApp/guestApp.c
+++ b/open-vm-tools/lib/guestApp/guestApp.c
@@ -1853,8 +1853,8 @@ GuestApp_RpcSendOneCPName(char const *cmd,  // IN: RPCI command
  *
  * GuestApp_ControlRecord --
  *
- *    Start or stop recording process, flagged by mode. 
- *    Mode definition is in statelogger_backdoor_def.h.
+ *    Start or stop recording process, flagged by command. 
+ *    Command definition is in statelogger_backdoor_def.h.
  *
  * Results:
  *    TRUE on success and FALSE on failure.
@@ -1866,10 +1866,10 @@ GuestApp_RpcSendOneCPName(char const *cmd,  // IN: RPCI command
  */
 
 Bool
-GuestApp_ControlRecord(int32 mode) // IN: flag of starting or stopping recording
+GuestApp_ControlRecord(int32 command) // IN: flag of starting or stopping recording
 {
    Backdoor_proto bp;
-   bp.in.size = mode;
+   bp.in.size = command;
    bp.in.cx.halfs.low = BDOOR_CMD_STATELOGGER;
    Backdoor(&bp);
    return (bp.out.ax.halfs.low == 1);
diff --git a/open-vm-tools/lib/include/guestApp.h b/open-vm-tools/lib/include/guestApp.h
index 0e4e3dee1..06ee100bc 100644
--- a/open-vm-tools/lib/include/guestApp.h
+++ b/open-vm-tools/lib/include/guestApp.h
@@ -197,7 +197,7 @@ Bool GuestApp_FindProgram(const char *program);
 #endif
 
 Bool
-GuestApp_ControlRecord(int32 mode); //  IN
+GuestApp_ControlRecord(int32 command); //  IN
 #ifdef __cplusplus
 }
 #endif
diff --git a/open-vm-tools/toolbox/toolbox-cmd.c b/open-vm-tools/toolbox/toolbox-cmd.c
index de2255664..30e621d36 100644
--- a/open-vm-tools/toolbox/toolbox-cmd.c
+++ b/open-vm-tools/toolbox/toolbox-cmd.c
@@ -100,7 +100,7 @@ static CmdTable commands[] = {
    { "disk", DiskCommand, TRUE, DiskHelp},
    { "stat", StatCommand, FALSE, StatHelp},
    { "device", DeviceCommand, FALSE, DeviceHelp},
-   { "record", RecordCommand, TRUE, RecordHelp},
+   { "record", RecordCommand, FALSE, RecordHelp},
    { "help", HelpCommand, FALSE, ToolboxCmdHelp},
    { NULL, } };
 
diff --git a/open-vm-tools/toolbox/toolboxRecord.c b/open-vm-tools/toolbox/toolboxRecord.c
index 4d8ffbb55..7fbfc2b19 100644
--- a/open-vm-tools/toolbox/toolboxRecord.c
+++ b/open-vm-tools/toolbox/toolboxRecord.c
@@ -58,42 +58,34 @@ Record_Create(GtkWidget* mainWnd)
    recordtab = gtk_vbox_new(FALSE, 50);
    gtk_widget_show(recordtab);
    gtk_container_set_border_width(GTK_CONTAINER(recordtab), 10);
-   /* Only root can do recording. */
-   if (geteuid() != 0) {
-      Debug("User not allowed to do recording");
-      label =
-         gtk_label_new("This option is enabled only if you run VMware Tools as root.");
-      gtk_widget_show(label);
-      gtk_box_pack_start(GTK_BOX(recordtab), label, FALSE, FALSE, 0);
-   } else {
-      hbox[0] = gtk_hbox_new(FALSE, 10);
-      hbox[1] = gtk_hbox_new(FALSE, 10);
-      label = 
-         gtk_label_new("Press start or stop button to control recording.");
-      gtk_widget_show(hbox[0]);
-      gtk_widget_show(hbox[1]);
-      gtk_widget_show(label);
-      gtk_box_pack_start(GTK_BOX(recordtab), hbox[0], FALSE, FALSE, 0);
-      gtk_box_pack_start(GTK_BOX(hbox[0]), label, TRUE, TRUE, 0);
-      gtk_box_pack_start(GTK_BOX(recordtab), hbox[1], FALSE, FALSE, 0);
+   hbox[0] = gtk_hbox_new(FALSE, 10);
+   hbox[1] = gtk_hbox_new(FALSE, 10);
+   label = 
+      gtk_label_new("Press start or stop button to control recording.");
+   gtk_widget_show(hbox[0]);
+   gtk_widget_show(hbox[1]);
+   gtk_widget_show(label);
+   gtk_box_pack_start(GTK_BOX(recordtab), hbox[0], FALSE, FALSE, 0);
+   gtk_box_pack_start(GTK_BOX(hbox[0]), label, TRUE, TRUE, 0);
+   gtk_box_pack_start(GTK_BOX(recordtab), hbox[1], FALSE, FALSE, 0);
 #ifdef GTK2
-      startbtn = gtk_button_new_with_mnemonic("Sta_rt");
-      stopbtn = gtk_button_new_with_mnemonic("S_top");
+   startbtn = gtk_button_new_with_mnemonic("_Start");
+   stopbtn = gtk_button_new_with_mnemonic("S_top");
 #else
-      startbtn = gtk_button_new_with_label("Start");
-      stopbtn = gtk_button_new_with_label("Stop");
+   startbtn = gtk_button_new_with_label("Start");
+   stopbtn = gtk_button_new_with_label("Stop");
 #endif
-      gtk_widget_show(startbtn);
-      gtk_box_pack_start(GTK_BOX(hbox[1]), startbtn, FALSE, FALSE, 10);
-      gtk_widget_set_usize(startbtn, 70, 25);
-      gtk_signal_connect(GTK_OBJECT(startbtn), "clicked",
-                         GTK_SIGNAL_FUNC(RecordOnStart), NULL);
-      gtk_widget_show(stopbtn);
-      gtk_box_pack_end(GTK_BOX(hbox[1]), stopbtn, FALSE, FALSE, 10);
-      gtk_widget_set_usize(stopbtn, 70, 6);
-      gtk_signal_connect(GTK_OBJECT(stopbtn), "clicked",
-                         GTK_SIGNAL_FUNC(RecordOnStop), NULL);
-   }
+   gtk_widget_show(startbtn);
+   gtk_box_pack_start(GTK_BOX(hbox[1]), startbtn, FALSE, FALSE, 10);
+   gtk_widget_set_usize(startbtn, 70, 25);
+   gtk_signal_connect(GTK_OBJECT(startbtn), "clicked",
+                      GTK_SIGNAL_FUNC(RecordOnStart), NULL);
+   gtk_widget_show(stopbtn);
+   gtk_box_pack_end(GTK_BOX(hbox[1]), stopbtn, FALSE, FALSE, 10);
+   gtk_widget_set_usize(stopbtn, 70, 6);
+   gtk_signal_connect(GTK_OBJECT(stopbtn), "clicked",
+                      GTK_SIGNAL_FUNC(RecordOnStop), NULL);
+   
    return recordtab;
 }