External/libvirt
1
0
Fork 0
Code

Rename virRequest{Username,Password} to virAuthGet{Username,Password}

Browse Source 
Ensure that the functions in virauth.h have names matching the file
prefix, by renaming  virRequest{Username,Password} to
virAuthGet{Username,Password}

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2012-03-19 16:23:47 +00:00
parent c8aa3862b1
commit 4262e34eb5
7 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/esx/esx_driver.c
View File

@ -700,7 +700,7 @@ esxConnectToHost(esxPrivate *priv, virConnectAuthPtr auth,
goto cleanup; goto cleanup;
} }
} else { } else {
username = virRequestUsername(auth, "root", hostname); username = virAuthGetUsername(auth, "root", hostname);
if (username == NULL) { if (username == NULL) {
ESX_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("Username request failed")); ESX_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("Username request failed"));
@ -708,7 +708,7 @@ esxConnectToHost(esxPrivate *priv, virConnectAuthPtr auth,
} }
} }
unescapedPassword = virRequestPassword(auth, username, hostname); unescapedPassword = virAuthGetPassword(auth, username, hostname);
if (unescapedPassword == NULL) { if (unescapedPassword == NULL) {
ESX_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("Password request failed")); ESX_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("Password request failed"));
@ -830,7 +830,7 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth,
goto cleanup; goto cleanup;
} }
} else { } else {
username = virRequestUsername(auth, "administrator", hostname); username = virAuthGetUsername(auth, "administrator", hostname);
if (username == NULL) { if (username == NULL) {
ESX_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("Username request failed")); ESX_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("Username request failed"));
@ -838,7 +838,7 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth,
} }
} }
unescapedPassword = virRequestPassword(auth, username, hostname); unescapedPassword = virAuthGetPassword(auth, username, hostname);
if (unescapedPassword == NULL) { if (unescapedPassword == NULL) {
ESX_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("Password request failed")); ESX_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("Password request failed"));

4
src/hyperv/hyperv_driver.c
View File

@ -147,7 +147,7 @@ hypervOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags)
goto cleanup; goto cleanup;
} }
} else { } else {
username = virRequestUsername(auth, "administrator", conn->uri->server); username = virAuthGetUsername(auth, "administrator", conn->uri->server);
if (username == NULL) { if (username == NULL) {
HYPERV_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("Username request failed")); HYPERV_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("Username request failed"));
@ -155,7 +155,7 @@ hypervOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags)
} }
} }
password = virRequestPassword(auth, username, conn->uri->server); password = virAuthGetPassword(auth, username, conn->uri->server);
if (password == NULL) { if (password == NULL) {
HYPERV_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("Password request failed")); HYPERV_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("Password request failed"));

10
src/libvirt_private.syms
View File

@ -5,11 +5,6 @@
# Keep this file sorted by header name, then by symbols with each header. # Keep this file sorted by header name, then by symbols with each header.
# #
# authhelper.h
virRequestPassword;
virRequestUsername;
# bitmap.h # bitmap.h
virBitmapAlloc; virBitmapAlloc;
virBitmapClearBit; virBitmapClearBit;
@ -1165,6 +1160,11 @@ virUUIDGenerate;
virUUIDParse; virUUIDParse;
# virauth.h
virAuthGetUsername;
virAuthGetPassword;
# viraudit.h # viraudit.h
virAuditClose; virAuditClose;
virAuditEncode; virAuditEncode;

4
src/phyp/phyp_driver.c
View File

@ -1006,7 +1006,7 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth,
goto err; goto err;
} }
username = virRequestUsername(auth, NULL, conn->uri->server); username = virAuthGetUsername(auth, NULL, conn->uri->server);
if (username == NULL) { if (username == NULL) {
PHYP_ERROR(VIR_ERR_AUTH_FAILED, "%s", PHYP_ERROR(VIR_ERR_AUTH_FAILED, "%s",
@ -1087,7 +1087,7 @@ keyboard_interactive:
goto disconnect; goto disconnect;
} }
password = virRequestPassword(auth, username, conn->uri->server); password = virAuthGetPassword(auth, username, conn->uri->server);
if (password == NULL) { if (password == NULL) {
PHYP_ERROR(VIR_ERR_AUTH_FAILED, "%s", PHYP_ERROR(VIR_ERR_AUTH_FAILED, "%s",

4
src/util/virauth.c
View File

@ -27,7 +27,7 @@
char * char *
virRequestUsername(virConnectAuthPtr auth, const char *defaultUsername, virAuthGetUsername(virConnectAuthPtr auth, const char *defaultUsername,
const char *hostname) const char *hostname)
{ {
unsigned int ncred; unsigned int ncred;
@ -74,7 +74,7 @@ virRequestUsername(virConnectAuthPtr auth, const char *defaultUsername,
char * char *
virRequestPassword(virConnectAuthPtr auth, const char *username, virAuthGetPassword(virConnectAuthPtr auth, const char *username,
const char *hostname) const char *hostname)
{ {
unsigned int ncred; unsigned int ncred;

4
src/util/virauth.h
View File

@ -24,9 +24,9 @@
# include "internal.h" # include "internal.h"
char *virRequestUsername(virConnectAuthPtr auth, const char *defaultUsername, char *virAuthGetUsername(virConnectAuthPtr auth, const char *defaultUsername,
const char *hostname); const char *hostname);
char *virRequestPassword(virConnectAuthPtr auth, const char *username, char *virAuthGetPassword(virConnectAuthPtr auth, const char *username,
const char *hostname); const char *hostname);
#endif /* __VIR_AUTH_H__ */ #endif /* __VIR_AUTH_H__ */

4
src/xenapi/xenapi_driver.c
View File

@ -138,7 +138,7 @@ xenapiOpen (virConnectPtr conn, virConnectAuthPtr auth,
goto error; goto error;
} }
} else { } else {
username = virRequestUsername(auth, NULL, conn->uri->server); username = virAuthGetUsername(auth, NULL, conn->uri->server);
if (username == NULL) { if (username == NULL) {
xenapiSessionErrorHandler(conn, VIR_ERR_AUTH_FAILED, xenapiSessionErrorHandler(conn, VIR_ERR_AUTH_FAILED,
@ -147,7 +147,7 @@ xenapiOpen (virConnectPtr conn, virConnectAuthPtr auth,
} }
} }
password = virRequestPassword(auth, username, conn->uri->server); password = virAuthGetPassword(auth, username, conn->uri->server);
if (password == NULL) { if (password == NULL) {
xenapiSessionErrorHandler(conn, VIR_ERR_AUTH_FAILED, xenapiSessionErrorHandler(conn, VIR_ERR_AUTH_FAILED,