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