From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 23 Mar 2012 05:51:47 +0000 (+1100)
Subject: s3-passdb: Rename legacy_sid_to_id -> legacy_sid_to_unixid for clarity
X-Git-Tag: samba-4.0.0alpha21~406
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2d5df933f421602276c3dfc04852911d91f631fc;p=thirdparty%2Fsamba.git

s3-passdb: Rename legacy_sid_to_id -> legacy_sid_to_unixid for clarity

Signed-off-by: Michael Adam <obnox@samba.org>
---

diff --git a/source3/passdb/lookup_sid.c b/source3/passdb/lookup_sid.c
index d31693de4e5..a70d31791f7 100644
--- a/source3/passdb/lookup_sid.c
+++ b/source3/passdb/lookup_sid.c
@@ -1078,7 +1078,7 @@ static void legacy_gid_to_sid(struct dom_sid *psid, gid_t gid)
  *THE LEGACY* convert SID to id function.
 *****************************************************************/  
 
-static bool legacy_sid_to_id(const struct dom_sid *psid, struct unixid *id)
+static bool legacy_sid_to_unixid(const struct dom_sid *psid, struct unixid *id)
 {
 	GROUP_MAP *map;
 	if (sid_check_is_in_our_domain(psid)) {
@@ -1131,7 +1131,7 @@ done:
 static bool legacy_sid_to_gid(const struct dom_sid *psid, gid_t *pgid)
 {
 	struct unixid id;
-	if (!legacy_sid_to_id(psid, &id)) {
+	if (!legacy_sid_to_unixid(psid, &id)) {
 		return false;
 	}
 	if (id.type == ID_TYPE_GID || id.type == ID_TYPE_BOTH) {
@@ -1144,7 +1144,7 @@ static bool legacy_sid_to_gid(const struct dom_sid *psid, gid_t *pgid)
 static bool legacy_sid_to_uid(const struct dom_sid *psid, uid_t *puid)
 {
 	struct unixid id;
-	if (!legacy_sid_to_id(psid, &id)) {
+	if (!legacy_sid_to_unixid(psid, &id)) {
 		return false;
 	}
 	if (id.type == ID_TYPE_UID || id.type == ID_TYPE_BOTH) {