Skip to content

Commit

Permalink
Merge pull request #2481 from htcondor/V23_8-HTCONDOR-2389-remove-dea…
Browse files Browse the repository at this point in the history
…d-string-lists

HTCONDOR-2389 Remove unused code
  • Loading branch information
GregThain committed May 17, 2024
2 parents 42d9658 + 3ea4390 commit 8bc1ff9
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 672 deletions.
7 changes: 3 additions & 4 deletions src/condor_kbdd/README
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,9 @@ running. If it fails, the condor_kbdd will be ineffectual. To get around
this problem, it is preferable to run the daemon as user root. The daemon
will then attempt to figure out who is logged in and masquered as this person
in order to open the display. This is accomplished by cycling through
utmp entries and optional XAUTHORITY_USERS config param and setting the
XAUTHORITY environment variable. See the methods XInterface::NextEntry(),
XInterface::TryUser(), and XInterface::Connect() in XInterface.cpp for more
information.
utmp entries setting the XAUTHORITY environment variable. See the
methods XInterface::NextEntry(), XInterface::TryUser(), and XInterface::Connect()
in XInterface.cpp for more information.

Once connected to the display, we walk the tree of windows, notifing
X that we want to receive KeyPress events that are bound for this window.
Expand Down
13 changes: 0 additions & 13 deletions src/condor_kbdd/XInterface.unix.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -146,15 +146,6 @@ XInterface::XInterface(int id)

g_connected = false;

tmp = param( "XAUTHORITY_USERS" );
if(tmp != NULL) {
_xauth_users = new StringList();
_xauth_users->initializeFromString( tmp );
free( tmp );
} else {
_xauth_users = NULL;
}

_display_name = param( "X_CONSOLE_DISPLAY" );

/* If there's no specified display name, we'll use the default... */
Expand All @@ -167,10 +158,6 @@ XInterface::XInterface(int id)

XInterface::~XInterface()
{
if(_xauth_users != NULL) {
delete _xauth_users;
}

if(_display_name != NULL) {
free(_display_name);
}
Expand Down
2 changes: 0 additions & 2 deletions src/condor_kbdd/XInterface.unix.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,6 @@ class XInterface
bool needsCheck;
bool hasXss;

StringList *_xauth_users;

// The following are for getting rid of the obnoxious utmp stuff.
FILE * utmp_fp;
std::vector<char *> *logged_on_users;
Expand Down

0 comments on commit 8bc1ff9

Please sign in to comment.