rpms/krb5/devel krb5-1.6.1-selinux-label.patch,1.3,1.4

[Nalin Somabhai Dahyabhai (nalin)]

Author: nalin

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

Modified Files:
	krb5-1.6.1-selinux-label.patch 
Log Message:
- undef functions that we override before redefining them; ultimately this
  will have to be completely reworked to not use preprocessor magic because
  it's gotten way uglier than originally planned


krb5-1.6.1-selinux-label.patch:

Index: krb5-1.6.1-selinux-label.patch
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5-1.6.1-selinux-label.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- krb5-1.6.1-selinux-label.patch	11 Sep 2007 14:12:03 -0000	1.3
+++ krb5-1.6.1-selinux-label.patch	17 Sep 2007 20:46:21 -0000	1.4
@@ -291,7 +291,7 @@
  
 --- krb5-1.6.1/src/include/k5-label.h	2007-08-25 03:19:00.000000000 -0400
 +++ krb5-1.6.1/src/include/k5-label.h	2007-08-25 03:00:02.000000000 -0400
-@@ -0,0 +1,24 @@
+@@ -0,0 +1,39 @@
 +#ifndef _KRB5_LABEL_H
 +#define _KRB5_LABEL_H
 +/* Wrapper functions which help us create files and directories with the right
@@ -308,10 +308,25 @@
 +int krb5int_labeled_mkdir(const char *path, mode_t mode);
 +int krb5int_labeled_mknod(const char *path, mode_t mode, dev_t device);
 +#ifndef USE_SELINUX_UNWRAPPED
++#ifdef fopen
++#undef fopen
++#endif
 +#define fopen krb5int_labeled_fopen
++#ifdef open
++#undef open
++#endif
 +#define open krb5int_labeled_open
++#ifdef creat
++#undef creat
++#endif
 +#define creat krb5int_labeled_creat
++#ifdef mkdir
++#undef mkdir
++#endif
 +#define mkdir krb5int_labeled_mkdir
++#ifdef mknod
++#undef mknod
++#endif
 +#define mknod krb5int_labeled_mknod
 +#endif
 +#endif