ESX Set challenge for auth callback to hostname

This enables the auth callback to automatically distinguish between
requests for ESX host and vCenter credentials.

* src/esx/esx_util.[ch]: set challenge for auth callback to hostname
This commit is contained in:
Matthias Bolte 2009-09-23 14:11:54 +02:00 committed by Daniel Veillard
parent ecd93b7541
commit 6f9d8bdbcb
2 changed files with 8 additions and 8 deletions

View File

@ -50,7 +50,7 @@
char *
esxUtil_RequestUsername(virConnectAuthPtr auth, const char *defaultUsername,
const char *server)
const char *hostname)
{
unsigned int ncred;
virConnectCredential cred;
@ -58,7 +58,7 @@ esxUtil_RequestUsername(virConnectAuthPtr auth, const char *defaultUsername,
memset(&cred, 0, sizeof(virConnectCredential));
if (virAsprintf(&prompt, "Enter username for %s [%s]", server,
if (virAsprintf(&prompt, "Enter username for %s [%s]", hostname,
defaultUsername) < 0) {
return NULL;
}
@ -70,7 +70,7 @@ esxUtil_RequestUsername(virConnectAuthPtr auth, const char *defaultUsername,
cred.type = VIR_CRED_AUTHNAME;
cred.prompt = prompt;
cred.challenge = NULL;
cred.challenge = hostname;
cred.defresult = defaultUsername;
cred.result = NULL;
cred.resultlen = 0;
@ -91,7 +91,7 @@ esxUtil_RequestUsername(virConnectAuthPtr auth, const char *defaultUsername,
char *
esxUtil_RequestPassword(virConnectAuthPtr auth, const char *username,
const char *server)
const char *hostname)
{
unsigned int ncred;
virConnectCredential cred;
@ -100,7 +100,7 @@ esxUtil_RequestPassword(virConnectAuthPtr auth, const char *username,
memset(&cred, 0, sizeof(virConnectCredential));
if (virAsprintf(&prompt, "Enter %s password for %s", username,
server) < 0) {
hostname) < 0) {
return NULL;
}
@ -112,7 +112,7 @@ esxUtil_RequestPassword(virConnectAuthPtr auth, const char *username,
cred.type = auth->credtype[ncred];
cred.prompt = prompt;
cred.challenge = NULL;
cred.challenge = hostname;
cred.defresult = NULL;
cred.result = NULL;
cred.resultlen = 0;

View File

@ -30,10 +30,10 @@
char *esxUtil_RequestUsername(virConnectAuthPtr auth,
const char *defaultUsername,
const char *server);
const char *hostname);
char *esxUtil_RequestPassword(virConnectAuthPtr auth, const char *username,
const char *server);
const char *hostname);
int esxUtil_ParseQuery(virConnectPtr conn, char **transport, char **vCenter,
int *noVerify);