rpms/nfs-utils-lib/devel nfs-utils-lib-1.1.4-nss-localrealms.patch, NONE, 1.1 nfs-utils-lib.spec, 1.32, 1.33

[Steve Dickson]

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv561

Modified Files:
	nfs-utils-lib.spec 
Added Files:
	nfs-utils-lib-1.1.4-nss-localrealms.patch 
Log Message:
Fixed a bad assumtion in nss code.


nfs-utils-lib-1.1.4-nss-localrealms.patch:

--- NEW FILE nfs-utils-lib-1.1.4-nss-localrealms.patch ---
Author: Steve Dickson <steved at redhat.com>
Date:   Sat Oct 18 09:12:48 EDT 2008

    nss_gss_princ_to_ids() wrongly makes an assume that the krb5
    realm name and the DNS domain name are the same string when
    Local-Realms are not defined in the idmapd.conf file. 

    This patch removes that assumption, renames the realms
    variable to better describe what it is used for.

    Signed-off-by: Steve Dickson <steved at redhat.com>

diff -up nfs-utils-lib-1.1.4/libnfsidmap/nss.c.orig nfs-utils-lib-1.1.4/libnfsidmap/nss.c
--- nfs-utils-lib-1.1.4/libnfsidmap/nss.c.orig	2008-03-27 16:47:51.000000000 -0400
+++ nfs-utils-lib-1.1.4/libnfsidmap/nss.c	2008-10-18 09:39:15.000000000 -0400
@@ -273,7 +273,7 @@ static int nss_gss_princ_to_ids(char *se
 	struct passwd *pw;
 	int err = 0;
 	char *princ_realm;
-	struct conf_list *realms;
+	struct conf_list *local_realms;
 	struct conf_list_node *r;
 
 	if (strcmp(secname, "spkm3") == 0)
@@ -288,11 +288,11 @@ static int nss_gss_princ_to_ids(char *se
 		return -EINVAL;
 	princ_realm++;
 
-	/* get accepted realms */
-	realms = get_local_realms();
-	if (realms) {
+	/* See if there are any local realms that need to be adhered to */
+	local_realms = get_local_realms();
+	if (local_realms) {
 		int found = 0;
-		for (r = TAILQ_FIRST(&realms->fields); r;
+		for (r = TAILQ_FIRST(&local_realms->fields); r;
 		     r = TAILQ_NEXT(r, link)) {
 			if (strlen(r->field) == strlen(princ_realm) &&
 				!strcmp(r->field, princ_realm)) {
@@ -302,14 +302,8 @@ static int nss_gss_princ_to_ids(char *se
 		}
 		if (!found)
 			return -EINVAL;
-	} else {
-		char *domain;
-		domain = get_default_domain();
-		domain = toupper_str(domain);
-		if (strlen(princ_realm) != strlen(domain) ||
-			strcmp(princ_realm, domain))
-			return -EINVAL;
-	}
+	} 
+
 	/* XXX: this should call something like getgssauthnam instead? */
 	pw = nss_getpwnam(princ, NULL, &err);
 	if (pw == NULL) {


Index: nfs-utils-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils-lib/devel/nfs-utils-lib.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- nfs-utils-lib.spec	27 Aug 2008 19:57:09 -0000	1.32
+++ nfs-utils-lib.spec	18 Oct 2008 13:49:56 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: Network File System Support Library
 Name: nfs-utils-lib
-Version: 1.1.3
-Release: 2%{?dist}
+Version: 1.1.4
+Release: 1%{?dist}
 URL: http://www.citi.umich.edu/projects/nfsv4/linux/
 License: GPL
 
@@ -21,6 +21,7 @@
 Patch00: nfs-utils-lib-1.1.3-idmapd-default.patch
 Patch01: nfs-utils-lib-1.0.8-idmap.conf.patch
 Patch02: nfs-utils-lib-1.1.3-plugin-version.patch
+Patch03: nfs-utils-lib-1.1.4-nss-localrealms.patch
 
 Patch100: nfs-utils-lib-1.1.3-compile.patch
 
@@ -54,6 +55,7 @@
 %patch00 -p1
 %patch01 -p1
 %patch02 -p1
+%patch03 -p1
 
 %patch100 -p1
 
@@ -142,6 +144,9 @@
 %{_libdir}/libnfsidmap*.a
 
 %changelog
+* Sat Oct 18 2008 Steve Dickson <steved at redhat.com> 1.1.4-1
+- Fixed a bad assumtion in nss code.
+
 * Wed Aug 27 2008 Steve Dickson <steved at redhat.com> 1.1.3-2
 - Upgraded librpcsecgss to latest upstream version: 0.18