rpms/krb5/devel krb5-1.6.2-doublelog.patch, NONE, 1.1 krb5.spec, 1.123, 1.124

[Nalin Somabhai Dahyabhai (nalin)]

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18911

Modified Files:
	krb5.spec 
Added Files:
	krb5-1.6.2-doublelog.patch 
Log Message:
- add a preliminary patch for #231147. initially not applied.


krb5-1.6.2-doublelog.patch:

--- NEW FILE krb5-1.6.2-doublelog.patch ---
Skip over duplicate entries in a profile's file list (closes #231147).  Files
are parsed in the order specified, so skipping a duplicate the second (or
subsequent) time it's seen shouldn't break any applications.

diff -up krb5-1.6.2/src/util/profile/prof_init.c krb5-1.6.2/src/util/profile/prof_init.c
--- krb5-1.6.2/src/util/profile/prof_init.c	2007-07-23 15:55:00.000000000 -0400
+++ krb5-1.6.2/src/util/profile/prof_init.c	2007-07-23 15:54:53.000000000 -0400
@@ -23,7 +23,7 @@ typedef int32_t prof_int32;
 errcode_t KRB5_CALLCONV
 profile_init(const_profile_filespec_t *files, profile_t *ret_profile)
 {
-	const_profile_filespec_t *fs;
+	const_profile_filespec_t *fs, *fs2;
 	profile_t profile;
 	prf_file_t  new_file, last = 0;
 	errcode_t retval = 0;
@@ -37,6 +37,11 @@ profile_init(const_profile_filespec_t *f
         /* if the filenames list is not specified return an empty profile */
         if ( files ) {
 	    for (fs = files; !PROFILE_LAST_FILESPEC(*fs); fs++) {
+	        for (fs2 = files; fs2 != fs; fs2++)
+		    if (strcmp(*fs2, *fs) == 0)
+			break;
+		if (fs2 != fs)
+		    continue;
 		retval = profile_open_file(*fs, &new_file);
 		/* if this file is missing, skip to the next */
 		if (retval == ENOENT || retval == EACCES) {


Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- krb5.spec	19 Jul 2007 16:50:28 -0000	1.123
+++ krb5.spec	23 Jul 2007 21:01:33 -0000	1.124
@@ -80,6 +80,7 @@
 Patch52: krb5-1.6-ldap-man.patch
 Patch53: krb5-1.6-nodeplibs.patch
 Patch55: krb5-1.6.1-empty.patch
+Patch56: krb5-1.6.2-doublelog.patch
 
 Patch60: krb5-1.6.1-pam.patch
 Patch61: krb5-trunk-manpaths.patch
@@ -1194,6 +1195,7 @@
 %patch52 -p0 -b .ldap_man
 %patch53 -p1 -b .nodeplibs
 #%patch55 -p1 -b .empty
+#%patch56 -p1 -b .doublelog
 cp src/krb524/README README.krb524
 gzip doc/*.ps