You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
41 lines
1.6 KiB
41 lines
1.6 KiB
7 years ago
|
nss_gss_princ_to_ids() and nss_gss_princ_to_grouplist() must strip the realm
|
||
|
|
|
||
|
|
nss_gss_princ_to_ids() and nss_gss_princ_to_grouplist() were hard-coded
|
||
|
|
to call nss_getpwnam with the 'dostrip' arg set to 0, which is the
|
||
|
|
opposite of what they should have had. Note: there's no point making
|
||
|
|
the decision to strip or not to strip configurable in these two
|
||
|
|
functions. Ideally both of these functions should be taking a
|
||
|
|
gss_name_t instead of a char * for the principal, calling
|
||
|
|
gss_localname() on that, and passing the result to nss_getpwnam... but
|
||
|
|
that would require changes in both rpc.svcgssd and libgssglue (both of
|
||
|
|
which have been deprecated for a while).
|
||
|
|
|
||
|
|
Fixes: 4db1bb1 (libnfsidmap: add options to aid id mapping in multi domain environments)
|
||
|
|
Signed-off-by: Scott Mayhew <smayhew@redhat.com>
|
||
|
|
---
|
||
|
|
nss.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/nss.c b/nss.c
|
||
|
|
index 67e657a..82799ce 100644
|
||
|
|
--- a/nss.c
|
||
|
|
+++ b/nss.c
|
||
|
|
@@ -415,7 +415,7 @@ static int nss_gss_princ_to_ids(char *secname, char *princ,
|
||
|
|
return -ENOENT;
|
||
|
|
}
|
||
|
|
/* XXX: this should call something like getgssauthnam instead? */
|
||
|
|
- pw = nss_getpwnam(princ, NULL, &err, 0);
|
||
|
|
+ pw = nss_getpwnam(princ, NULL, &err, 1);
|
||
|
|
if (pw == NULL) {
|
||
|
|
err = -ENOENT;
|
||
|
|
goto out;
|
||
|
|
@@ -438,7 +438,7 @@ int nss_gss_princ_to_grouplist(char *secname, char *princ,
|
||
|
|
goto out;
|
||
|
|
/* XXX: not quite right? Need to know default realm? */
|
||
|
|
/* XXX: this should call something like getgssauthnam instead? */
|
||
|
|
- pw = nss_getpwnam(princ, NULL, &ret, 0);
|
||
|
|
+ pw = nss_getpwnam(princ, NULL, &ret, 1);
|
||
|
|
if (pw == NULL) {
|
||
|
|
ret = -ENOENT;
|
||
|
|
goto out;
|