rpms/krb5/devel krb5-1.7-selinux-label.patch,1.7,1.8

[Nalin Dahyabhai]

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25710

Modified Files:
	krb5-1.7-selinux-label.patch 
Log Message:
- if the result of our attempt to look up the context is NULL, either
  because the right function returned NULL or we failed to initialize
  the library, just skip it, as that's all we can do


krb5-1.7-selinux-label.patch:
 aclocal.m4                                      |   51 +++
 appl/bsd/configure.in                           |    1 
 appl/gssftp/configure.in                        |    1 
 appl/telnet/configure.in                        |    1 
 config/pre.in                                   |    3 
 configure.in                                    |    2 
 include/autoconf.h.in                           |   13 
 include/k5-int.h                                |    1 
 include/k5-label.h                              |   27 +
 include/krb5/krb5.hin                           |    6 
 kadmin/dbutil/dump.c                            |    2 
 krb5-config.in                                  |    3 
 lib/kadm5/logger.c                              |    4 
 lib/krb5/keytab/kt_file.c                       |    4 
 plugins/kdb/db2/adb_openclose.c                 |    2 
 plugins/kdb/db2/kdb_db2.c                       |    4 
 plugins/kdb/db2/libdb2/btree/bt_open.c          |    3 
 plugins/kdb/db2/libdb2/hash/hash.c              |    3 
 plugins/kdb/db2/libdb2/recno/rec_open.c         |    3 
 plugins/kdb/db2/libdb2/test/Makefile.in         |    3 
 plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c |   12 
 slave/kpropd.c                                  |    2 
 util/profile/prof_file.c                        |    3 
 util/support/Makefile.in                        |    3 
 util/support/selinux.c                          |  346 ++++++++++++++++++++++++
 25 files changed, 480 insertions(+), 23 deletions(-)

Index: krb5-1.7-selinux-label.patch
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5-1.7-selinux-label.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- krb5-1.7-selinux-label.patch	3 Dec 2009 23:17:28 -0000	1.7
+++ krb5-1.7-selinux-label.patch	9 Dec 2009 00:18:58 -0000	1.8
@@ -541,7 +541,7 @@ diff -up krb5-1.7/src/util/support/Makef
 diff -up /dev/null krb5-1.7/src/util/support/selinux.c
 --- /dev/null	2009-06-04 10:34:55.169007373 -0400
 +++ krb5-1.7/src/util/support/selinux.c	2009-06-04 13:47:20.000000000 -0400
-@@ -0,0 +1,340 @@
+@@ -0,0 +1,346 @@
 +/*
 + * Copyright 2007,2008,2009 Red Hat, Inc.  All Rights Reserved.
 + *
@@ -683,6 +683,12 @@ diff -up /dev/null krb5-1.7/src/util/sup
 +			}
 +#endif
 +			free(genpath);
++			if (configuredsc == NULL) {
++				if (previous != NULL) {
++					freecon(previous);
++				}
++				return NULL;
++			}
 +			currentsc = NULL;
 +			getcon(&currentsc);
 +			if (currentsc != NULL) {