|
|
1eedae9 |
diff --git a/src/condor_c-gahp/schedd_client.cpp b/src/condor_c-gahp/schedd_client.cpp
|
|
|
1eedae9 |
index c50fddf..7230793 100644
|
|
|
1eedae9 |
--- a/src/condor_c-gahp/schedd_client.cpp
|
|
|
1eedae9 |
+++ b/src/condor_c-gahp/schedd_client.cpp
|
|
|
1eedae9 |
@@ -564,7 +564,7 @@ doContactSchedd()
|
|
|
1eedae9 |
// Try connecting to the queue
|
|
|
1eedae9 |
Qmgr_connection * qmgr_connection;
|
|
|
1eedae9 |
|
|
|
1eedae9 |
- if ((qmgr_connection = ConnectQ(dc_schedd.addr(), QMGMT_TIMEOUT, false, NULL, NULL, dc_schedd.version() )) == NULL) {
|
|
|
1eedae9 |
+ if ((qmgr_connection = ConnectQ(dc_schedd, QMGMT_TIMEOUT, false, NULL, NULL, dc_schedd.version() )) == NULL) {
|
|
|
1eedae9 |
error = TRUE;
|
|
|
1eedae9 |
formatstr( error_msg, "Error connecting to schedd %s", ScheddAddr );
|
|
|
1eedae9 |
dprintf( D_ALWAYS, "%s\n", error_msg.c_str() );
|
|
|
1eedae9 |
diff --git a/src/condor_contrib/triggerd/src/Triggerd.cpp b/src/condor_contrib/triggerd/src/Triggerd.cpp
|
|
|
1eedae9 |
index 80ee2ff..6470c58 100644
|
|
|
1eedae9 |
--- a/src/condor_contrib/triggerd/src/Triggerd.cpp
|
|
|
1eedae9 |
+++ b/src/condor_contrib/triggerd/src/Triggerd.cpp
|
|
|
1eedae9 |
@@ -819,7 +819,7 @@ Triggerd::PerformQueries()
|
|
|
1eedae9 |
// Perform the query and check the result
|
|
|
1eedae9 |
if (NULL != query_collector)
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
- status = query->fetchAds(result, query_collector->addr(), &errstack);
|
|
|
1eedae9 |
+ status = query->fetchAds(result, *query_collector, &errstack);
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
else
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
diff --git a/src/condor_credd/credd.cpp b/src/condor_credd/credd.cpp
|
|
|
1eedae9 |
index 7f0973f..c3b7b1f 100644
|
|
|
1eedae9 |
--- a/src/condor_credd/credd.cpp
|
|
|
1eedae9 |
+++ b/src/condor_credd/credd.cpp
|
|
|
1eedae9 |
@@ -80,7 +80,7 @@ store_cred_handler(Service * /*service*/, int /*i*/, Stream *stream) {
|
|
|
1eedae9 |
|
|
|
1eedae9 |
if (!socket->triedAuthentication()) {
|
|
|
1eedae9 |
CondorError errstack;
|
|
|
1eedae9 |
- if( ! SecMan::authenticate_sock(socket, WRITE, &errstack) ) {
|
|
|
1eedae9 |
+ if( ! SecMan::authenticate_sock(socket, WRITE, &errstack, NULL) ) {
|
|
|
1eedae9 |
dprintf (D_ALWAYS, "Unable to authenticate, qutting\n");
|
|
|
1eedae9 |
goto EXIT;
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
@@ -236,7 +236,7 @@ get_cred_handler(Service * /*service*/, int /*i*/, Stream *stream) {
|
|
|
1eedae9 |
// Authenticate
|
|
|
1eedae9 |
if (!socket->triedAuthentication()) {
|
|
|
1eedae9 |
CondorError errstack;
|
|
|
1eedae9 |
- if( ! SecMan::authenticate_sock(socket, READ, &errstack) ) {
|
|
|
1eedae9 |
+ if( ! SecMan::authenticate_sock(socket, READ, &errstack, NULL) ) {
|
|
|
1eedae9 |
dprintf (D_ALWAYS, "Unable to authenticate, qutting\n");
|
|
|
1eedae9 |
goto EXIT;
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
@@ -351,7 +351,7 @@ query_cred_handler(Service * /*service*/, int /*i*/, Stream *stream) {
|
|
|
1eedae9 |
|
|
|
1eedae9 |
if (!socket->triedAuthentication()) {
|
|
|
1eedae9 |
CondorError errstack;
|
|
|
1eedae9 |
- if( ! SecMan::authenticate_sock(socket, READ, &errstack) ) {
|
|
|
1eedae9 |
+ if( ! SecMan::authenticate_sock(socket, READ, &errstack, NULL) ) {
|
|
|
1eedae9 |
dprintf (D_ALWAYS, "Unable to authenticate, qutting\n");
|
|
|
1eedae9 |
goto EXIT;
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
@@ -426,7 +426,7 @@ rm_cred_handler(Service * /*service*/, int /*i*/, Stream *stream) {
|
|
|
1eedae9 |
|
|
|
1eedae9 |
if (!socket->triedAuthentication()) {
|
|
|
1eedae9 |
CondorError errstack;
|
|
|
1eedae9 |
- if( ! SecMan::authenticate_sock(socket, READ, &errstack) ) {
|
|
|
1eedae9 |
+ if( ! SecMan::authenticate_sock(socket, READ, &errstack, NULL) ) {
|
|
|
1eedae9 |
dprintf (D_ALWAYS, "Unable to authenticate, qutting\n");
|
|
|
1eedae9 |
goto EXIT;
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
diff --git a/src/condor_daemon_client/daemon.cpp b/src/condor_daemon_client/daemon.cpp
|
|
|
1eedae9 |
index 93908d9..55fed68 100644
|
|
|
1eedae9 |
--- a/src/condor_daemon_client/daemon.cpp
|
|
|
1eedae9 |
+++ b/src/condor_daemon_client/daemon.cpp
|
|
|
1eedae9 |
@@ -162,7 +162,7 @@ Daemon::Daemon( const ClassAd* tAd, daemon_t tType, const char* tPool )
|
|
|
1eedae9 |
|
|
|
1eedae9 |
getInfoFromAd( tAd );
|
|
|
1eedae9 |
|
|
|
1eedae9 |
- dprintf( D_HOSTNAME, "New Daemon obj (%s) name: \"%s\", pool: "
|
|
|
1eedae9 |
+ dprintf( D_HOSTNAME, "From ClassAd, new Daemon obj (%s) name: \"%s\", pool: "
|
|
|
1eedae9 |
"\"%s\", addr: \"%s\"\n", daemonString(_type),
|
|
|
1eedae9 |
_name ? _name : "NULL", _pool ? _pool : "NULL",
|
|
|
1eedae9 |
_addr ? _addr : "NULL" );
|
|
|
1eedae9 |
@@ -533,7 +533,7 @@ Daemon::connectSock(Sock *sock, int sec, CondorError* errstack, bool non_blockin
|
|
|
1eedae9 |
|
|
|
1eedae9 |
|
|
|
1eedae9 |
StartCommandResult
|
|
|
1eedae9 |
-Daemon::startCommand( int cmd, Sock* sock, int timeout, CondorError *errstack, StartCommandCallbackType *callback_fn, void *misc_data, bool nonblocking, char const *cmd_description, char *, SecMan *sec_man, bool raw_protocol, char const *sec_session_id )
|
|
|
1eedae9 |
+Daemon::startCommand( int cmd, Sock* sock, int timeout, CondorError *errstack, StartCommandCallbackType *callback_fn, void *misc_data, bool nonblocking, char const *cmd_description, char *, SecMan *sec_man, bool raw_protocol, char const *sec_session_id, const char * hostname )
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
// This function may be either blocking or non-blocking, depending
|
|
|
1eedae9 |
// on the flag that is passed in. All versions of Daemon::startCommand()
|
|
|
1eedae9 |
@@ -555,7 +555,7 @@ Daemon::startCommand( int cmd, Sock* sock, int timeout, CondorError *errstack, S
|
|
|
1eedae9 |
sock->timeout( timeout );
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
- start_command_result = sec_man->startCommand(cmd, sock, raw_protocol, errstack, 0, callback_fn, misc_data, nonblocking, cmd_description, sec_session_id);
|
|
|
1eedae9 |
+ start_command_result = sec_man->startCommand(cmd, sock, raw_protocol, errstack, 0, callback_fn, misc_data, nonblocking, cmd_description, sec_session_id, hostname);
|
|
|
1eedae9 |
|
|
|
1eedae9 |
if(callback_fn) {
|
|
|
1eedae9 |
// SecMan::startCommand() called the callback function, so we just return here
|
|
|
1eedae9 |
@@ -619,7 +619,8 @@ Daemon::startCommand( int cmd, Stream::stream_type st,Sock **sock,int timeout, C
|
|
|
1eedae9 |
_version,
|
|
|
1eedae9 |
&_sec_man,
|
|
|
1eedae9 |
raw_protocol,
|
|
|
1eedae9 |
- sec_session_id);
|
|
|
1eedae9 |
+ sec_session_id,
|
|
|
1eedae9 |
+ _full_hostname);
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
Sock*
|
|
|
1eedae9 |
@@ -662,7 +663,7 @@ Daemon::startCommand_nonblocking( int cmd, Sock* sock, int timeout, CondorError
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
// This is the nonblocking version of startCommand().
|
|
|
1eedae9 |
const bool nonblocking = true;
|
|
|
1eedae9 |
- return startCommand(cmd,sock,timeout,errstack,callback_fn,misc_data,nonblocking,cmd_description,_version,&_sec_man,raw_protocol,sec_session_id);
|
|
|
1eedae9 |
+ return startCommand(cmd,sock,timeout,errstack,callback_fn,misc_data,nonblocking,cmd_description,_version,&_sec_man,raw_protocol,sec_session_id, _full_hostname);
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
bool
|
|
|
1eedae9 |
@@ -670,7 +671,7 @@ Daemon::startCommand( int cmd, Sock* sock, int timeout, CondorError *errstack, c
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
// This is a blocking version of startCommand().
|
|
|
1eedae9 |
const bool nonblocking = false;
|
|
|
1eedae9 |
- StartCommandResult rc = startCommand(cmd,sock,timeout,errstack,NULL,NULL,nonblocking,cmd_description,_version,&_sec_man,raw_protocol,sec_session_id);
|
|
|
1eedae9 |
+ StartCommandResult rc = startCommand(cmd,sock,timeout,errstack,NULL,NULL,nonblocking,cmd_description,_version,&_sec_man,raw_protocol,sec_session_id, _full_hostname);
|
|
|
1eedae9 |
switch(rc) {
|
|
|
1eedae9 |
case StartCommandSucceeded:
|
|
|
1eedae9 |
return true;
|
|
|
1eedae9 |
@@ -2097,7 +2098,7 @@ Daemon::forceAuthentication( ReliSock* rsock, CondorError* errstack )
|
|
|
1eedae9 |
return true;
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
- return SecMan::authenticate_sock(rsock, CLIENT_PERM, errstack );
|
|
|
1eedae9 |
+ return SecMan::authenticate_sock(rsock, CLIENT_PERM, errstack, _full_hostname);
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
|
|
|
1eedae9 |
diff --git a/src/condor_daemon_client/daemon.h b/src/condor_daemon_client/daemon.h
|
|
|
1eedae9 |
index 57fcd8a..9aa3b9f 100644
|
|
|
1eedae9 |
--- a/src/condor_daemon_client/daemon.h
|
|
|
1eedae9 |
+++ b/src/condor_daemon_client/daemon.h
|
|
|
1eedae9 |
@@ -761,7 +761,7 @@ protected:
|
|
|
1eedae9 |
It may be either blocking or nonblocking, depending on the
|
|
|
1eedae9 |
nonblocking flag. This version uses an existing socket.
|
|
|
1eedae9 |
*/
|
|
|
1eedae9 |
- static StartCommandResult startCommand( int cmd, Sock* sock, int timeout, CondorError *errstack, StartCommandCallbackType *callback_fn, void *misc_data, bool nonblocking, char const *cmd_description, char *version, SecMan *sec_man, bool raw_protocol, char const *sec_session_id );
|
|
|
1eedae9 |
+ static StartCommandResult startCommand( int cmd, Sock* sock, int timeout, CondorError *errstack, StartCommandCallbackType *callback_fn, void *misc_data, bool nonblocking, char const *cmd_description, char *version, SecMan *sec_man, bool raw_protocol, char const *sec_session_id, char const *hostname );
|
|
|
1eedae9 |
|
|
|
1eedae9 |
/**
|
|
|
1eedae9 |
Internal function used by public versions of startCommand().
|
|
|
1eedae9 |
@@ -769,7 +769,7 @@ protected:
|
|
|
1eedae9 |
nonblocking flag. This version creates a socket of the
|
|
|
1eedae9 |
specified type and connects it.
|
|
|
1eedae9 |
*/
|
|
|
1eedae9 |
- StartCommandResult startCommand( int cmd, Stream::stream_type st,Sock **sock,int timeout, CondorError *errstack, StartCommandCallbackType *callback_fn, void *misc_data, bool nonblocking, char const *cmd_description=NULL, bool raw_protocol=false, char const *sec_session_id=NULL );
|
|
|
1eedae9 |
+ StartCommandResult startCommand( int cmd, Stream::stream_type st,Sock **sock,int timeout, CondorError *errstack, StartCommandCallbackType *callback_fn, void *misc_data, bool nonblocking, char const *cmd_description, bool raw_protocol, char const *sec_session_id );
|
|
|
1eedae9 |
|
|
|
1eedae9 |
/**
|
|
|
1eedae9 |
Class used internally to handle non-blocking connects for
|
|
|
1eedae9 |
diff --git a/src/condor_daemon_client/daemon_list.cpp b/src/condor_daemon_client/daemon_list.cpp
|
|
|
1eedae9 |
index e10910e..1591a19 100644
|
|
|
1eedae9 |
--- a/src/condor_daemon_client/daemon_list.cpp
|
|
|
1eedae9 |
+++ b/src/condor_daemon_client/daemon_list.cpp
|
|
|
1eedae9 |
@@ -330,7 +330,7 @@ CollectorList::query(CondorQuery & cQuery, ClassAdList & adList, CondorError *er
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
result =
|
|
|
1eedae9 |
- cQuery.fetchAds (adList, daemon->addr(), errstack);
|
|
|
1eedae9 |
+ cQuery.fetchAds (adList, *daemon, errstack);
|
|
|
1eedae9 |
|
|
|
1eedae9 |
if( num_collectors > 1 ) {
|
|
|
1eedae9 |
daemon->blacklistMonitorQueryFinished( result == Q_OK );
|
|
|
1eedae9 |
diff --git a/src/condor_daemon_client/dc_schedd.cpp b/src/condor_daemon_client/dc_schedd.cpp
|
|
|
1eedae9 |
index 96611bc..bc8e8ae 100644
|
|
|
1eedae9 |
--- a/src/condor_daemon_client/dc_schedd.cpp
|
|
|
1eedae9 |
+++ b/src/condor_daemon_client/dc_schedd.cpp
|
|
|
1eedae9 |
@@ -41,6 +41,9 @@ DCSchedd::DCSchedd( const char* the_name, const char* the_pool )
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
+DCSchedd::DCSchedd( const ClassAd* ad, const char* pool )
|
|
|
1eedae9 |
+ : Daemon( ad, DT_SCHEDD ,pool ) // Surprise! DT_SCHEDD is the second argument.
|
|
|
1eedae9 |
+{}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
DCSchedd::~DCSchedd( void )
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
diff --git a/src/condor_daemon_client/dc_schedd.h b/src/condor_daemon_client/dc_schedd.h
|
|
|
1eedae9 |
index 201c9b4..6389e09 100644
|
|
|
1eedae9 |
--- a/src/condor_daemon_client/dc_schedd.h
|
|
|
1eedae9 |
+++ b/src/condor_daemon_client/dc_schedd.h
|
|
|
1eedae9 |
@@ -62,6 +62,13 @@ public:
|
|
|
1eedae9 |
*/
|
|
|
1eedae9 |
DCSchedd( const char* const name = NULL, const char* pool = NULL );
|
|
|
1eedae9 |
|
|
|
1eedae9 |
+ /** Constructor. Same as a Daemon object.
|
|
|
1eedae9 |
+ @param ad The classad of the schedd object; saves a query
|
|
|
1eedae9 |
+ to the collector.
|
|
|
1eedae9 |
+ @param pool The name of the pool, NULL if you want local
|
|
|
1eedae9 |
+ */
|
|
|
1eedae9 |
+ DCSchedd( const ClassAd* ad, const char* pool = NULL );
|
|
|
1eedae9 |
+
|
|
|
1eedae9 |
/// Destructor
|
|
|
1eedae9 |
~DCSchedd();
|
|
|
1eedae9 |
|
|
|
1eedae9 |
diff --git a/src/condor_daemon_client/dc_startd.cpp b/src/condor_daemon_client/dc_startd.cpp
|
|
|
1eedae9 |
index 26659e2..8279fe6 100644
|
|
|
1eedae9 |
--- a/src/condor_daemon_client/dc_startd.cpp
|
|
|
1eedae9 |
+++ b/src/condor_daemon_client/dc_startd.cpp
|
|
|
1eedae9 |
@@ -914,7 +914,6 @@ DCStartd::getAds( ClassAdList &adsList )
|
|
|
1eedae9 |
// fetch the query
|
|
|
1eedae9 |
QueryResult q;
|
|
|
1eedae9 |
CondorQuery* query;
|
|
|
1eedae9 |
- char* ad_addr;
|
|
|
1eedae9 |
|
|
|
1eedae9 |
// instantiate query object
|
|
|
1eedae9 |
if (!(query = new CondorQuery (STARTD_AD))) {
|
|
|
1eedae9 |
@@ -923,8 +922,7 @@ DCStartd::getAds( ClassAdList &adsList )
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
if( this->locate() ){
|
|
|
1eedae9 |
- ad_addr = this->addr();
|
|
|
1eedae9 |
- q = query->fetchAds(adsList, ad_addr, &errstack);
|
|
|
1eedae9 |
+ q = query->fetchAds(adsList, *this, &errstack);
|
|
|
1eedae9 |
if (q != Q_OK) {
|
|
|
1eedae9 |
if (q == Q_COMMUNICATION_ERROR) {
|
|
|
1eedae9 |
dprintf( D_ALWAYS, "%s\n", errstack.getFullText(true).c_str() );
|
|
|
1eedae9 |
diff --git a/src/condor_daemon_core.V6/daemon_command.cpp b/src/condor_daemon_core.V6/daemon_command.cpp
|
|
|
1eedae9 |
index 3627a61..ac91c5f 100644
|
|
|
1eedae9 |
--- a/src/condor_daemon_core.V6/daemon_command.cpp
|
|
|
1eedae9 |
+++ b/src/condor_daemon_core.V6/daemon_command.cpp
|
|
|
1eedae9 |
@@ -991,7 +991,7 @@ DaemonCommandProtocol::CommandProtocolResult DaemonCommandProtocol::Authenticate
|
|
|
1eedae9 |
int auth_timeout = daemonCore->getSecMan()->getSecTimeout( m_comTable[cmd_index].perm );
|
|
|
1eedae9 |
|
|
|
1eedae9 |
char *method_used = NULL;
|
|
|
1eedae9 |
- bool auth_success = m_sock->authenticate(m_key, auth_methods, &errstack, auth_timeout, &method_used);
|
|
|
1eedae9 |
+ bool auth_success = m_sock->authenticate(m_key, auth_methods, &errstack, auth_timeout, &method_used, NULL);
|
|
|
1eedae9 |
|
|
|
1eedae9 |
if ( method_used ) {
|
|
|
1eedae9 |
m_policy->Assign(ATTR_SEC_AUTHENTICATION_METHODS, method_used);
|
|
|
1eedae9 |
@@ -1279,7 +1279,7 @@ DaemonCommandProtocol::CommandProtocolResult DaemonCommandProtocol::ExecCommand(
|
|
|
1eedae9 |
m_comTable[cmd_index].force_authentication &&
|
|
|
1eedae9 |
!m_sock->triedAuthentication() )
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
- SecMan::authenticate_sock(m_sock, WRITE, &errstack);
|
|
|
1eedae9 |
+ SecMan::authenticate_sock(m_sock, WRITE, &errstack, NULL);
|
|
|
1eedae9 |
// we don't check the return value, because the code below
|
|
|
1eedae9 |
// handles what to do with unauthenticated connections
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
diff --git a/src/condor_eventd.V2/admin_event.cpp b/src/condor_eventd.V2/admin_event.cpp
|
|
|
1eedae9 |
index 3fa1c46..83abc49 100644
|
|
|
1eedae9 |
--- a/src/condor_eventd.V2/admin_event.cpp
|
|
|
1eedae9 |
+++ b/src/condor_eventd.V2/admin_event.cpp
|
|
|
1eedae9 |
@@ -1089,7 +1089,7 @@ AdminEvent::FetchAds_ByConstraint( const char *constraint )
|
|
|
1eedae9 |
|
|
|
1eedae9 |
query->addORConstraint( constraint );
|
|
|
1eedae9 |
|
|
|
1eedae9 |
- q = query->fetchAds( m_collector_query_ads, pool->addr(), &errstack);
|
|
|
1eedae9 |
+ q = query->fetchAds( m_collector_query_ads, pool, &errstack);
|
|
|
1eedae9 |
|
|
|
1eedae9 |
if( q != Q_OK ){
|
|
|
1eedae9 |
dprintf(D_ALWAYS, "Trouble fetching Ads with<<%s>><<%d>>\n",
|
|
|
1eedae9 |
diff --git a/src/condor_gridmanager/gridmanager.cpp b/src/condor_gridmanager/gridmanager.cpp
|
|
|
1eedae9 |
index 4aa376c..df65ea5 100644
|
|
|
1eedae9 |
--- a/src/condor_gridmanager/gridmanager.cpp
|
|
|
1eedae9 |
+++ b/src/condor_gridmanager/gridmanager.cpp
|
|
|
1eedae9 |
@@ -644,7 +644,7 @@ doContactSchedd()
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
|
|
|
1eedae9 |
- schedd = ConnectQ( ScheddAddr, QMGMT_TIMEOUT, false, NULL, myUserName, CondorVersion() );
|
|
|
1eedae9 |
+ schedd = ConnectQ( *ScheddObj, QMGMT_TIMEOUT, false, NULL, myUserName, CondorVersion() );
|
|
|
1eedae9 |
if ( !schedd ) {
|
|
|
1eedae9 |
error_str = "Failed to connect to schedd!";
|
|
|
1eedae9 |
goto contact_schedd_failure;
|
|
|
1eedae9 |
diff --git a/src/condor_includes/authentication.h b/src/condor_includes/authentication.h
|
|
|
1eedae9 |
index d2b976a..6167e84 100644
|
|
|
1eedae9 |
--- a/src/condor_includes/authentication.h
|
|
|
1eedae9 |
+++ b/src/condor_includes/authentication.h
|
|
|
1eedae9 |
@@ -40,7 +40,7 @@ class Authentication {
|
|
|
1eedae9 |
|
|
|
1eedae9 |
~Authentication();
|
|
|
1eedae9 |
|
|
|
1eedae9 |
- int authenticate( char *hostAddr, const char* auth_methods, CondorError* errstack, int timeout);
|
|
|
1eedae9 |
+ int authenticate( const char *hostAddr, const char* auth_methods, CondorError* errstack, int timeout);
|
|
|
1eedae9 |
//------------------------------------------
|
|
|
1eedae9 |
// PURPOSE: authenticate with the other side
|
|
|
1eedae9 |
// REQUIRE: hostAddr -- host to authenticate
|
|
|
1eedae9 |
@@ -50,7 +50,7 @@ class Authentication {
|
|
|
1eedae9 |
// RETURNS: -1 -- failure
|
|
|
1eedae9 |
//------------------------------------------
|
|
|
1eedae9 |
|
|
|
1eedae9 |
- int authenticate( char *hostAddr, KeyInfo *& key, const char* auth_methods, CondorError* errstack, int timeout);
|
|
|
1eedae9 |
+ int authenticate( const char *hostAddr, KeyInfo *& key, const char* auth_methods, CondorError* errstack, int timeout);
|
|
|
1eedae9 |
//------------------------------------------
|
|
|
1eedae9 |
// PURPOSE: To send the secret key over. this method
|
|
|
1eedae9 |
// is written to keep compatibility issues
|
|
|
1eedae9 |
@@ -161,7 +161,7 @@ class Authentication {
|
|
|
1eedae9 |
|
|
|
1eedae9 |
#endif /* !SKIP_AUTHENTICATION */
|
|
|
1eedae9 |
|
|
|
1eedae9 |
- int authenticate_inner( char *hostAddr, const char* auth_methods, CondorError* errstack, int timeout);
|
|
|
1eedae9 |
+ int authenticate_inner( const char *hostAddr, const char* auth_methods, CondorError* errstack, int timeout);
|
|
|
1eedae9 |
|
|
|
1eedae9 |
//------------------------------------------
|
|
|
1eedae9 |
// Data (private)
|
|
|
1eedae9 |
diff --git a/src/condor_includes/condor_auth_x509.h b/src/condor_includes/condor_auth_x509.h
|
|
|
1eedae9 |
index bdbc545..dac8aa5 100644
|
|
|
1eedae9 |
--- a/src/condor_includes/condor_auth_x509.h
|
|
|
1eedae9 |
+++ b/src/condor_includes/condor_auth_x509.h
|
|
|
1eedae9 |
@@ -103,7 +103,7 @@ class Condor_Auth_X509 : public Condor_Auth_Base {
|
|
|
1eedae9 |
|
|
|
1eedae9 |
int authenticate_self_gss(CondorError* errstack);
|
|
|
1eedae9 |
|
|
|
1eedae9 |
- int authenticate_client_gss(CondorError* errstack);
|
|
|
1eedae9 |
+ int authenticate_client_gss(const char *remoteHost, CondorError* errstack);
|
|
|
1eedae9 |
|
|
|
1eedae9 |
int authenticate_server_gss(CondorError* errstack);
|
|
|
1eedae9 |
|
|
|
1eedae9 |
diff --git a/src/condor_includes/condor_qmgr.h b/src/condor_includes/condor_qmgr.h
|
|
|
1eedae9 |
index 5e5012e..642b602 100644
|
|
|
1eedae9 |
--- a/src/condor_includes/condor_qmgr.h
|
|
|
1eedae9 |
+++ b/src/condor_includes/condor_qmgr.h
|
|
|
1eedae9 |
@@ -25,7 +25,7 @@
|
|
|
1eedae9 |
#include "proc.h"
|
|
|
1eedae9 |
#include "../condor_utils/CondorError.h"
|
|
|
1eedae9 |
#include "condor_classad.h"
|
|
|
1eedae9 |
-
|
|
|
1eedae9 |
+#include "daemon.h"
|
|
|
1eedae9 |
|
|
|
1eedae9 |
typedef struct {
|
|
|
1eedae9 |
bool dummy;
|
|
|
1eedae9 |
@@ -54,8 +54,7 @@ int InitializeConnection(const char *, const char *);
|
|
|
1eedae9 |
int InitializeReadOnlyConnection(const char * );
|
|
|
1eedae9 |
|
|
|
1eedae9 |
/** Initiate connection to schedd job queue and begin transaction.
|
|
|
1eedae9 |
- @param qmgr_location can be the name or sinful string of a schedd or
|
|
|
1eedae9 |
- NULL to connect to the local schedd
|
|
|
1eedae9 |
+ @param daemon a daemon object of type DT_SCHEDD
|
|
|
1eedae9 |
@param timeout specifies the maximum time (in seconds) to wait for TCP
|
|
|
1eedae9 |
connection establishment
|
|
|
1eedae9 |
@param read_only can be set to true to skip the potentially slow
|
|
|
1eedae9 |
@@ -64,7 +63,7 @@ int InitializeReadOnlyConnection(const char * );
|
|
|
1eedae9 |
@param schedd_version_str Version of schedd if known (o.w. NULL).
|
|
|
1eedae9 |
@return opaque Qmgr_connection structure
|
|
|
1eedae9 |
*/
|
|
|
1eedae9 |
-Qmgr_connection *ConnectQ(const char *qmgr_location, int timeout=0,
|
|
|
1eedae9 |
+Qmgr_connection *ConnectQ(Daemon &daemon, int timeout=0,
|
|
|
1eedae9 |
bool read_only=false, CondorError* errstack=NULL,
|
|
|
1eedae9 |
const char *effective_owner=NULL,
|
|
|
1eedae9 |
char const *schedd_version_str=NULL);
|
|
|
1eedae9 |
diff --git a/src/condor_includes/condor_secman.h b/src/condor_includes/condor_secman.h
|
|
|
1eedae9 |
index e92ef0d..a78944d 100644
|
|
|
1eedae9 |
--- a/src/condor_includes/condor_secman.h
|
|
|
1eedae9 |
+++ b/src/condor_includes/condor_secman.h
|
|
|
1eedae9 |
@@ -106,12 +106,12 @@ public:
|
|
|
1eedae9 |
// spawn off a non-blocking attempt to create a security
|
|
|
1eedae9 |
// session so that in the future, a UDP command could succeed
|
|
|
1eedae9 |
// without StartCommandWouldBlock.
|
|
|
1eedae9 |
- StartCommandResult startCommand( int cmd, Sock* sock, bool raw_protocol, CondorError* errstack, int subcmd, StartCommandCallbackType *callback_fn, void *misc_data, bool nonblocking,char const *cmd_description,char const *sec_session_id);
|
|
|
1eedae9 |
+ StartCommandResult startCommand( int cmd, Sock* sock, bool raw_protocol, CondorError* errstack, int subcmd, StartCommandCallbackType *callback_fn, void *misc_data, bool nonblocking,char const *cmd_description,char const *sec_session_id, const char *hostname);
|
|
|
1eedae9 |
|
|
|
1eedae9 |
// Authenticate a socket using whatever authentication methods
|
|
|
1eedae9 |
// have been configured for the specified perm level.
|
|
|
1eedae9 |
- static int authenticate_sock(Sock *s,DCpermission perm, CondorError* errstack);
|
|
|
1eedae9 |
- static int authenticate_sock(Sock *s,KeyInfo *&ki, DCpermission perm, CondorError* errstack);
|
|
|
1eedae9 |
+ static int authenticate_sock(Sock *s,DCpermission perm, CondorError* errstack, const char * hostname);
|
|
|
1eedae9 |
+ static int authenticate_sock(Sock *s,KeyInfo *&ki, DCpermission perm, CondorError* errstack, const char * hostname);
|
|
|
1eedae9 |
|
|
|
1eedae9 |
|
|
|
1eedae9 |
//------------------------------------------
|
|
|
1eedae9 |
diff --git a/src/condor_includes/reli_sock.h b/src/condor_includes/reli_sock.h
|
|
|
1eedae9 |
index b48ce8d..f5cdca8 100644
|
|
|
1eedae9 |
--- a/src/condor_includes/reli_sock.h
|
|
|
1eedae9 |
+++ b/src/condor_includes/reli_sock.h
|
|
|
1eedae9 |
@@ -218,9 +218,9 @@ public:
|
|
|
1eedae9 |
virtual int peek(char &);
|
|
|
1eedae9 |
|
|
|
1eedae9 |
///
|
|
|
1eedae9 |
- int authenticate( const char* methods, CondorError* errstack, int auth_timeout );
|
|
|
1eedae9 |
+ int authenticate( const char* methods, CondorError* errstack, int auth_timeout, const char * hostname );
|
|
|
1eedae9 |
///
|
|
|
1eedae9 |
- int authenticate( KeyInfo *& key, const char* methods, CondorError* errstack, int auth_timeout, char **method_used=NULL );
|
|
|
1eedae9 |
+ int authenticate( KeyInfo *& key, const char* methods, CondorError* errstack, int auth_timeout, char **method_used, const char * hostname );
|
|
|
1eedae9 |
///
|
|
|
1eedae9 |
int isClient() { return is_client; };
|
|
|
1eedae9 |
|
|
|
1eedae9 |
@@ -254,7 +254,8 @@ protected:
|
|
|
1eedae9 |
int prepare_for_nobuffering( stream_coding = stream_unknown);
|
|
|
1eedae9 |
int perform_authenticate( bool with_key, KeyInfo *& key,
|
|
|
1eedae9 |
const char* methods, CondorError* errstack,
|
|
|
1eedae9 |
- int auth_timeout, char **method_used );
|
|
|
1eedae9 |
+ int auth_timeout, char **method_used,
|
|
|
1eedae9 |
+ const char* hostname );
|
|
|
1eedae9 |
|
|
|
1eedae9 |
// This is used internally to recover sanity on the stream after
|
|
|
1eedae9 |
// failing to open a file in put_file().
|
|
|
1eedae9 |
diff --git a/src/condor_includes/sock.h b/src/condor_includes/sock.h
|
|
|
1eedae9 |
index ca1b1c8..53f8b23 100644
|
|
|
1eedae9 |
--- a/src/condor_includes/sock.h
|
|
|
1eedae9 |
+++ b/src/condor_includes/sock.h
|
|
|
1eedae9 |
@@ -347,10 +347,10 @@ public:
|
|
|
1eedae9 |
bool isAuthenticated() const;
|
|
|
1eedae9 |
|
|
|
1eedae9 |
///
|
|
|
1eedae9 |
- virtual int authenticate(const char * auth_methods, CondorError* errstack, int timeout);
|
|
|
1eedae9 |
+ virtual int authenticate(const char * auth_methods, CondorError* errstack, int timeout, const char *hostname);
|
|
|
1eedae9 |
///
|
|
|
1eedae9 |
// method_used should be freed by the caller when finished with it
|
|
|
1eedae9 |
- virtual int authenticate(KeyInfo *&ki, const char * auth_methods, CondorError* errstack, int timeout, char **method_used=NULL);
|
|
|
1eedae9 |
+ virtual int authenticate(KeyInfo *&ki, const char * auth_methods, CondorError* errstack, int timeout, char **method_used, const char *hostname);
|
|
|
1eedae9 |
|
|
|
1eedae9 |
/// if we are connecting, merges together Stream::get_deadline
|
|
|
1eedae9 |
/// and connect_timeout_time()
|
|
|
1eedae9 |
diff --git a/src/condor_io/authentication.cpp b/src/condor_io/authentication.cpp
|
|
|
1eedae9 |
index a0d7050..27564f2 100644
|
|
|
1eedae9 |
--- a/src/condor_io/authentication.cpp
|
|
|
1eedae9 |
+++ b/src/condor_io/authentication.cpp
|
|
|
1eedae9 |
@@ -85,7 +85,7 @@ Authentication::~Authentication()
|
|
|
1eedae9 |
#endif
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
-int Authentication::authenticate( char *hostAddr, KeyInfo *& key,
|
|
|
1eedae9 |
+int Authentication::authenticate( const char *hostAddr, KeyInfo *& key,
|
|
|
1eedae9 |
const char* auth_methods, CondorError* errstack, int timeout)
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
int retval = authenticate(hostAddr, auth_methods, errstack, timeout);
|
|
|
1eedae9 |
@@ -106,7 +106,7 @@ int Authentication::authenticate( char *hostAddr, KeyInfo *& key,
|
|
|
1eedae9 |
return retval;
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
-int Authentication::authenticate( char *hostAddr, const char* auth_methods,
|
|
|
1eedae9 |
+int Authentication::authenticate( const char *hostAddr, const char* auth_methods,
|
|
|
1eedae9 |
CondorError* errstack, int timeout)
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
int retval;
|
|
|
1eedae9 |
@@ -124,7 +124,7 @@ int Authentication::authenticate( char *hostAddr, const char* auth_methods,
|
|
|
1eedae9 |
return retval;
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
-int Authentication::authenticate_inner( char *hostAddr, const char* auth_methods,
|
|
|
1eedae9 |
+int Authentication::authenticate_inner( const char *hostAddr, const char* auth_methods,
|
|
|
1eedae9 |
CondorError* errstack, int timeout)
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
#if defined(SKIP_AUTHENTICATION)
|
|
|
1eedae9 |
diff --git a/src/condor_io/condor_auth_x509.cpp b/src/condor_io/condor_auth_x509.cpp
|
|
|
1eedae9 |
index 0111e3d..065e763 100644
|
|
|
1eedae9 |
--- a/src/condor_io/condor_auth_x509.cpp
|
|
|
1eedae9 |
+++ b/src/condor_io/condor_auth_x509.cpp
|
|
|
1eedae9 |
@@ -112,7 +112,7 @@ Condor_Auth_X509 :: ~Condor_Auth_X509()
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
-int Condor_Auth_X509 :: authenticate(const char * /* remoteHost */, CondorError* errstack)
|
|
|
1eedae9 |
+int Condor_Auth_X509 :: authenticate(const char * remoteHost, CondorError* errstack)
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
int status = 1;
|
|
|
1eedae9 |
int reply = 0;
|
|
|
1eedae9 |
@@ -191,7 +191,7 @@ int Condor_Auth_X509 :: authenticate(const char * /* remoteHost */, CondorError*
|
|
|
1eedae9 |
|
|
|
1eedae9 |
switch ( mySock_->isClient() ) {
|
|
|
1eedae9 |
case 1:
|
|
|
1eedae9 |
- status = authenticate_client_gss(errstack);
|
|
|
1eedae9 |
+ status = authenticate_client_gss(remoteHost, errstack);
|
|
|
1eedae9 |
break;
|
|
|
1eedae9 |
default:
|
|
|
1eedae9 |
status = authenticate_server_gss(errstack);
|
|
|
1eedae9 |
@@ -675,7 +675,7 @@ int Condor_Auth_X509::authenticate_self_gss(CondorError* errstack)
|
|
|
1eedae9 |
return TRUE;
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
-int Condor_Auth_X509::authenticate_client_gss(CondorError* errstack)
|
|
|
1eedae9 |
+int Condor_Auth_X509::authenticate_client_gss(const char * remoteHost, CondorError* errstack)
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
OM_uint32 major_status = 0;
|
|
|
1eedae9 |
OM_uint32 minor_status = 0;
|
|
|
1eedae9 |
@@ -787,31 +787,47 @@ int Condor_Auth_X509::authenticate_client_gss(CondorError* errstack)
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
- std::string fqh = get_full_hostname(mySock_->peer_addr());
|
|
|
1eedae9 |
- StringList * daemonNames = getDaemonList("GSI_DAEMON_NAME",fqh.c_str());
|
|
|
1eedae9 |
-
|
|
|
1eedae9 |
- // Now, let's see if the name is in the list, I am not using
|
|
|
1eedae9 |
- // anycase here, so if the host name and what we are looking for
|
|
|
1eedae9 |
- // are in different cases, then we will run into problems.
|
|
|
1eedae9 |
- if( daemonNames ) {
|
|
|
1eedae9 |
- status = daemonNames->contains_withwildcard(server) == TRUE? 1 : 0;
|
|
|
1eedae9 |
-
|
|
|
1eedae9 |
- if( !status ) {
|
|
|
1eedae9 |
- errstack->pushf("GSI", GSI_ERR_UNAUTHORIZED_SERVER,
|
|
|
1eedae9 |
- "Failed to authenticate because the subject '%s' is not currently trusted by you. "
|
|
|
1eedae9 |
- "If it should be, add it to GSI_DAEMON_NAME or undefine GSI_DAEMON_NAME.", server);
|
|
|
1eedae9 |
- dprintf(D_SECURITY,
|
|
|
1eedae9 |
+ std::vector<MyString> fqhs;
|
|
|
1eedae9 |
+ if (remoteHost)
|
|
|
1eedae9 |
+ {
|
|
|
1eedae9 |
+ std::vector<MyString> fqhs_copy = get_hostname_with_alias(mySock_->peer_addr());
|
|
|
1eedae9 |
+ fqhs.push_back(remoteHost);
|
|
|
1eedae9 |
+ fqhs.insert(fqhs.begin()+1, fqhs_copy.begin(), fqhs_copy.end());
|
|
|
1eedae9 |
+ }
|
|
|
1eedae9 |
+ else
|
|
|
1eedae9 |
+ {
|
|
|
1eedae9 |
+ fqhs = get_hostname_with_alias(mySock_->peer_addr());
|
|
|
1eedae9 |
+ }
|
|
|
1eedae9 |
+ dprintf(D_FULLDEBUG, "Number of aliases: %zu\n", fqhs.size());
|
|
|
1eedae9 |
+ for(std::vector<MyString>::const_iterator it = fqhs.begin(); it != fqhs.end(); ++it) {
|
|
|
1eedae9 |
+ dprintf(D_FULLDEBUG, "Checking validity of alias %s\n", it->Value());
|
|
|
1eedae9 |
+ std::string fqh = it->Value();
|
|
|
1eedae9 |
+ StringList * daemonNames = getDaemonList("GSI_DAEMON_NAME",fqh.c_str());
|
|
|
1eedae9 |
+
|
|
|
1eedae9 |
+ // Now, let's see if the name is in the list, I am not using
|
|
|
1eedae9 |
+ // anycase here, so if the host name and what we are looking for
|
|
|
1eedae9 |
+ // are in different cases, then we will run into problems.
|
|
|
1eedae9 |
+ if( daemonNames ) {
|
|
|
1eedae9 |
+ status = daemonNames->contains_withwildcard(server) == TRUE? 1 : 0;
|
|
|
1eedae9 |
+
|
|
|
1eedae9 |
+ if( !status ) {
|
|
|
1eedae9 |
+ errstack->pushf("GSI", GSI_ERR_UNAUTHORIZED_SERVER,
|
|
|
1eedae9 |
+ "Failed to authenticate because the subject '%s' is not currently trusted by you. "
|
|
|
1eedae9 |
+ "If it should be, add it to GSI_DAEMON_NAME or undefine GSI_DAEMON_NAME.", server);
|
|
|
1eedae9 |
+ dprintf(D_SECURITY,
|
|
|
1eedae9 |
"GSI_DAEMON_NAME is defined and the server %s is not specified in the GSI_DAEMON_NAME parameter\n",
|
|
|
1eedae9 |
server);
|
|
|
1eedae9 |
+ }
|
|
|
1eedae9 |
+ } else {
|
|
|
1eedae9 |
+ status = CheckServerName(fqh.c_str(),mySock_->peer_ip_str(),mySock_,errstack);
|
|
|
1eedae9 |
+ }
|
|
|
1eedae9 |
+ delete daemonNames;
|
|
|
1eedae9 |
+
|
|
|
1eedae9 |
+ if (status) {
|
|
|
1eedae9 |
+ dprintf(D_SECURITY, "valid GSS connection established to %s\n", server);
|
|
|
1eedae9 |
+ break;
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
- else {
|
|
|
1eedae9 |
- status = CheckServerName(fqh.c_str(),mySock_->peer_ip_str(),mySock_,errstack);
|
|
|
1eedae9 |
- }
|
|
|
1eedae9 |
-
|
|
|
1eedae9 |
- if (status) {
|
|
|
1eedae9 |
- dprintf(D_SECURITY, "valid GSS connection established to %s\n", server);
|
|
|
1eedae9 |
- }
|
|
|
1eedae9 |
|
|
|
1eedae9 |
mySock_->encode();
|
|
|
1eedae9 |
if (!mySock_->code(status) || !mySock_->end_of_message()) {
|
|
|
1eedae9 |
@@ -822,7 +838,6 @@ int Condor_Auth_X509::authenticate_client_gss(CondorError* errstack)
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
delete [] server;
|
|
|
1eedae9 |
- delete daemonNames;
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
clear:
|
|
|
1eedae9 |
return (status == 0) ? FALSE : TRUE;
|
|
|
1eedae9 |
diff --git a/src/condor_io/condor_secman.cpp b/src/condor_io/condor_secman.cpp
|
|
|
1eedae9 |
index 8c9934f..c38fdce 100644
|
|
|
1eedae9 |
--- a/src/condor_io/condor_secman.cpp
|
|
|
1eedae9 |
+++ b/src/condor_io/condor_secman.cpp
|
|
|
1eedae9 |
@@ -855,7 +855,7 @@ class SecManStartCommand: Service, public ClassyCountedPtr {
|
|
|
1eedae9 |
SecManStartCommand (
|
|
|
1eedae9 |
int cmd,Sock *sock,bool raw_protocol,
|
|
|
1eedae9 |
CondorError *errstack,int subcmd,StartCommandCallbackType *callback_fn,
|
|
|
1eedae9 |
- void *misc_data,bool nonblocking,char const *cmd_description,char const *sec_session_id_hint,SecMan *sec_man):
|
|
|
1eedae9 |
+ void *misc_data,bool nonblocking,char const *cmd_description,char const *sec_session_id_hint,SecMan *sec_man, const std::string &hostname):
|
|
|
1eedae9 |
|
|
|
1eedae9 |
m_cmd(cmd),
|
|
|
1eedae9 |
m_subcmd(subcmd),
|
|
|
1eedae9 |
@@ -867,7 +867,8 @@ class SecManStartCommand: Service, public ClassyCountedPtr {
|
|
|
1eedae9 |
m_nonblocking(nonblocking),
|
|
|
1eedae9 |
m_pending_socket_registered(false),
|
|
|
1eedae9 |
m_sec_man(*sec_man),
|
|
|
1eedae9 |
- m_use_tmp_sec_session(false)
|
|
|
1eedae9 |
+ m_use_tmp_sec_session(false),
|
|
|
1eedae9 |
+ m_hostname(hostname)
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
m_sec_session_id_hint = sec_session_id_hint ? sec_session_id_hint : "";
|
|
|
1eedae9 |
if( m_sec_session_id_hint == USE_TMP_SEC_SESSION ) {
|
|
|
1eedae9 |
@@ -972,6 +973,7 @@ class SecManStartCommand: Service, public ClassyCountedPtr {
|
|
|
1eedae9 |
KeyCacheEntry *m_enc_key;
|
|
|
1eedae9 |
KeyInfo* m_private_key;
|
|
|
1eedae9 |
MyString m_sec_session_id_hint;
|
|
|
1eedae9 |
+ std::string m_hostname;
|
|
|
1eedae9 |
|
|
|
1eedae9 |
enum StartCommandState {
|
|
|
1eedae9 |
SendAuthInfo,
|
|
|
1eedae9 |
@@ -1023,7 +1025,7 @@ class SecManStartCommand: Service, public ClassyCountedPtr {
|
|
|
1eedae9 |
};
|
|
|
1eedae9 |
|
|
|
1eedae9 |
StartCommandResult
|
|
|
1eedae9 |
-SecMan::startCommand( int cmd, Sock* sock, bool raw_protocol, CondorError* errstack, int subcmd, StartCommandCallbackType *callback_fn, void *misc_data, bool nonblocking,char const *cmd_description,char const *sec_session_id_hint)
|
|
|
1eedae9 |
+SecMan::startCommand( int cmd, Sock* sock, bool raw_protocol, CondorError* errstack, int subcmd, StartCommandCallbackType *callback_fn, void *misc_data, bool nonblocking,char const *cmd_description,char const *sec_session_id_hint, const char *hostname)
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
// This function is simply a convenient wrapper around the
|
|
|
1eedae9 |
// SecManStartCommand class, which does the actual work.
|
|
|
1eedae9 |
@@ -1032,7 +1034,8 @@ SecMan::startCommand( int cmd, Sock* sock, bool raw_protocol, CondorError* errst
|
|
|
1eedae9 |
// The blocking case could avoid use of the heap, but for simplicity,
|
|
|
1eedae9 |
// we just do the same in both cases.
|
|
|
1eedae9 |
|
|
|
1eedae9 |
- classy_counted_ptr<SecManStartCommand> sc = new SecManStartCommand(cmd,sock,raw_protocol,errstack,subcmd,callback_fn,misc_data,nonblocking,cmd_description,sec_session_id_hint,this);
|
|
|
1eedae9 |
+ std::string hostname_str = hostname ? hostname : "";
|
|
|
1eedae9 |
+ classy_counted_ptr<SecManStartCommand> sc = new SecManStartCommand(cmd,sock,raw_protocol,errstack,subcmd,callback_fn,misc_data,nonblocking,cmd_description,sec_session_id_hint,this, hostname_str);
|
|
|
1eedae9 |
|
|
|
1eedae9 |
ASSERT(sc.get());
|
|
|
1eedae9 |
|
|
|
1eedae9 |
@@ -1826,7 +1829,7 @@ SecManStartCommand::authenticate_inner()
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
int auth_timeout = m_sec_man.getSecTimeout( CLIENT_PERM );
|
|
|
1eedae9 |
- bool auth_success = m_sock->authenticate(m_private_key, auth_methods, m_errstack,auth_timeout);
|
|
|
1eedae9 |
+ bool auth_success = m_sock->authenticate(m_private_key, auth_methods, m_errstack,auth_timeout, NULL, m_hostname.c_str());
|
|
|
1eedae9 |
|
|
|
1eedae9 |
if (auth_methods) {
|
|
|
1eedae9 |
free(auth_methods);
|
|
|
1eedae9 |
@@ -2156,7 +2159,8 @@ SecManStartCommand::DoTCPAuth_inner()
|
|
|
1eedae9 |
m_nonblocking,
|
|
|
1eedae9 |
m_cmd_description.Value(),
|
|
|
1eedae9 |
m_sec_session_id_hint.Value(),
|
|
|
1eedae9 |
- &m_sec_man);
|
|
|
1eedae9 |
+ &m_sec_man,
|
|
|
1eedae9 |
+ m_hostname);
|
|
|
1eedae9 |
|
|
|
1eedae9 |
StartCommandResult auth_result = m_tcp_auth_command->startCommand();
|
|
|
1eedae9 |
|
|
|
1eedae9 |
@@ -2793,23 +2797,23 @@ char* SecMan::my_parent_unique_id() {
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
int
|
|
|
1eedae9 |
-SecMan::authenticate_sock(Sock *s,DCpermission perm, CondorError* errstack)
|
|
|
1eedae9 |
+SecMan::authenticate_sock(Sock *s,DCpermission perm, CondorError* errstack, const char * hostname)
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
MyString methods;
|
|
|
1eedae9 |
getAuthenticationMethods( perm, &methods );
|
|
|
1eedae9 |
ASSERT(s);
|
|
|
1eedae9 |
int auth_timeout = getSecTimeout(perm);
|
|
|
1eedae9 |
- return s->authenticate(methods.Value(),errstack,auth_timeout);
|
|
|
1eedae9 |
+ return s->authenticate(methods.Value(),errstack,auth_timeout, hostname);
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
int
|
|
|
1eedae9 |
-SecMan::authenticate_sock(Sock *s,KeyInfo *&ki, DCpermission perm, CondorError* errstack)
|
|
|
1eedae9 |
+SecMan::authenticate_sock(Sock *s,KeyInfo *&ki, DCpermission perm, CondorError* errstack, const char * hostname)
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
MyString methods;
|
|
|
1eedae9 |
getAuthenticationMethods( perm, &methods );
|
|
|
1eedae9 |
ASSERT(s);
|
|
|
1eedae9 |
int auth_timeout = getSecTimeout(perm);
|
|
|
1eedae9 |
- return s->authenticate(ki,methods.Value(),errstack,auth_timeout);
|
|
|
1eedae9 |
+ return s->authenticate(ki,methods.Value(),errstack,auth_timeout, NULL, hostname);
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
int
|
|
|
1eedae9 |
diff --git a/src/condor_io/reli_sock.cpp b/src/condor_io/reli_sock.cpp
|
|
|
1eedae9 |
index e093729..a87694f 100644
|
|
|
1eedae9 |
--- a/src/condor_io/reli_sock.cpp
|
|
|
1eedae9 |
+++ b/src/condor_io/reli_sock.cpp
|
|
|
1eedae9 |
@@ -967,11 +967,11 @@ ReliSock::prepare_for_nobuffering(stream_coding direction)
|
|
|
1eedae9 |
|
|
|
1eedae9 |
int ReliSock::perform_authenticate(bool with_key, KeyInfo *& key,
|
|
|
1eedae9 |
const char* methods, CondorError* errstack,
|
|
|
1eedae9 |
- int auth_timeout, char **method_used)
|
|
|
1eedae9 |
+ int auth_timeout, char **method_used,
|
|
|
1eedae9 |
+ const char * hostname )
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
int in_encode_mode;
|
|
|
1eedae9 |
int result;
|
|
|
1eedae9 |
-
|
|
|
1eedae9 |
if( method_used ) {
|
|
|
1eedae9 |
*method_used = NULL;
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
@@ -984,9 +984,9 @@ int ReliSock::perform_authenticate(bool with_key, KeyInfo *& key,
|
|
|
1eedae9 |
|
|
|
1eedae9 |
// actually perform the authentication
|
|
|
1eedae9 |
if ( with_key ) {
|
|
|
1eedae9 |
- result = authob.authenticate( hostAddr, key, methods, errstack, auth_timeout );
|
|
|
1eedae9 |
+ result = authob.authenticate( hostname, key, methods, errstack, auth_timeout );
|
|
|
1eedae9 |
} else {
|
|
|
1eedae9 |
- result = authob.authenticate( hostAddr, methods, errstack, auth_timeout );
|
|
|
1eedae9 |
+ result = authob.authenticate( hostname, methods, errstack, auth_timeout );
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
// restore stream mode (either encode or decode)
|
|
|
1eedae9 |
if ( in_encode_mode && is_decode() ) {
|
|
|
1eedae9 |
@@ -1010,16 +1010,16 @@ int ReliSock::perform_authenticate(bool with_key, KeyInfo *& key,
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
-int ReliSock::authenticate(KeyInfo *& key, const char* methods, CondorError* errstack, int auth_timeout, char **method_used)
|
|
|
1eedae9 |
+int ReliSock::authenticate(KeyInfo *& key, const char* methods, CondorError* errstack, int auth_timeout, char **method_used, const char *hostname)
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
- return perform_authenticate(true,key,methods,errstack,auth_timeout,method_used);
|
|
|
1eedae9 |
+ return perform_authenticate(true,key,methods,errstack,auth_timeout,method_used, hostname);
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
int
|
|
|
1eedae9 |
-ReliSock::authenticate(const char* methods, CondorError* errstack,int auth_timeout )
|
|
|
1eedae9 |
+ReliSock::authenticate(const char* methods, CondorError* errstack,int auth_timeout, const char * hostname)
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
KeyInfo *key = NULL;
|
|
|
1eedae9 |
- return perform_authenticate(false,key,methods,errstack,auth_timeout,NULL);
|
|
|
1eedae9 |
+ return perform_authenticate(false,key,methods,errstack,auth_timeout,NULL, hostname);
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
bool
|
|
|
1eedae9 |
diff --git a/src/condor_io/sock.cpp b/src/condor_io/sock.cpp
|
|
|
1eedae9 |
index c4dcb0b..e743139 100644
|
|
|
1eedae9 |
--- a/src/condor_io/sock.cpp
|
|
|
1eedae9 |
+++ b/src/condor_io/sock.cpp
|
|
|
1eedae9 |
@@ -2235,12 +2235,12 @@ bool Sock :: is_hdr_encrypt(){
|
|
|
1eedae9 |
return FALSE;
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
-int Sock :: authenticate(KeyInfo *&, const char * /* methods */, CondorError* /* errstack */, int /*timeout*/, char ** /*method_used*/)
|
|
|
1eedae9 |
+int Sock :: authenticate(KeyInfo *&, const char * /* methods */, CondorError* /* errstack */, int /*timeout*/, char ** /*method_used*/, const char * /*hostname*/)
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
return -1;
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
-int Sock :: authenticate(const char * /* methods */, CondorError* /* errstack */, int /*timeout*/)
|
|
|
1eedae9 |
+int Sock :: authenticate(const char * /* methods */, CondorError* /* errstack */, int /*timeout*/, const char * /*hostname*/)
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
/*
|
|
|
1eedae9 |
errstack->push("AUTHENTICATE", AUTHENTICATE_ERR_NOT_BUILT,
|
|
|
1eedae9 |
diff --git a/src/condor_job_router/submit_job.cpp b/src/condor_job_router/submit_job.cpp
|
|
|
1eedae9 |
index 76d77cc..d4d996d 100644
|
|
|
1eedae9 |
--- a/src/condor_job_router/submit_job.cpp
|
|
|
1eedae9 |
+++ b/src/condor_job_router/submit_job.cpp
|
|
|
1eedae9 |
@@ -175,7 +175,7 @@ ClaimJobResult claim_job(int cluster, int proc, MyString * error_details, const
|
|
|
1eedae9 |
static Qmgr_connection *open_q_as_owner(char const *effective_owner,DCSchedd &schedd,FailObj &failobj)
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
CondorError errstack;
|
|
|
1eedae9 |
- Qmgr_connection * qmgr = ConnectQ(schedd.addr(), 0 /*timeout==default*/, false /*read-only*/, & errstack, effective_owner, schedd.version());
|
|
|
1eedae9 |
+ Qmgr_connection * qmgr = ConnectQ(schedd, 0 /*timeout==default*/, false /*read-only*/, & errstack, effective_owner, schedd.version());
|
|
|
1eedae9 |
if( ! qmgr ) {
|
|
|
1eedae9 |
failobj.fail("Unable to connect\n%s\n", errstack.getFullText(true).c_str());
|
|
|
1eedae9 |
return NULL;
|
|
|
1eedae9 |
diff --git a/src/condor_prio/prio.cpp b/src/condor_prio/prio.cpp
|
|
|
1eedae9 |
index deec9b1..c27aa94 100644
|
|
|
1eedae9 |
--- a/src/condor_prio/prio.cpp
|
|
|
1eedae9 |
+++ b/src/condor_prio/prio.cpp
|
|
|
1eedae9 |
@@ -157,8 +157,7 @@ main( int argc, char *argv[] )
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
// Open job queue
|
|
|
1eedae9 |
- DaemonName = schedd.addr();
|
|
|
1eedae9 |
- q = ConnectQ(DaemonName.Value());
|
|
|
1eedae9 |
+ q = ConnectQ(schedd);
|
|
|
1eedae9 |
if( !q ) {
|
|
|
1eedae9 |
fprintf( stderr, "Failed to connect to queue manager %s\n",
|
|
|
1eedae9 |
DaemonName.Value() );
|
|
|
1eedae9 |
diff --git a/src/condor_q.V6/queue.cpp b/src/condor_q.V6/queue.cpp
|
|
|
1eedae9 |
index 913b7b8..40cc5da 100644
|
|
|
1eedae9 |
--- a/src/condor_q.V6/queue.cpp
|
|
|
1eedae9 |
+++ b/src/condor_q.V6/queue.cpp
|
|
|
1eedae9 |
@@ -130,13 +130,13 @@ static char * bufferJobShort (ClassAd *);
|
|
|
1eedae9 |
/* if useDB is false, then v1 =scheddAddress, v2=scheddName, v3=scheddMachine, v4=scheddVersion;
|
|
|
1eedae9 |
if useDB is true, then v1 =quill_name, v2=db_ipAddr, v3=db_name, v4=db_password
|
|
|
1eedae9 |
*/
|
|
|
1eedae9 |
-static bool show_queue (const char* v1, const char* v2, const char* v3, const char* v4, bool useDB);
|
|
|
1eedae9 |
-static bool show_queue_buffered (const char* v1, const char* v2, const char* v3, const char* v4, bool useDB);
|
|
|
1eedae9 |
+static bool show_queue (const char* v1, const char* v2, const char* v3, const char* v4, const ClassAd *ad, bool useDB);
|
|
|
1eedae9 |
+static bool show_queue_buffered (const char* v1, const char* v2, const char* v3, const char* v4, const ClassAd *ad, bool useDB);
|
|
|
1eedae9 |
static void init_output_mask();
|
|
|
1eedae9 |
|
|
|
1eedae9 |
|
|
|
1eedae9 |
/* a type used to point to one of the above two functions */
|
|
|
1eedae9 |
-typedef bool (*show_queue_fp)(const char* v1, const char* v2, const char* v3, const char* v4, bool useDB);
|
|
|
1eedae9 |
+typedef bool (*show_queue_fp)(const char* v1, const char* v2, const char* v3, const char* v4, const ClassAd *ad, bool useDB);
|
|
|
1eedae9 |
|
|
|
1eedae9 |
static bool read_classad_file(const char *filename, ClassAdList &classads, ClassAdFileParseHelper* pparse_help, const char * constr);
|
|
|
1eedae9 |
static int read_userprio_file(const char *filename, ExtArray<PrioEntry> & prios);
|
|
|
1eedae9 |
@@ -519,7 +519,7 @@ int main (int argc, char **argv)
|
|
|
1eedae9 |
if( better_analyze ) {
|
|
|
1eedae9 |
setupAnalysis();
|
|
|
1eedae9 |
if ((jobads_file != NULL || userlog_file != NULL)) {
|
|
|
1eedae9 |
- retval = show_queue(scheddAddr, scheddName, "Unknown", "Unknown", FALSE);
|
|
|
1eedae9 |
+ retval = show_queue(scheddAddr, scheddName, "Unknown", "Unknown", NULL, FALSE);
|
|
|
1eedae9 |
freeConnectionStrings();
|
|
|
1eedae9 |
exit(retval?EXIT_SUCCESS:EXIT_FAILURE);
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
@@ -601,7 +601,7 @@ int main (int argc, char **argv)
|
|
|
1eedae9 |
|
|
|
1eedae9 |
/* ask the database for the queue */
|
|
|
1eedae9 |
|
|
|
1eedae9 |
- if ( (retval = sqfp( NULL, NULL, NULL, NULL, TRUE) ) ) {
|
|
|
1eedae9 |
+ if ( (retval = sqfp( NULL, NULL, NULL, NULL, NULL, TRUE) ) ) {
|
|
|
1eedae9 |
/* if the queue was retrieved, then I am done */
|
|
|
1eedae9 |
freeConnectionStrings();
|
|
|
1eedae9 |
exit(retval?EXIT_SUCCESS:EXIT_FAILURE);
|
|
|
1eedae9 |
@@ -652,7 +652,7 @@ int main (int argc, char **argv)
|
|
|
1eedae9 |
(quill.name()):tmp_char,
|
|
|
1eedae9 |
(quill.fullHostname())?
|
|
|
1eedae9 |
(quill.fullHostname()):tmp_char,
|
|
|
1eedae9 |
- NULL, FALSE) ) ) )
|
|
|
1eedae9 |
+ NULL, NULL, FALSE) ) ) )
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
/* if the queue was retrieved, then I am done */
|
|
|
1eedae9 |
freeConnectionStrings();
|
|
|
1eedae9 |
@@ -695,7 +695,7 @@ int main (int argc, char **argv)
|
|
|
1eedae9 |
#endif /* HAVE_EXT_POSTGRESQL */
|
|
|
1eedae9 |
case DIRECT_SCHEDD:
|
|
|
1eedae9 |
retval = sqfp(scheddAddr, scheddName, scheddMachine,
|
|
|
1eedae9 |
- scheddVersion.Value(), FALSE);
|
|
|
1eedae9 |
+ scheddVersion.Value(), NULL, FALSE);
|
|
|
1eedae9 |
|
|
|
1eedae9 |
/* Hopefully I got the queue from the schedd... */
|
|
|
1eedae9 |
freeConnectionStrings();
|
|
|
1eedae9 |
@@ -888,7 +888,7 @@ int main (int argc, char **argv)
|
|
|
1eedae9 |
case DIRECT_RDBMS:
|
|
|
1eedae9 |
if (useDB) {
|
|
|
1eedae9 |
if ( (retval = sqfp(quillName, dbIpAddr, dbName,
|
|
|
1eedae9 |
- queryPassword, TRUE) ) )
|
|
|
1eedae9 |
+ queryPassword, ad, TRUE) ) )
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
/* processed correctly, so do the next ad */
|
|
|
1eedae9 |
continue;
|
|
|
1eedae9 |
@@ -935,7 +935,7 @@ int main (int argc, char **argv)
|
|
|
1eedae9 |
|
|
|
1eedae9 |
if((result2 == Q_OK) && quillAddr &&
|
|
|
1eedae9 |
(retval = sqfp(quillAddr, quillName, quillMachine,
|
|
|
1eedae9 |
- NULL, FALSE) ) )
|
|
|
1eedae9 |
+ NULL, ad, FALSE) ) )
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
/* processed correctly, so do the next ad */
|
|
|
1eedae9 |
continue;
|
|
|
1eedae9 |
@@ -991,7 +991,7 @@ int main (int argc, char **argv)
|
|
|
1eedae9 |
case DIRECT_SCHEDD:
|
|
|
1eedae9 |
/* database not configured or could not be reached,
|
|
|
1eedae9 |
query the schedd daemon directly */
|
|
|
1eedae9 |
- retval = sqfp(scheddAddr, scheddName, scheddMachine, scheddVersion.Value(), FALSE);
|
|
|
1eedae9 |
+ retval = sqfp(scheddAddr, scheddName, scheddMachine, scheddVersion.Value(), ad, FALSE);
|
|
|
1eedae9 |
|
|
|
1eedae9 |
break;
|
|
|
1eedae9 |
|
|
|
1eedae9 |
@@ -2655,7 +2655,7 @@ static void init_output_mask()
|
|
|
1eedae9 |
*/
|
|
|
1eedae9 |
|
|
|
1eedae9 |
static bool
|
|
|
1eedae9 |
-show_queue_buffered( const char* v1, const char* v2, const char* v3, const char* v4, bool useDB )
|
|
|
1eedae9 |
+show_queue_buffered( const char* v1, const char* v2, const char* v3, const char* v4, const ClassAd* ad, bool useDB )
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
const char *scheddAddress = 0;
|
|
|
1eedae9 |
const char *scheddName = 0;
|
|
|
1eedae9 |
@@ -2828,7 +2828,13 @@ show_queue_buffered( const char* v1, const char* v2, const char* v3, const char*
|
|
|
1eedae9 |
#endif /* HAVE_EXT_POSTGRESQL */
|
|
|
1eedae9 |
} else {
|
|
|
1eedae9 |
// fetch queue from schedd and stash it in output_buffer.
|
|
|
1eedae9 |
- Daemon schedd(DT_SCHEDD, scheddName, pool ? pool->addr() : NULL );
|
|
|
1eedae9 |
+ Daemon *schedd_ptr = NULL;
|
|
|
1eedae9 |
+ if (ad)
|
|
|
1eedae9 |
+ schedd_ptr = new Daemon(ad, DT_SCHEDD, pool ? pool->addr() : NULL );
|
|
|
1eedae9 |
+ else
|
|
|
1eedae9 |
+ schedd_ptr = new Daemon(DT_SCHEDD, scheddName, pool ? pool->addr() : NULL );
|
|
|
1eedae9 |
+ ASSERT(schedd_ptr);
|
|
|
1eedae9 |
+ Daemon & schedd = *schedd_ptr;
|
|
|
1eedae9 |
const char *version = schedd.version();
|
|
|
1eedae9 |
bool useFastPath = false;
|
|
|
1eedae9 |
if (version) {
|
|
|
1eedae9 |
@@ -2838,9 +2844,12 @@ show_queue_buffered( const char* v1, const char* v2, const char* v3, const char*
|
|
|
1eedae9 |
|
|
|
1eedae9 |
// stash the schedd daemon object for use by process_buffer_line
|
|
|
1eedae9 |
g_cur_schedd_for_process_buffer_line = new Daemon( schedd );
|
|
|
1eedae9 |
+ ASSERT( g_cur_schedd_for_process_buffer_line );
|
|
|
1eedae9 |
+
|
|
|
1eedae9 |
+ delete schedd_ptr;
|
|
|
1eedae9 |
|
|
|
1eedae9 |
int fetchResult;
|
|
|
1eedae9 |
- if( (fetchResult = Q.fetchQueueFromHostAndProcess( scheddAddress, attrs,
|
|
|
1eedae9 |
+ if( (fetchResult = Q.fetchQueueFromDaemonAndProcess( *g_cur_schedd_for_process_buffer_line, attrs,
|
|
|
1eedae9 |
process_buffer_line,
|
|
|
1eedae9 |
useFastPath,
|
|
|
1eedae9 |
&errstack)) != Q_OK) {
|
|
|
1eedae9 |
@@ -3084,7 +3093,7 @@ process_buffer_line( ClassAd *job )
|
|
|
1eedae9 |
refer to the prototype of this function on the top of this file
|
|
|
1eedae9 |
*/
|
|
|
1eedae9 |
static bool
|
|
|
1eedae9 |
-show_queue( const char* v1, const char* v2, const char* v3, const char* v4, bool useDB )
|
|
|
1eedae9 |
+show_queue( const char* v1, const char* v2, const char* v3, const char* v4, const ClassAd * ad, bool useDB )
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
const char *scheddAddress;
|
|
|
1eedae9 |
const char *scheddName;
|
|
|
1eedae9 |
@@ -3198,7 +3207,13 @@ show_queue( const char* v1, const char* v2, const char* v3, const char* v4, bool
|
|
|
1eedae9 |
} else {
|
|
|
1eedae9 |
// fetch queue from schedd
|
|
|
1eedae9 |
int fetchResult;
|
|
|
1eedae9 |
- if( (fetchResult = Q.fetchQueueFromHost(jobs, attrs,scheddAddress, scheddVersion, &errstack) != Q_OK)) {
|
|
|
1eedae9 |
+ Daemon *schedd_daemon_ptr;
|
|
|
1eedae9 |
+ if (ad)
|
|
|
1eedae9 |
+ schedd_daemon_ptr = new Daemon(ad, DT_SCHEDD, pool ? pool->addr() : NULL );
|
|
|
1eedae9 |
+ else
|
|
|
1eedae9 |
+ schedd_daemon_ptr = new Daemon(DT_SCHEDD, scheddName, pool ? pool->addr() : NULL );
|
|
|
1eedae9 |
+ Daemon &schedd_daemon = *schedd_daemon_ptr;
|
|
|
1eedae9 |
+ if( (fetchResult = Q.fetchQueueFromDaemon(jobs, attrs, schedd_daemon, scheddVersion, &errstack) != Q_OK)) {
|
|
|
1eedae9 |
// The parse + fetch failed, print out why
|
|
|
1eedae9 |
switch(fetchResult) {
|
|
|
1eedae9 |
case Q_PARSE_ERROR:
|
|
|
1eedae9 |
@@ -3233,7 +3248,12 @@ show_queue( const char* v1, const char* v2, const char* v3, const char* v4, bool
|
|
|
1eedae9 |
scheddAddress, scheddMachine);
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
- Daemon schedd_daemon(DT_SCHEDD,scheddName,pool ? pool->addr() : NULL);
|
|
|
1eedae9 |
+ Daemon *schedd_daemon_ptr;
|
|
|
1eedae9 |
+ if (ad)
|
|
|
1eedae9 |
+ schedd_daemon_ptr = new Daemon(ad, DT_SCHEDD, pool ? pool->addr() : NULL );
|
|
|
1eedae9 |
+ else
|
|
|
1eedae9 |
+ schedd_daemon_ptr = new Daemon(DT_SCHEDD, scheddName, pool ? pool->addr() : NULL );
|
|
|
1eedae9 |
+ Daemon &schedd_daemon = *schedd_daemon_ptr;
|
|
|
1eedae9 |
if ( ! analyze_no_schedd)
|
|
|
1eedae9 |
schedd_daemon.locate();
|
|
|
1eedae9 |
|
|
|
1eedae9 |
@@ -3242,6 +3262,7 @@ show_queue( const char* v1, const char* v2, const char* v3, const char* v4, bool
|
|
|
1eedae9 |
doRunAnalysis( job, analyze_no_schedd ? NULL : &schedd_daemon );
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
jobs.Close();
|
|
|
1eedae9 |
+ delete schedd_daemon_ptr;
|
|
|
1eedae9 |
|
|
|
1eedae9 |
if(lastUpdate) {
|
|
|
1eedae9 |
free(lastUpdate);
|
|
|
1eedae9 |
diff --git a/src/condor_schedd.V6/qmgmt_receivers.cpp b/src/condor_schedd.V6/qmgmt_receivers.cpp
|
|
|
1eedae9 |
index 32da39e..7906290 100644
|
|
|
1eedae9 |
--- a/src/condor_schedd.V6/qmgmt_receivers.cpp
|
|
|
1eedae9 |
+++ b/src/condor_schedd.V6/qmgmt_receivers.cpp
|
|
|
1eedae9 |
@@ -71,7 +71,7 @@ do_Q_request(ReliSock *syscall_sock,bool &may_fork)
|
|
|
1eedae9 |
dprintf(D_SECURITY,"Calling authenticate(%s) in qmgmt_receivers\n", methods.Value());
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
CondorError errstack;
|
|
|
1eedae9 |
- if( ! SecMan::authenticate_sock(syscall_sock, WRITE, &errstack) ) {
|
|
|
1eedae9 |
+ if( ! SecMan::authenticate_sock(syscall_sock, WRITE, &errstack, NULL) ) {
|
|
|
1eedae9 |
// Failed to authenticate
|
|
|
1eedae9 |
dprintf( D_ALWAYS, "SCHEDD: authentication failed: %s\n",
|
|
|
1eedae9 |
errstack.getFullText().c_str() );
|
|
|
1eedae9 |
diff --git a/src/condor_schedd.V6/qmgr_job_updater.cpp b/src/condor_schedd.V6/qmgr_job_updater.cpp
|
|
|
1eedae9 |
index 6c9d62a..aeb2e39 100644
|
|
|
1eedae9 |
--- a/src/condor_schedd.V6/qmgr_job_updater.cpp
|
|
|
1eedae9 |
+++ b/src/condor_schedd.V6/qmgr_job_updater.cpp
|
|
|
1eedae9 |
@@ -47,8 +47,10 @@ QmgrJobUpdater::QmgrJobUpdater( ClassAd* job, const char* schedd_address,
|
|
|
1eedae9 |
schedd_addr(schedd_address?strdup(schedd_address):0),
|
|
|
1eedae9 |
schedd_ver(schedd_version?strdup(schedd_version):0),
|
|
|
1eedae9 |
cluster(-1), proc(-1),
|
|
|
1eedae9 |
- q_update_tid(-1)
|
|
|
1eedae9 |
+ q_update_tid(-1),
|
|
|
1eedae9 |
+ m_daemon(DT_SCHEDD, schedd_address)
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
+
|
|
|
1eedae9 |
if( ! is_valid_sinful(schedd_address) ) {
|
|
|
1eedae9 |
EXCEPT( "schedd_addr not specified with valid address (%s)",
|
|
|
1eedae9 |
schedd_address );
|
|
|
1eedae9 |
@@ -252,7 +254,7 @@ QmgrJobUpdater::updateAttr( const char *name, const char *expr, bool updateMaste
|
|
|
1eedae9 |
if (log) {
|
|
|
1eedae9 |
flags = SHOULDLOG;
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
- if( ConnectQ(schedd_addr,SHADOW_QMGMT_TIMEOUT,false,NULL,m_owner.Value(),schedd_ver) ) {
|
|
|
1eedae9 |
+ if( ConnectQ(m_daemon,SHADOW_QMGMT_TIMEOUT,false,NULL,m_owner.Value(),schedd_ver) ) {
|
|
|
1eedae9 |
if( SetAttribute(cluster,p,name,expr,flags) < 0 ) {
|
|
|
1eedae9 |
err_msg = "SetAttribute() failed";
|
|
|
1eedae9 |
result = FALSE;
|
|
|
1eedae9 |
@@ -338,7 +340,7 @@ QmgrJobUpdater::updateJob( update_t type, SetAttributeFlags_t commit_flags )
|
|
|
1eedae9 |
job_queue_attrs->contains_anycase(name)) ) {
|
|
|
1eedae9 |
|
|
|
1eedae9 |
if( ! is_connected ) {
|
|
|
1eedae9 |
- if( ! ConnectQ(schedd_addr, SHADOW_QMGMT_TIMEOUT, false, NULL, m_owner.Value(),schedd_ver) ) {
|
|
|
1eedae9 |
+ if( ! ConnectQ(m_daemon, SHADOW_QMGMT_TIMEOUT, false, NULL, m_owner.Value(),schedd_ver) ) {
|
|
|
1eedae9 |
return false;
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
is_connected = true;
|
|
|
1eedae9 |
@@ -351,7 +353,7 @@ QmgrJobUpdater::updateJob( update_t type, SetAttributeFlags_t commit_flags )
|
|
|
1eedae9 |
m_pull_attrs->rewind();
|
|
|
1eedae9 |
while ( (name = m_pull_attrs->next()) ) {
|
|
|
1eedae9 |
if ( !is_connected ) {
|
|
|
1eedae9 |
- if ( !ConnectQ( schedd_addr, SHADOW_QMGMT_TIMEOUT, true, NULL, NULL, schedd_ver ) ) {
|
|
|
1eedae9 |
+ if ( !ConnectQ( m_daemon, SHADOW_QMGMT_TIMEOUT, true, NULL, NULL, schedd_ver ) ) {
|
|
|
1eedae9 |
return false;
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
is_connected = true;
|
|
|
1eedae9 |
@@ -392,7 +394,7 @@ QmgrJobUpdater::retrieveJobUpdates( void )
|
|
|
1eedae9 |
ProcIdToStr(cluster, proc, id_str);
|
|
|
1eedae9 |
job_ids.insert(id_str);
|
|
|
1eedae9 |
|
|
|
1eedae9 |
- if ( !ConnectQ( schedd_addr, SHADOW_QMGMT_TIMEOUT, false ) ) {
|
|
|
1eedae9 |
+ if ( !ConnectQ( m_daemon, SHADOW_QMGMT_TIMEOUT, false ) ) {
|
|
|
1eedae9 |
return false;
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
if ( GetDirtyAttributes( cluster, proc, &updates ) < 0 ) {
|
|
|
1eedae9 |
diff --git a/src/condor_schedd.V6/qmgr_job_updater.h b/src/condor_schedd.V6/qmgr_job_updater.h
|
|
|
1eedae9 |
index f897ae1..9980535 100644
|
|
|
1eedae9 |
--- a/src/condor_schedd.V6/qmgr_job_updater.h
|
|
|
1eedae9 |
+++ b/src/condor_schedd.V6/qmgr_job_updater.h
|
|
|
1eedae9 |
@@ -47,7 +47,7 @@ class QmgrJobUpdater : public Service
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
public:
|
|
|
1eedae9 |
QmgrJobUpdater( ClassAd* job_a, const char*schedd_address, char const *schedd_version);
|
|
|
1eedae9 |
- QmgrJobUpdater( ) : common_job_queue_attrs(0), hold_job_queue_attrs(0), evict_job_queue_attrs(0), remove_job_queue_attrs(0), requeue_job_queue_attrs(0), terminate_job_queue_attrs(0), checkpoint_job_queue_attrs(0), x509_job_queue_attrs(0), m_pull_attrs(0), job_ad(0), schedd_addr(0), schedd_ver(0), cluster(-1), proc(-1), q_update_tid(-1) {}
|
|
|
1eedae9 |
+ QmgrJobUpdater( ) : common_job_queue_attrs(0), hold_job_queue_attrs(0), evict_job_queue_attrs(0), remove_job_queue_attrs(0), requeue_job_queue_attrs(0), terminate_job_queue_attrs(0), checkpoint_job_queue_attrs(0), x509_job_queue_attrs(0), m_pull_attrs(0), job_ad(0), schedd_addr(0), schedd_ver(0), cluster(-1), proc(-1), q_update_tid(-1), m_daemon(DT_SCHEDD, NULL) {}
|
|
|
1eedae9 |
virtual ~QmgrJobUpdater();
|
|
|
1eedae9 |
|
|
|
1eedae9 |
virtual void startUpdateTimer( void );
|
|
|
1eedae9 |
@@ -148,6 +148,8 @@ private:
|
|
|
1eedae9 |
int proc;
|
|
|
1eedae9 |
|
|
|
1eedae9 |
int q_update_tid;
|
|
|
1eedae9 |
+
|
|
|
1eedae9 |
+ Daemon m_daemon;
|
|
|
1eedae9 |
};
|
|
|
1eedae9 |
|
|
|
1eedae9 |
// usefull if you don't want to update the job queue
|
|
|
1eedae9 |
diff --git a/src/condor_schedd.V6/qmgr_lib_support.cpp b/src/condor_schedd.V6/qmgr_lib_support.cpp
|
|
|
1eedae9 |
index b646a1ca..38c6b12 100644
|
|
|
1eedae9 |
--- a/src/condor_schedd.V6/qmgr_lib_support.cpp
|
|
|
1eedae9 |
+++ b/src/condor_schedd.V6/qmgr_lib_support.cpp
|
|
|
1eedae9 |
@@ -34,8 +34,9 @@ ReliSock *qmgmt_sock = NULL;
|
|
|
1eedae9 |
static Qmgr_connection connection;
|
|
|
1eedae9 |
|
|
|
1eedae9 |
Qmgr_connection *
|
|
|
1eedae9 |
-ConnectQ(const char *qmgr_location, int timeout, bool read_only, CondorError* errstack, const char *effective_owner, const char* schedd_version_str )
|
|
|
1eedae9 |
+ConnectQ(Daemon &d, int timeout, bool read_only, CondorError* errstack, const char *effective_owner, const char* schedd_version_str )
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
+
|
|
|
1eedae9 |
int rval, ok;
|
|
|
1eedae9 |
int cmd = read_only ? QMGMT_READ_CMD : QMGMT_WRITE_CMD;
|
|
|
1eedae9 |
|
|
|
1eedae9 |
@@ -54,15 +55,10 @@ ConnectQ(const char *qmgr_location, int timeout, bool read_only, CondorError* er
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
// no connection active as of now; create a new one
|
|
|
1eedae9 |
- Daemon d( DT_SCHEDD, qmgr_location );
|
|
|
1eedae9 |
+ dprintf(D_HOSTNAME, "Hostname of new connection: %s\n", d.fullHostname());
|
|
|
1eedae9 |
if( ! d.locate() ) {
|
|
|
1eedae9 |
ok = FALSE;
|
|
|
1eedae9 |
- if( qmgr_location ) {
|
|
|
1eedae9 |
- dprintf( D_ALWAYS, "Can't find address of queue manager %s\n",
|
|
|
1eedae9 |
- qmgr_location );
|
|
|
1eedae9 |
- } else {
|
|
|
1eedae9 |
- dprintf( D_ALWAYS, "Can't find address of local queue manager\n" );
|
|
|
1eedae9 |
- }
|
|
|
1eedae9 |
+ dprintf( D_ALWAYS, "Can't find address of queue manager\n" );
|
|
|
1eedae9 |
} else {
|
|
|
1eedae9 |
// QMGMT_WRITE_CMD didn't exist before 7.5.0, so use QMGMT_READ_CMD
|
|
|
1eedae9 |
// when talking to older schedds
|
|
|
1eedae9 |
@@ -104,7 +100,7 @@ ConnectQ(const char *qmgr_location, int timeout, bool read_only, CondorError* er
|
|
|
1eedae9 |
// the connection, because this command is registered with
|
|
|
1eedae9 |
// force_authentication=true on the server side.
|
|
|
1eedae9 |
if( cmd == QMGMT_WRITE_CMD && !qmgmt_sock->triedAuthentication()) {
|
|
|
1eedae9 |
- if( !SecMan::authenticate_sock(qmgmt_sock, CLIENT_PERM, errstack_select ) )
|
|
|
1eedae9 |
+ if( !SecMan::authenticate_sock(qmgmt_sock, CLIENT_PERM, errstack_select, d.fullHostname()) )
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
delete qmgmt_sock;
|
|
|
1eedae9 |
qmgmt_sock = NULL;
|
|
|
1eedae9 |
@@ -155,7 +151,7 @@ ConnectQ(const char *qmgr_location, int timeout, bool read_only, CondorError* er
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
if ( !read_only ) {
|
|
|
1eedae9 |
- if (!SecMan::authenticate_sock(qmgmt_sock, CLIENT_PERM, errstack_select)) {
|
|
|
1eedae9 |
+ if (!SecMan::authenticate_sock(qmgmt_sock, CLIENT_PERM, errstack_select, d.fullHostname())) {
|
|
|
1eedae9 |
delete qmgmt_sock;
|
|
|
1eedae9 |
qmgmt_sock = NULL;
|
|
|
1eedae9 |
if (!errstack) {
|
|
|
1eedae9 |
diff --git a/src/condor_schedd.V6/schedd.cpp b/src/condor_schedd.V6/schedd.cpp
|
|
|
1eedae9 |
index b122c68..b702e2c 100644
|
|
|
1eedae9 |
--- a/src/condor_schedd.V6/schedd.cpp
|
|
|
1eedae9 |
+++ b/src/condor_schedd.V6/schedd.cpp
|
|
|
1eedae9 |
@@ -3457,7 +3457,7 @@ Scheduler::spoolJobFiles(int mode, Stream* s)
|
|
|
1eedae9 |
|
|
|
1eedae9 |
if( ! rsock->triedAuthentication() ) {
|
|
|
1eedae9 |
CondorError errstack;
|
|
|
1eedae9 |
- if( ! SecMan::authenticate_sock(rsock, WRITE, &errstack) ) {
|
|
|
1eedae9 |
+ if( ! SecMan::authenticate_sock(rsock, WRITE, &errstack, NULL) ) {
|
|
|
1eedae9 |
// we failed to authenticate, we should bail out now
|
|
|
1eedae9 |
// since we don't know what user is trying to perform
|
|
|
1eedae9 |
// this action.
|
|
|
1eedae9 |
@@ -3729,7 +3729,7 @@ Scheduler::updateGSICred(int cmd, Stream* s)
|
|
|
1eedae9 |
|
|
|
1eedae9 |
if( ! rsock->triedAuthentication() ) {
|
|
|
1eedae9 |
CondorError errstack;
|
|
|
1eedae9 |
- if( ! SecMan::authenticate_sock(rsock, WRITE, &errstack) ) {
|
|
|
1eedae9 |
+ if( ! SecMan::authenticate_sock(rsock, WRITE, &errstack, NULL) ) {
|
|
|
1eedae9 |
// we failed to authenticate, we should bail out now
|
|
|
1eedae9 |
// since we don't know what user is trying to perform
|
|
|
1eedae9 |
// this action.
|
|
|
1eedae9 |
@@ -3940,7 +3940,7 @@ Scheduler::actOnJobs(int, Stream* s)
|
|
|
1eedae9 |
rsock->decode();
|
|
|
1eedae9 |
if( ! rsock->triedAuthentication() ) {
|
|
|
1eedae9 |
CondorError errstack;
|
|
|
1eedae9 |
- if( ! SecMan::authenticate_sock(rsock, WRITE, &errstack) ) {
|
|
|
1eedae9 |
+ if( ! SecMan::authenticate_sock(rsock, WRITE, &errstack, NULL) ) {
|
|
|
1eedae9 |
// we failed to authenticate, we should bail out now
|
|
|
1eedae9 |
// since we don't know what user is trying to perform
|
|
|
1eedae9 |
// this action.
|
|
|
1eedae9 |
@@ -12202,7 +12202,7 @@ Scheduler::get_job_connect_info_handler_implementation(int, Stream* s) {
|
|
|
1eedae9 |
// force authentication
|
|
|
1eedae9 |
if( !sock->triedAuthentication() ) {
|
|
|
1eedae9 |
CondorError errstack;
|
|
|
1eedae9 |
- if( ! SecMan::authenticate_sock(sock, WRITE, &errstack) ||
|
|
|
1eedae9 |
+ if( ! SecMan::authenticate_sock(sock, WRITE, &errstack, NULL) ||
|
|
|
1eedae9 |
! sock->getFullyQualifiedUser() )
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
dprintf( D_ALWAYS,
|
|
|
1eedae9 |
@@ -13243,7 +13243,7 @@ Scheduler::claimLocalStartd()
|
|
|
1eedae9 |
CondorQuery query(STARTD_AD);
|
|
|
1eedae9 |
QueryResult q;
|
|
|
1eedae9 |
ClassAdList result;
|
|
|
1eedae9 |
- q = query.fetchAds(result, startd_addr, &errstack);
|
|
|
1eedae9 |
+ q = query.fetchAds(result, startd, &errstack);
|
|
|
1eedae9 |
if ( q != Q_OK ) {
|
|
|
1eedae9 |
dprintf(D_FULLDEBUG,
|
|
|
1eedae9 |
"ERROR: could not fetch ads from local startd : %s (%s)\n",
|
|
|
1eedae9 |
@@ -13752,7 +13752,7 @@ Scheduler::RecycleShadow(int /*cmd*/, Stream *stream)
|
|
|
1eedae9 |
sock->decode();
|
|
|
1eedae9 |
if( !sock->triedAuthentication() ) {
|
|
|
1eedae9 |
CondorError errstack;
|
|
|
1eedae9 |
- if( ! SecMan::authenticate_sock(sock, WRITE, &errstack) ||
|
|
|
1eedae9 |
+ if( ! SecMan::authenticate_sock(sock, WRITE, &errstack, NULL) ||
|
|
|
1eedae9 |
! sock->getFullyQualifiedUser() )
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
dprintf( D_ALWAYS,
|
|
|
1eedae9 |
@@ -13962,7 +13962,7 @@ Scheduler::clear_dirty_job_attrs_handler(int /*cmd*/, Stream *stream)
|
|
|
1eedae9 |
sock->decode();
|
|
|
1eedae9 |
if( !sock->triedAuthentication() ) {
|
|
|
1eedae9 |
CondorError errstack;
|
|
|
1eedae9 |
- if( ! SecMan::authenticate_sock(sock, WRITE, &errstack) ||
|
|
|
1eedae9 |
+ if( ! SecMan::authenticate_sock(sock, WRITE, &errstack, NULL) ||
|
|
|
1eedae9 |
! sock->getFullyQualifiedUser() )
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
dprintf( D_ALWAYS,
|
|
|
1eedae9 |
diff --git a/src/condor_schedd.V6/schedd_td.cpp b/src/condor_schedd.V6/schedd_td.cpp
|
|
|
1eedae9 |
index 0977c7a..db79420 100644
|
|
|
1eedae9 |
--- a/src/condor_schedd.V6/schedd_td.cpp
|
|
|
1eedae9 |
+++ b/src/condor_schedd.V6/schedd_td.cpp
|
|
|
1eedae9 |
@@ -76,7 +76,7 @@ Scheduler::requestSandboxLocation(int mode, Stream* s)
|
|
|
1eedae9 |
|
|
|
1eedae9 |
if( ! rsock->triedAuthentication() ) {
|
|
|
1eedae9 |
CondorError errstack;
|
|
|
1eedae9 |
- if( ! SecMan::authenticate_sock(rsock, WRITE, &errstack) ) {
|
|
|
1eedae9 |
+ if( ! SecMan::authenticate_sock(rsock, WRITE, &errstack, NULL) ) {
|
|
|
1eedae9 |
// we failed to authenticate, we should bail out now
|
|
|
1eedae9 |
// since we don't know what user is trying to perform
|
|
|
1eedae9 |
// this action.
|
|
|
1eedae9 |
diff --git a/src/condor_schedd.V6/tdman.cpp b/src/condor_schedd.V6/tdman.cpp
|
|
|
1eedae9 |
index c435ccf..6c47243 100644
|
|
|
1eedae9 |
--- a/src/condor_schedd.V6/tdman.cpp
|
|
|
1eedae9 |
+++ b/src/condor_schedd.V6/tdman.cpp
|
|
|
1eedae9 |
@@ -869,7 +869,7 @@ TDMan::transferd_registration(int cmd, Stream *sock)
|
|
|
1eedae9 |
///////////////////////////////////////////////////////////////
|
|
|
1eedae9 |
if( ! rsock->triedAuthentication() ) {
|
|
|
1eedae9 |
CondorError errstack;
|
|
|
1eedae9 |
- if( ! SecMan::authenticate_sock(rsock, WRITE, &errstack) ) {
|
|
|
1eedae9 |
+ if( ! SecMan::authenticate_sock(rsock, WRITE, &errstack, NULL) ) {
|
|
|
1eedae9 |
// we failed to authenticate, we should bail out now
|
|
|
1eedae9 |
// since we don't know what user is trying to perform
|
|
|
1eedae9 |
// this action.
|
|
|
1eedae9 |
diff --git a/src/condor_status.V6/status.cpp b/src/condor_status.V6/status.cpp
|
|
|
1eedae9 |
index 651b0f2..e6c06a4 100644
|
|
|
1eedae9 |
--- a/src/condor_status.V6/status.cpp
|
|
|
1eedae9 |
+++ b/src/condor_status.V6/status.cpp
|
|
|
1eedae9 |
@@ -444,14 +444,19 @@ main (int argc, char *argv[])
|
|
|
1eedae9 |
// subsystem that corresponds to a daemon (above).
|
|
|
1eedae9 |
// Here 'addr' represents either the host:port of requested pool, or
|
|
|
1eedae9 |
// alternatively the host:port of daemon associated with requested subsystem (direct mode)
|
|
|
1eedae9 |
- q = query->fetchAds (result, addr, &errstack);
|
|
|
1eedae9 |
+
|
|
|
1eedae9 |
+ // If we are querying the same collector as before, reuse that object.
|
|
|
1eedae9 |
+ // This is important for hostname resolution.
|
|
|
1eedae9 |
+ if (!direct)
|
|
|
1eedae9 |
+ q = query->fetchAds (result, *pool, &errstack);
|
|
|
1eedae9 |
+ else
|
|
|
1eedae9 |
+ q = query->fetchAds (result, addr, &errstack);
|
|
|
1eedae9 |
} else {
|
|
|
1eedae9 |
// otherwise obtain list of collectors and submit query that way
|
|
|
1eedae9 |
CollectorList * collectors = CollectorList::create();
|
|
|
1eedae9 |
q = collectors->query (*query, result, &errstack);
|
|
|
1eedae9 |
delete collectors;
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
-
|
|
|
1eedae9 |
|
|
|
1eedae9 |
// if any error was encountered during the query, report it and exit
|
|
|
1eedae9 |
if (Q_OK != q) {
|
|
|
1eedae9 |
diff --git a/src/condor_submit.V6/submit.cpp b/src/condor_submit.V6/submit.cpp
|
|
|
1eedae9 |
index f6f38e9..950731d 100644
|
|
|
1eedae9 |
--- a/src/condor_submit.V6/submit.cpp
|
|
|
1eedae9 |
+++ b/src/condor_submit.V6/submit.cpp
|
|
|
1eedae9 |
@@ -6278,7 +6278,8 @@ connect_to_the_schedd()
|
|
|
1eedae9 |
setupAuthentication();
|
|
|
1eedae9 |
|
|
|
1eedae9 |
CondorError errstack;
|
|
|
1eedae9 |
- if( ConnectQ(MySchedd->addr(), 0 /* default */, false /* default */, &errstack, NULL, MySchedd->version() ) == 0 ) {
|
|
|
1eedae9 |
+ ASSERT(MySchedd);
|
|
|
1eedae9 |
+ if( ConnectQ(*MySchedd, 0 /* default */, false /* default */, &errstack, NULL, MySchedd->version() ) == 0 ) {
|
|
|
1eedae9 |
if( ScheddName ) {
|
|
|
1eedae9 |
fprintf( stderr,
|
|
|
1eedae9 |
"\nERROR: Failed to connect to queue manager %s\n%s\n",
|
|
|
1eedae9 |
@@ -7244,7 +7245,8 @@ DoCleanup(int,int,const char*)
|
|
|
1eedae9 |
// DoCleanup(). This lead to infinite recursion which is bad.
|
|
|
1eedae9 |
ClusterCreated = 0;
|
|
|
1eedae9 |
if (!ActiveQueueConnection) {
|
|
|
1eedae9 |
- ActiveQueueConnection = (ConnectQ(MySchedd->addr()) != 0);
|
|
|
1eedae9 |
+ ASSERT( MySchedd );
|
|
|
1eedae9 |
+ ActiveQueueConnection = (ConnectQ(*MySchedd) != 0);
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
if (ActiveQueueConnection) {
|
|
|
1eedae9 |
// Call DestroyCluster() now in an attempt to get the schedd
|
|
|
1eedae9 |
diff --git a/src/condor_tools/preen.cpp b/src/condor_tools/preen.cpp
|
|
|
1eedae9 |
index 584883e..dda41c9 100644
|
|
|
1eedae9 |
--- a/src/condor_tools/preen.cpp
|
|
|
1eedae9 |
+++ b/src/condor_tools/preen.cpp
|
|
|
1eedae9 |
@@ -353,7 +353,8 @@ check_spool_dir()
|
|
|
1eedae9 |
well_known_list.append( ".pgpass" );
|
|
|
1eedae9 |
|
|
|
1eedae9 |
// connect to the Q manager
|
|
|
1eedae9 |
- if (!(qmgr = ConnectQ (0))) {
|
|
|
1eedae9 |
+ Daemon d(DT_SCHEDD, 0);
|
|
|
1eedae9 |
+ if (!(qmgr = ConnectQ (d))) {
|
|
|
1eedae9 |
dprintf( D_ALWAYS, "Not cleaning spool directory: Can't contact schedd\n" );
|
|
|
1eedae9 |
return;
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
diff --git a/src/condor_tools/qedit.cpp b/src/condor_tools/qedit.cpp
|
|
|
1eedae9 |
index 06b90d4..be2ca99 100644
|
|
|
1eedae9 |
--- a/src/condor_tools/qedit.cpp
|
|
|
1eedae9 |
+++ b/src/condor_tools/qedit.cpp
|
|
|
1eedae9 |
@@ -128,7 +128,7 @@ main(int argc, char *argv[])
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
// Open job queue
|
|
|
1eedae9 |
- q = ConnectQ( schedd.addr(), 0, false, NULL, NULL, schedd.version() );
|
|
|
1eedae9 |
+ q = ConnectQ( schedd, 0, false, NULL, NULL, schedd.version() );
|
|
|
1eedae9 |
if( !q ) {
|
|
|
1eedae9 |
fprintf( stderr, "Failed to connect to queue manager %s\n",
|
|
|
1eedae9 |
schedd.addr() );
|
|
|
1eedae9 |
diff --git a/src/condor_tools/tool.cpp b/src/condor_tools/tool.cpp
|
|
|
1eedae9 |
index d95a03c..78ece68 100644
|
|
|
1eedae9 |
--- a/src/condor_tools/tool.cpp
|
|
|
1eedae9 |
+++ b/src/condor_tools/tool.cpp
|
|
|
1eedae9 |
@@ -1164,8 +1164,8 @@ resolveNames( DaemonList* daemon_list, StringList* name_list )
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
|
|
|
1eedae9 |
- if (pool_addr) {
|
|
|
1eedae9 |
- q_result = query.fetchAds(ads, pool_addr, &errstack);
|
|
|
1eedae9 |
+ if (pool) {
|
|
|
1eedae9 |
+ q_result = query.fetchAds(ads, *pool, &errstack);
|
|
|
1eedae9 |
} else {
|
|
|
1eedae9 |
CollectorList * collectors = CollectorList::create();
|
|
|
1eedae9 |
q_result = collectors->query (query, ads);
|
|
|
1eedae9 |
diff --git a/src/condor_transferd/td_init.cpp b/src/condor_transferd/td_init.cpp
|
|
|
1eedae9 |
index 32c7e0f..695f8d3 100644
|
|
|
1eedae9 |
--- a/src/condor_transferd/td_init.cpp
|
|
|
1eedae9 |
+++ b/src/condor_transferd/td_init.cpp
|
|
|
1eedae9 |
@@ -277,7 +277,7 @@ TransferD::setup_transfer_request_handler(int /*cmd*/, Stream *sock)
|
|
|
1eedae9 |
///////////////////////////////////////////////////////////////
|
|
|
1eedae9 |
if( ! rsock->triedAuthentication() ) {
|
|
|
1eedae9 |
CondorError errstack;
|
|
|
1eedae9 |
- if( ! SecMan::authenticate_sock(rsock, WRITE, &errstack) ) {
|
|
|
1eedae9 |
+ if( ! SecMan::authenticate_sock(rsock, WRITE, &errstack, NULL) ) {
|
|
|
1eedae9 |
// we failed to authenticate, we should bail out now
|
|
|
1eedae9 |
// since we don't know what user is trying to perform
|
|
|
1eedae9 |
// this action.
|
|
|
1eedae9 |
diff --git a/src/condor_transferd/td_read_files.cpp b/src/condor_transferd/td_read_files.cpp
|
|
|
1eedae9 |
index f476c72..94d790a 100644
|
|
|
1eedae9 |
--- a/src/condor_transferd/td_read_files.cpp
|
|
|
1eedae9 |
+++ b/src/condor_transferd/td_read_files.cpp
|
|
|
1eedae9 |
@@ -65,7 +65,7 @@ TransferD::read_files_handler(int /* cmd */, Stream *sock)
|
|
|
1eedae9 |
/////////////////////////////////////////////////////////////////////////
|
|
|
1eedae9 |
if( ! rsock->triedAuthentication() ) {
|
|
|
1eedae9 |
CondorError errstack;
|
|
|
1eedae9 |
- if( ! SecMan::authenticate_sock(rsock, WRITE, &errstack) ) {
|
|
|
1eedae9 |
+ if( ! SecMan::authenticate_sock(rsock, WRITE, &errstack, NULL) ) {
|
|
|
1eedae9 |
// we failed to authenticate, we should bail out now
|
|
|
1eedae9 |
// since we don't know what user is trying to perform
|
|
|
1eedae9 |
// this action.
|
|
|
1eedae9 |
diff --git a/src/condor_transferd/td_write_files.cpp b/src/condor_transferd/td_write_files.cpp
|
|
|
1eedae9 |
index a108ffe..5265150 100644
|
|
|
1eedae9 |
--- a/src/condor_transferd/td_write_files.cpp
|
|
|
1eedae9 |
+++ b/src/condor_transferd/td_write_files.cpp
|
|
|
1eedae9 |
@@ -65,7 +65,7 @@ TransferD::write_files_handler(int /* cmd */, Stream *sock)
|
|
|
1eedae9 |
/////////////////////////////////////////////////////////////////////////
|
|
|
1eedae9 |
if( ! rsock->triedAuthentication() ) {
|
|
|
1eedae9 |
CondorError errstack;
|
|
|
1eedae9 |
- if( ! SecMan::authenticate_sock(rsock, WRITE, &errstack) ) {
|
|
|
1eedae9 |
+ if( ! SecMan::authenticate_sock(rsock, WRITE, &errstack, NULL) ) {
|
|
|
1eedae9 |
// we failed to authenticate, we should bail out now
|
|
|
1eedae9 |
// since we don't know what user is trying to perform
|
|
|
1eedae9 |
// this action.
|
|
|
1eedae9 |
diff --git a/src/condor_utils/classad_command_util.cpp b/src/condor_utils/classad_command_util.cpp
|
|
|
1eedae9 |
index e498d7f..3be7db3 100644
|
|
|
1eedae9 |
--- a/src/condor_utils/classad_command_util.cpp
|
|
|
1eedae9 |
+++ b/src/condor_utils/classad_command_util.cpp
|
|
|
1eedae9 |
@@ -92,7 +92,7 @@ getCmdFromReliSock( ReliSock* s, ClassAd* ad, bool force_auth )
|
|
|
1eedae9 |
s->decode();
|
|
|
1eedae9 |
if( force_auth && ! s->triedAuthentication() ) {
|
|
|
1eedae9 |
CondorError errstack;
|
|
|
1eedae9 |
- if( ! SecMan::authenticate_sock(s, WRITE, &errstack) ) {
|
|
|
1eedae9 |
+ if( ! SecMan::authenticate_sock(s, WRITE, &errstack, NULL) ) {
|
|
|
1eedae9 |
// we failed to authenticate, we should bail out now
|
|
|
1eedae9 |
// since we don't know what user is trying to perform
|
|
|
1eedae9 |
// this action.
|
|
|
1eedae9 |
diff --git a/src/condor_utils/condor_q.cpp b/src/condor_utils/condor_q.cpp
|
|
|
1eedae9 |
index b53dcf8..0eb3b03 100644
|
|
|
1eedae9 |
--- a/src/condor_utils/condor_q.cpp
|
|
|
1eedae9 |
+++ b/src/condor_utils/condor_q.cpp
|
|
|
1eedae9 |
@@ -28,6 +28,7 @@
|
|
|
1eedae9 |
#include "CondorError.h"
|
|
|
1eedae9 |
#include "condor_classad.h"
|
|
|
1eedae9 |
#include "quill_enums.h"
|
|
|
1eedae9 |
+#include "daemon.h"
|
|
|
1eedae9 |
|
|
|
1eedae9 |
#ifdef HAVE_EXT_POSTGRESQL
|
|
|
1eedae9 |
#include "pgsqldatabase.h"
|
|
|
1eedae9 |
@@ -230,7 +231,8 @@ fetchQueue (ClassAdList &list, StringList &attrs, ClassAd *ad, CondorError* errs
|
|
|
1eedae9 |
if (ad == 0)
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
// local case
|
|
|
1eedae9 |
- if( !(qmgr = ConnectQ( 0, connect_timeout, true, errstack)) ) {
|
|
|
1eedae9 |
+ Daemon d(DT_SCHEDD, 0, 0);
|
|
|
1eedae9 |
+ if( !(qmgr = ConnectQ( d, connect_timeout, true, errstack)) ) {
|
|
|
1eedae9 |
errstack->push("TEST", 0, "FOO");
|
|
|
1eedae9 |
return Q_SCHEDD_COMMUNICATION_ERROR;
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
@@ -241,8 +243,9 @@ fetchQueue (ClassAdList &list, StringList &attrs, ClassAd *ad, CondorError* errs
|
|
|
1eedae9 |
// remote case to handle condor_globalq
|
|
|
1eedae9 |
if (!ad->LookupString (ATTR_SCHEDD_IP_ADDR, scheddString, sizeof(scheddString)))
|
|
|
1eedae9 |
return Q_NO_SCHEDD_IP_ADDR;
|
|
|
1eedae9 |
+ Daemon d(ad, DT_SCHEDD, NULL);
|
|
|
1eedae9 |
|
|
|
1eedae9 |
- if( !(qmgr = ConnectQ( scheddString, connect_timeout, true, errstack)) )
|
|
|
1eedae9 |
+ if( !(qmgr = ConnectQ( d, connect_timeout, true, errstack)) )
|
|
|
1eedae9 |
return Q_SCHEDD_COMMUNICATION_ERROR;
|
|
|
1eedae9 |
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
@@ -255,7 +258,7 @@ fetchQueue (ClassAdList &list, StringList &attrs, ClassAd *ad, CondorError* errs
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
int CondorQ::
|
|
|
1eedae9 |
-fetchQueueFromHost (ClassAdList &list, StringList &attrs, const char *host, char const *schedd_version, CondorError* errstack)
|
|
|
1eedae9 |
+fetchQueueFromDaemon (ClassAdList &list, StringList &attrs, Daemon &daemon, char const *schedd_version, CondorError* errstack)
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
Qmgr_connection *qmgr;
|
|
|
1eedae9 |
ExprTree *tree;
|
|
|
1eedae9 |
@@ -276,7 +279,7 @@ fetchQueueFromHost (ClassAdList &list, StringList &attrs, const char *host, char
|
|
|
1eedae9 |
optimal. :^).
|
|
|
1eedae9 |
*/
|
|
|
1eedae9 |
init(); // needed to get default connect_timeout
|
|
|
1eedae9 |
- if( !(qmgr = ConnectQ( host, connect_timeout, true, errstack)) )
|
|
|
1eedae9 |
+ if( !(qmgr = ConnectQ( daemon, connect_timeout, true, errstack)) )
|
|
|
1eedae9 |
return Q_SCHEDD_COMMUNICATION_ERROR;
|
|
|
1eedae9 |
|
|
|
1eedae9 |
bool useFastPath = false;
|
|
|
1eedae9 |
@@ -353,7 +356,7 @@ CondorQ::fetchQueueFromDB (ClassAdList &list,
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
int
|
|
|
1eedae9 |
-CondorQ::fetchQueueFromHostAndProcess ( const char *host,
|
|
|
1eedae9 |
+CondorQ::fetchQueueFromDaemonAndProcess ( Daemon &daemon,
|
|
|
1eedae9 |
StringList &attrs,
|
|
|
1eedae9 |
process_function process_func,
|
|
|
1eedae9 |
bool useFastPath,
|
|
|
1eedae9 |
@@ -378,7 +381,7 @@ CondorQ::fetchQueueFromHostAndProcess ( const char *host,
|
|
|
1eedae9 |
optimal. :^).
|
|
|
1eedae9 |
*/
|
|
|
1eedae9 |
init(); // needed to get default connect_timeout
|
|
|
1eedae9 |
- if( !(qmgr = ConnectQ( host, connect_timeout, true, errstack)) ) {
|
|
|
1eedae9 |
+ if( !(qmgr = ConnectQ( daemon, connect_timeout, true, errstack)) ) {
|
|
|
1eedae9 |
free( constraint );
|
|
|
1eedae9 |
return Q_SCHEDD_COMMUNICATION_ERROR;
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
diff --git a/src/condor_utils/condor_q.h b/src/condor_utils/condor_q.h
|
|
|
1eedae9 |
index c2887ed..b167466 100644
|
|
|
1eedae9 |
--- a/src/condor_utils/condor_q.h
|
|
|
1eedae9 |
+++ b/src/condor_utils/condor_q.h
|
|
|
1eedae9 |
@@ -23,6 +23,7 @@
|
|
|
1eedae9 |
#include "condor_common.h"
|
|
|
1eedae9 |
#include "generic_query.h"
|
|
|
1eedae9 |
#include "CondorError.h"
|
|
|
1eedae9 |
+#include "daemon.h"
|
|
|
1eedae9 |
|
|
|
1eedae9 |
#define MAXOWNERLEN 20
|
|
|
1eedae9 |
#define MAXSCHEDDLEN 255
|
|
|
1eedae9 |
@@ -90,8 +91,8 @@ class CondorQ
|
|
|
1eedae9 |
// which pass the criterion specified by the constraints; default is
|
|
|
1eedae9 |
// from the local schedd
|
|
|
1eedae9 |
int fetchQueue (ClassAdList &, StringList &attrs, ClassAd * = 0, CondorError* errstack = 0);
|
|
|
1eedae9 |
- int fetchQueueFromHost (ClassAdList &, StringList &attrs, const char * = 0, char const *schedd_version = 0,CondorError* errstack = 0);
|
|
|
1eedae9 |
- int fetchQueueFromHostAndProcess ( const char *, StringList &attrs, process_function process_func, bool useFastPath, CondorError* errstack = 0);
|
|
|
1eedae9 |
+ int fetchQueueFromDaemon (ClassAdList &, StringList &attrs, Daemon &, char const *schedd_version = 0,CondorError* errstack = 0);
|
|
|
1eedae9 |
+ int fetchQueueFromDaemonAndProcess ( Daemon &, StringList &attrs, process_function process_func, bool useFastPath, CondorError* errstack = 0);
|
|
|
1eedae9 |
|
|
|
1eedae9 |
// fetch the job ads from database
|
|
|
1eedae9 |
int fetchQueueFromDB (ClassAdList &, char *&lastUpdate, const char * = 0, CondorError* errstack = 0);
|
|
|
1eedae9 |
diff --git a/src/condor_utils/condor_query.cpp b/src/condor_utils/condor_query.cpp
|
|
|
1eedae9 |
index 95bc78a..acc6201 100644
|
|
|
1eedae9 |
--- a/src/condor_utils/condor_query.cpp
|
|
|
1eedae9 |
+++ b/src/condor_utils/condor_query.cpp
|
|
|
1eedae9 |
@@ -386,10 +386,6 @@ addORConstraint (const char *value)
|
|
|
1eedae9 |
QueryResult CondorQuery::
|
|
|
1eedae9 |
fetchAds (ClassAdList &adList, const char *poolName, CondorError* errstack)
|
|
|
1eedae9 |
{
|
|
|
1eedae9 |
- Sock* sock;
|
|
|
1eedae9 |
- int more;
|
|
|
1eedae9 |
- QueryResult result;
|
|
|
1eedae9 |
- ClassAd queryAd(extraAttrs), *ad;
|
|
|
1eedae9 |
|
|
|
1eedae9 |
if ( !poolName ) {
|
|
|
1eedae9 |
return Q_NO_COLLECTOR_HOST;
|
|
|
1eedae9 |
@@ -402,7 +398,16 @@ fetchAds (ClassAdList &adList, const char *poolName, CondorError* errstack)
|
|
|
1eedae9 |
return Q_NO_COLLECTOR_HOST;
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
+ return fetchAds(adList, my_collector, errstack);
|
|
|
1eedae9 |
+}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
+QueryResult CondorQuery::
|
|
|
1eedae9 |
+fetchAds (ClassAdList &adList, Daemon &my_collector, CondorError* errstack)
|
|
|
1eedae9 |
+{
|
|
|
1eedae9 |
+ Sock* sock;
|
|
|
1eedae9 |
+ int more;
|
|
|
1eedae9 |
+ QueryResult result;
|
|
|
1eedae9 |
+ ClassAd queryAd(extraAttrs), *ad;
|
|
|
1eedae9 |
// make the query ad
|
|
|
1eedae9 |
result = getQueryAd (queryAd);
|
|
|
1eedae9 |
if (result != Q_OK) return result;
|
|
|
1eedae9 |
diff --git a/src/condor_utils/condor_query.h b/src/condor_utils/condor_query.h
|
|
|
1eedae9 |
index 7e58eef..9fedcad 100644
|
|
|
1eedae9 |
--- a/src/condor_utils/condor_query.h
|
|
|
1eedae9 |
+++ b/src/condor_utils/condor_query.h
|
|
|
1eedae9 |
@@ -156,6 +156,7 @@ class CondorQuery
|
|
|
1eedae9 |
|
|
|
1eedae9 |
// fetch from collector
|
|
|
1eedae9 |
QueryResult fetchAds (ClassAdList &adList, const char * pool, CondorError* errstack = NULL);
|
|
|
1eedae9 |
+ QueryResult fetchAds (ClassAdList &adList, Daemon &daemon, CondorError* errstack = NULL);
|
|
|
1eedae9 |
|
|
|
1eedae9 |
|
|
|
1eedae9 |
// filter list of ads; arg1 is 'in', arg2 is 'out'
|
|
|
1eedae9 |
diff --git a/src/condor_utils/ipv6_hostname.cpp b/src/condor_utils/ipv6_hostname.cpp
|
|
|
1eedae9 |
index 1cb0723..0d7fbd3 100644
|
|
|
1eedae9 |
--- a/src/condor_utils/ipv6_hostname.cpp
|
|
|
1eedae9 |
+++ b/src/condor_utils/ipv6_hostname.cpp
|
|
|
1eedae9 |
@@ -198,10 +198,13 @@ int get_fqdn_and_ip_from_hostname(const MyString& hostname,
|
|
|
1eedae9 |
MyString ret;
|
|
|
1eedae9 |
condor_sockaddr ret_addr;
|
|
|
1eedae9 |
bool found_ip = false;
|
|
|
1eedae9 |
+ bool use_given_name = false;
|
|
|
1eedae9 |
|
|
|
1eedae9 |
// if the hostname contains dot, hostname is assumed to be full hostname
|
|
|
1eedae9 |
if (hostname.FindChar('.') != -1) {
|
|
|
1eedae9 |
ret = hostname;
|
|
|
1eedae9 |
+ fqdn = hostname;
|
|
|
1eedae9 |
+ use_given_name = true;
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
|
|
|
1eedae9 |
if (nodns_enabled()) {
|
|
|
1eedae9 |
@@ -222,7 +225,9 @@ int get_fqdn_and_ip_from_hostname(const MyString& hostname,
|
|
|
1eedae9 |
|
|
|
1eedae9 |
while (addrinfo* info = ai.next()) {
|
|
|
1eedae9 |
if (info->ai_canonname) {
|
|
|
1eedae9 |
- fqdn = info->ai_canonname;
|
|
|
1eedae9 |
+ dprintf(D_HOSTNAME, "Found canon addr: %s\n", info->ai_canonname);
|
|
|
1eedae9 |
+ if (!use_given_name)
|
|
|
1eedae9 |
+ fqdn = info->ai_canonname;
|
|
|
1eedae9 |
addr = condor_sockaddr(info->ai_addr);
|
|
|
1eedae9 |
return 1;
|
|
|
1eedae9 |
}
|
|
|
1eedae9 |
diff --git a/src/condor_who/who.cpp b/src/condor_who/who.cpp
|
|
|
1eedae9 |
index 99f948c..cf1ab3e 100644
|
|
|
1eedae9 |
--- a/src/condor_who/who.cpp
|
|
|
1eedae9 |
+++ b/src/condor_who/who.cpp
|
|
|
1eedae9 |
@@ -1461,7 +1461,7 @@ main( int argc, char *argv[] )
|
|
|
1eedae9 |
ClassAdList result;
|
|
|
1eedae9 |
if (addr || App.diagnostic) {
|
|
|
1eedae9 |
CondorError errstack;
|
|
|
1eedae9 |
- QueryResult qr = query->fetchAds (result, addr, &errstack);
|
|
|
1eedae9 |
+ QueryResult qr = dae->locate() ? query->fetchAds (result, *dae, &errstack) : query->fetchAds (result, addr, &errstack);
|
|
|
1eedae9 |
if (Q_OK != qr) {
|
|
|
1eedae9 |
fprintf( stderr, "Error: %s\n", getStrQueryResult(qr) );
|
|
|
1eedae9 |
fprintf( stderr, "%s\n", errstack.getFullText(true).c_str() );
|