提交 2f9dc36d 编写于 作者: D Daniel P. Berrange

Rename APIs for fetching UNIX socket credentials

To avoid a namespace clash with forthcoming identity APIs,
rename the virNet*GetLocalIdentity() APIs to have the form
virNet*GetUNIXIdentity()

* daemon/remote.c, src/libvirt_private.syms: Update
  for renamed APIs
* src/rpc/virnetserverclient.c, src/rpc/virnetserverclient.h,
  src/rpc/virnetsocket.c, src/rpc/virnetsocket.h: s/LocalIdentity/UNIXIdentity/
上级 1fff03ef
...@@ -2038,7 +2038,7 @@ remoteDispatchAuthList(virNetServerPtr server ATTRIBUTE_UNUSED, ...@@ -2038,7 +2038,7 @@ remoteDispatchAuthList(virNetServerPtr server ATTRIBUTE_UNUSED,
* some piece of polkit isn't present/running * some piece of polkit isn't present/running
*/ */
if (auth == VIR_NET_SERVER_SERVICE_AUTH_POLKIT) { if (auth == VIR_NET_SERVER_SERVICE_AUTH_POLKIT) {
if (virNetServerClientGetLocalIdentity(client, &callerUid, &callerGid, &callerPid) < 0) { if (virNetServerClientGetUNIXIdentity(client, &callerUid, &callerGid, &callerPid) < 0) {
/* Don't do anything on error - it'll be validated at next /* Don't do anything on error - it'll be validated at next
* phase of auth anyway */ * phase of auth anyway */
virResetLastError(); virResetLastError();
...@@ -2494,7 +2494,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, ...@@ -2494,7 +2494,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED,
goto authfail; goto authfail;
} }
if (virNetServerClientGetLocalIdentity(client, &callerUid, &callerGid, &callerPid) < 0) { if (virNetServerClientGetUNIXIdentity(client, &callerUid, &callerGid, &callerPid) < 0) {
goto authfail; goto authfail;
} }
...@@ -2592,7 +2592,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server, ...@@ -2592,7 +2592,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server,
goto authfail; goto authfail;
} }
if (virNetServerClientGetLocalIdentity(client, &callerUid, &callerGid, &callerPid) < 0) { if (virNetServerClientGetUNIXIdentity(client, &callerUid, &callerGid, &callerPid) < 0) {
VIR_ERROR(_("cannot get peer socket identity")); VIR_ERROR(_("cannot get peer socket identity"));
goto authfail; goto authfail;
} }
......
...@@ -1291,10 +1291,10 @@ virNetServerClientDelayedClose; ...@@ -1291,10 +1291,10 @@ virNetServerClientDelayedClose;
virNetServerClientFree; virNetServerClientFree;
virNetServerClientGetAuth; virNetServerClientGetAuth;
virNetServerClientGetFD; virNetServerClientGetFD;
virNetServerClientGetLocalIdentity;
virNetServerClientGetPrivateData; virNetServerClientGetPrivateData;
virNetServerClientGetReadonly; virNetServerClientGetReadonly;
virNetServerClientGetTLSKeySize; virNetServerClientGetTLSKeySize;
virNetServerClientGetUNIXIdentity;
virNetServerClientHasTLSSession; virNetServerClientHasTLSSession;
virNetServerClientImmediateClose; virNetServerClientImmediateClose;
virNetServerClientIsSecure; virNetServerClientIsSecure;
......
...@@ -447,13 +447,13 @@ int virNetServerClientGetFD(virNetServerClientPtr client) ...@@ -447,13 +447,13 @@ int virNetServerClientGetFD(virNetServerClientPtr client)
return fd; return fd;
} }
int virNetServerClientGetLocalIdentity(virNetServerClientPtr client, int virNetServerClientGetUNIXIdentity(virNetServerClientPtr client,
uid_t *uid, gid_t *gid, pid_t *pid) uid_t *uid, gid_t *gid, pid_t *pid)
{ {
int ret = -1; int ret = -1;
virNetServerClientLock(client); virNetServerClientLock(client);
if (client->sock) if (client->sock)
ret = virNetSocketGetLocalIdentity(client->sock, uid, gid, pid); ret = virNetSocketGetUNIXIdentity(client->sock, uid, gid, pid);
virNetServerClientUnlock(client); virNetServerClientUnlock(client);
return ret; return ret;
} }
......
...@@ -70,7 +70,7 @@ int virNetServerClientSetIdentity(virNetServerClientPtr client, ...@@ -70,7 +70,7 @@ int virNetServerClientSetIdentity(virNetServerClientPtr client,
const char *identity); const char *identity);
const char *virNetServerClientGetIdentity(virNetServerClientPtr client); const char *virNetServerClientGetIdentity(virNetServerClientPtr client);
int virNetServerClientGetLocalIdentity(virNetServerClientPtr client, int virNetServerClientGetUNIXIdentity(virNetServerClientPtr client,
uid_t *uid, gid_t *gid, pid_t *pid); uid_t *uid, gid_t *gid, pid_t *pid);
void virNetServerClientRef(virNetServerClientPtr client); void virNetServerClientRef(virNetServerClientPtr client);
......
...@@ -824,7 +824,7 @@ int virNetSocketGetPort(virNetSocketPtr sock) ...@@ -824,7 +824,7 @@ int virNetSocketGetPort(virNetSocketPtr sock)
#ifdef SO_PEERCRED #ifdef SO_PEERCRED
int virNetSocketGetLocalIdentity(virNetSocketPtr sock, int virNetSocketGetUNIXIdentity(virNetSocketPtr sock,
uid_t *uid, uid_t *uid,
gid_t *gid, gid_t *gid,
pid_t *pid) pid_t *pid)
...@@ -848,7 +848,7 @@ int virNetSocketGetLocalIdentity(virNetSocketPtr sock, ...@@ -848,7 +848,7 @@ int virNetSocketGetLocalIdentity(virNetSocketPtr sock,
return 0; return 0;
} }
#else #else
int virNetSocketGetLocalIdentity(virNetSocketPtr sock ATTRIBUTE_UNUSED, int virNetSocketGetUNIXIdentity(virNetSocketPtr sock ATTRIBUTE_UNUSED,
uid_t *uid ATTRIBUTE_UNUSED, uid_t *uid ATTRIBUTE_UNUSED,
gid_t *gid ATTRIBUTE_UNUSED, gid_t *gid ATTRIBUTE_UNUSED,
pid_t *pid ATTRIBUTE_UNUSED) pid_t *pid ATTRIBUTE_UNUSED)
......
...@@ -86,7 +86,7 @@ bool virNetSocketHasPassFD(virNetSocketPtr sock); ...@@ -86,7 +86,7 @@ bool virNetSocketHasPassFD(virNetSocketPtr sock);
int virNetSocketGetPort(virNetSocketPtr sock); int virNetSocketGetPort(virNetSocketPtr sock);
int virNetSocketGetLocalIdentity(virNetSocketPtr sock, int virNetSocketGetUNIXIdentity(virNetSocketPtr sock,
uid_t *uid, uid_t *uid,
gid_t *gid, gid_t *gid,
pid_t *pid); pid_t *pid);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册