Patch krb5kadm.patch for PECL Bug #66782

Patch version 2014-02-26 18:13 UTC

• 2014-02-26 18:13 UTC [diff to current]

Developer: simnet@vsfs.org

Index: kadm5_policy.c
===================================================================
--- kadm5_policy.c	(revision 332891)
+++ kadm5_policy.c	(working copy)
@@ -20,7 +20,9 @@
 * THE SOFTWARE.
 **/
 
+#define SUCCESS FOO
 #include "php_krb5.h"
+#undef SUCCESS
 #include "php_krb5_kadm.h"
 
 static zend_function_entry krb5_kadm5_policy_functions[] = {
Index: kadm5_principal.c
===================================================================
--- kadm5_principal.c	(revision 332891)
+++ kadm5_principal.c	(working copy)
@@ -20,7 +20,9 @@
 * THE SOFTWARE.
 **/
 
+#define SUCCESS FOO
 #include "php_krb5.h"
+#undef SUCCESS
 #include "php_krb5_kadm.h"
 
 
Index: php_krb5_kadm.h
===================================================================
--- php_krb5_kadm.h	(revision 332891)
+++ php_krb5_kadm.h	(working copy)
@@ -25,14 +25,7 @@
 
 #include "config.h"
 
-#ifdef SUCCESS
-#define OLD_SUCC SUCCESS
-#undef SUCCESS
-#endif
 #include <kadm5/admin.h>
-#ifdef OLD_SUCC
-#define SUCCESS OLD_SUCC
-#endif
 
 /* KADM5 Object */
 	zend_class_entry *krb5_ce_kadm5;
Index: kadm.c
===================================================================
--- kadm.c	(revision 332891)
+++ kadm.c	(working copy)
@@ -20,7 +20,9 @@
 * THE SOFTWARE.
 **/
 
+#define SUCCESS FOO
 #include "php_krb5.h"
+#undef SUCCESS
 #include "php_krb5_kadm.h"