kerbauth/kadm5.patch
author Dan Fuhry <dan@enanocms.org>
Mon, 13 Dec 2010 20:33:31 -0500
changeset 2 3e5bd9e5b22f
child 3 99b46c7d3ee0
permissions -rw-r--r--
Added my patch to the kadm5 extension
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
     1
diff -Naur kadm5-0.2.3/kadm5.c kadm5-0.2.3~patched/kadm5.c
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
     2
--- kadm5-0.2.3/kadm5.c	2003-05-28 06:51:42.000000000 -0400
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
     3
+++ kadm5-0.2.3~patched/kadm5.c	2010-12-13 16:22:00.700497383 -0500
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
     4
@@ -29,7 +29,8 @@
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
     5
 #include "config.h"
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
     6
 #endif
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
     7
 
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
     8
-#include "kadm5/admin.h"
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
     9
+#include "/opt/mit-krb5/include/kadm5/admin.h"
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    10
+#include "/opt/mit-krb5/include/kadm5/kadm_err.h"
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    11
 
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    12
 #include "php.h"
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    13
 #include "php_ini.h"
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    14
@@ -74,7 +75,7 @@
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    15
  *
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    16
  * Every user visible function must have an entry in kadm5_functions[].
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    17
  */
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    18
-function_entry kadm5_functions[] = {
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    19
+zend_function_entry kadm5_functions[] = {
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    20
 	PHP_FE(kadm5_init_with_password, NULL)
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    21
 	PHP_FE(kadm5_destroy, NULL)
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    22
 	PHP_FE(kadm5_flush, NULL)
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    23
@@ -436,6 +437,7 @@
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    24
 		php_error(E_WARNING, "Multiple values for single or folded enctype. (KADM5_SETKEY_DUP_ENCTYPES)");
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    25
 		break;
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    26
 	default:
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    27
+		break;
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    28
 	}
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    29
 }
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    30
 /* }}} */
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    31
@@ -465,12 +467,29 @@
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    32
 	params.admin_server = admin_server;
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    33
 	params.mask |= KADM5_CONFIG_ADMIN_SERVER;
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    34
 
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    35
-	rc = kadm5_init_with_password(princstr,
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    36
+/* prototype:
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    37
+kadm5_ret_t    kadm5_init_with_password(krb5_context context,
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    38
+                                        char *client_name,
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    39
+                                        char *pass,
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    40
+                                        char *service_name,
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    41
+                                        kadm5_config_params *params,
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    42
+                                        krb5_ui_4 struct_version,
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    43
+                                        krb5_ui_4 api_version,
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    44
+                                        char **db_args,
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    45
+                                        void **server_handle);
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    46
+*/
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    47
+
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    48
+	krb5_context context;
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    49
+	krb5_init_context(&context);
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    50
+	char **db_args = NULL;
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    51
+	rc = kadm5_init_with_password(context,
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    52
+								  princstr,
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    53
 								  password,
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    54
 								  KADM5_ADMIN_SERVICE,
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    55
 								  &params,
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    56
 								  KADM5_STRUCT_VERSION,
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    57
 								  KADM5_API_VERSION_2,
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    58
+								  db_args,
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    59
 								  &handle);
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    60
 
3e5bd9e5b22f Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff changeset
    61
 	if (rc) {