From patchwork Fri Jun 17 23:37:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shirish Pargaonkar X-Patchwork-Id: 892692 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5HNWeXG020019 for ; Fri, 17 Jun 2011 23:32:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754290Ab1FQXcV (ORCPT ); Fri, 17 Jun 2011 19:32:21 -0400 Received: from mail-gw0-f46.google.com ([74.125.83.46]:47092 "EHLO mail-gw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759554Ab1FQXcT (ORCPT ); Fri, 17 Jun 2011 19:32:19 -0400 Received: by gwaa18 with SMTP id a18so13263gwa.19 for ; Fri, 17 Jun 2011 16:32:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=SNTD/Zv9ihvwuwzttWK0RD/EJTeY/VFW/Z+84L8NBVU=; b=dG0VtfPxPv3AaEfIuif4DliK16I4U2YfmVjVtBYrm71tquC+KCd3SRVEiHWKy6KKZ+ 0CR1kYKKfxLaOWIZmz7qApNIlhVGhN3Q1lXuHG+D1jbqnHM+5GzXSTSxJGylhPR3F9Wp E+D9h9Pn5nQbwCMdldNP/Za8XMpAe1DXLYI08= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=VUc9pXosoZxzSQaUGslXCpUY2jwV5YLMDq+cV098RzJt/iE0GZEwlxAXmGgvsuoOhK 08TwtuqalzUc9SOyEFb+W2Lmx8UrMOciQR3Lri1Qww3WaQZTYKc6wh777FJE+yaW5+4H VQZR1YUS8Av4uXLEJ3Gs3H/OLmnZ3psF5AfDY= Received: by 10.236.176.197 with SMTP id b45mr4305945yhm.253.1308353492257; Fri, 17 Jun 2011 16:31:32 -0700 (PDT) Received: from localhost ([32.97.110.58]) by mx.google.com with ESMTPS id g5sm2068235yhm.40.2011.06.17.16.31.31 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 17 Jun 2011 16:31:31 -0700 (PDT) From: shirishpargaonkar@gmail.com To: jlayton@redhat.com Cc: linux-cifs@vger.kernel.org, Shirish Pargaonkar Subject: [PATCH] cifs-utils: Add uid/gid to SID mapping functions Date: Fri, 17 Jun 2011 18:37:59 -0500 Message-Id: <1308353879-8825-1-git-send-email-shirishpargaonkar@gmail.com> X-Mailer: git-send-email 1.6.0.2 Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Fri, 17 Jun 2011 23:32:40 +0000 (UTC) From: Shirish Pargaonkar Add functions to map a uid and gid to a SID. These functions are similar to SID to uid and gid mapping functions. Signed-off-by: Shirish Pargaonkar --- cifs.idmap.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/cifs.idmap.c b/cifs.idmap.c index 56edb58..80802d7 100644 --- a/cifs.idmap.c +++ b/cifs.idmap.c @@ -134,6 +134,43 @@ cifs_idmap(const key_serial_t key, const char *key_descr) goto cifs_idmap_ret; } + sidstr = strget(key_descr, "oi:"); + if (sidstr) { + uid = atoi(sidstr); + syslog(LOG_DEBUG, "SID: %s, uid: %d", sidstr, uid); + rc = wbcUidToSid(uid, &sid); + if (rc) + syslog(LOG_DEBUG, "uid %d to SID error: %d", uid, rc); + if (!rc) { /* SID has been mapped to a uid */ + rc = keyctl_instantiate(key, &sid, + sizeof(struct wbcDomainSid), 0); + if (rc) + syslog(LOG_ERR, "%s: key inst: %s", + __func__, strerror(errno)); + } + + goto cifs_idmap_ret; + } + + sidstr = strget(key_descr, "gi:"); + if (sidstr) { + gid = atoi(sidstr); + syslog(LOG_DEBUG, "SID: %s, gid: %d", sidstr, gid); + rc = wbcGidToSid(gid, &sid); + if (rc) + syslog(LOG_DEBUG, "gid %d to SID error: %d", gid, rc); + if (!rc) { /* SID has been mapped to a gid */ + rc = keyctl_instantiate(key, &sid, + sizeof(struct wbcDomainSid), 0); + if (rc) + syslog(LOG_ERR, "%s: key inst: %s", + __func__, strerror(errno)); + } + + goto cifs_idmap_ret; + } + + syslog(LOG_DEBUG, "Invalid key: %s", key_descr); cifs_idmap_ret: