author | Dan Fuhry <dan@enanocms.org> |
Mon, 13 Dec 2010 20:48:25 -0500 | |
changeset 3 | 99b46c7d3ee0 |
parent 2 | 3e5bd9e5b22f |
permissions | -rw-r--r-- |
3
99b46c7d3ee0
Some updates/fixes to the kadm5 patch
Dan Fuhry <dan@enanocms.org>
parents:
2
diff
changeset
|
1 |
diff -Naur kadm5-0.2.3/config.m4 kadm5-0.2.3~patched/config.m4 |
99b46c7d3ee0
Some updates/fixes to the kadm5 patch
Dan Fuhry <dan@enanocms.org>
parents:
2
diff
changeset
|
2 |
--- kadm5-0.2.3/config.m4 2003-05-09 10:28:45.000000000 -0400 |
99b46c7d3ee0
Some updates/fixes to the kadm5 patch
Dan Fuhry <dan@enanocms.org>
parents:
2
diff
changeset
|
3 |
+++ kadm5-0.2.3~patched/config.m4 2010-12-13 20:47:12.369457242 -0500 |
99b46c7d3ee0
Some updates/fixes to the kadm5 patch
Dan Fuhry <dan@enanocms.org>
parents:
2
diff
changeset
|
4 |
@@ -43,6 +43,7 @@ |
99b46c7d3ee0
Some updates/fixes to the kadm5 patch
Dan Fuhry <dan@enanocms.org>
parents:
2
diff
changeset
|
5 |
# --with-kadm5 -> add include path |
99b46c7d3ee0
Some updates/fixes to the kadm5 patch
Dan Fuhry <dan@enanocms.org>
parents:
2
diff
changeset
|
6 |
PHP_ADD_INCLUDE($KADM5_DIR) |
99b46c7d3ee0
Some updates/fixes to the kadm5 patch
Dan Fuhry <dan@enanocms.org>
parents:
2
diff
changeset
|
7 |
PHP_ADD_INCLUDE($KADM5_DIR/krb5) |
99b46c7d3ee0
Some updates/fixes to the kadm5 patch
Dan Fuhry <dan@enanocms.org>
parents:
2
diff
changeset
|
8 |
+ PHP_ADD_INCLUDE($KADM5_DIR/et) |
99b46c7d3ee0
Some updates/fixes to the kadm5 patch
Dan Fuhry <dan@enanocms.org>
parents:
2
diff
changeset
|
9 |
|
99b46c7d3ee0
Some updates/fixes to the kadm5 patch
Dan Fuhry <dan@enanocms.org>
parents:
2
diff
changeset
|
10 |
# --with-kadm5 -> chech for lib and symbol presence |
99b46c7d3ee0
Some updates/fixes to the kadm5 patch
Dan Fuhry <dan@enanocms.org>
parents:
2
diff
changeset
|
11 |
LIBNAME=kadm5srv # you may want to change this |
99b46c7d3ee0
Some updates/fixes to the kadm5 patch
Dan Fuhry <dan@enanocms.org>
parents:
2
diff
changeset
|
12 |
@@ -59,7 +60,7 @@ |
99b46c7d3ee0
Some updates/fixes to the kadm5 patch
Dan Fuhry <dan@enanocms.org>
parents:
2
diff
changeset
|
13 |
PHP_ADD_LIBRARY_WITH_PATH(gssrpc, /usr/lib, KADM5_SHARED_LIBADD) |
99b46c7d3ee0
Some updates/fixes to the kadm5 patch
Dan Fuhry <dan@enanocms.org>
parents:
2
diff
changeset
|
14 |
PHP_ADD_LIBRARY_WITH_PATH(krb5, /usr/lib, KADM5_SHARED_LIBADD) |
99b46c7d3ee0
Some updates/fixes to the kadm5 patch
Dan Fuhry <dan@enanocms.org>
parents:
2
diff
changeset
|
15 |
PHP_ADD_LIBRARY_WITH_PATH(k5crypto, /usr/lib, KADM5_SHARED_LIBADD) |
99b46c7d3ee0
Some updates/fixes to the kadm5 patch
Dan Fuhry <dan@enanocms.org>
parents:
2
diff
changeset
|
16 |
- PHP_ADD_LIBRARY_WITH_PATH(dyn, /usr/lib, KADM5_SHARED_LIBADD) |
99b46c7d3ee0
Some updates/fixes to the kadm5 patch
Dan Fuhry <dan@enanocms.org>
parents:
2
diff
changeset
|
17 |
+ dnl PHP_ADD_LIBRARY_WITH_PATH(dyn, /usr/lib, KADM5_SHARED_LIBADD) |
99b46c7d3ee0
Some updates/fixes to the kadm5 patch
Dan Fuhry <dan@enanocms.org>
parents:
2
diff
changeset
|
18 |
|
99b46c7d3ee0
Some updates/fixes to the kadm5 patch
Dan Fuhry <dan@enanocms.org>
parents:
2
diff
changeset
|
19 |
PHP_EXTENSION(kadm5, $ext_shared) |
99b46c7d3ee0
Some updates/fixes to the kadm5 patch
Dan Fuhry <dan@enanocms.org>
parents:
2
diff
changeset
|
20 |
fi |
2
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
21 |
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
|
22 |
--- kadm5-0.2.3/kadm5.c 2003-05-28 06:51:42.000000000 -0400 |
3
99b46c7d3ee0
Some updates/fixes to the kadm5 patch
Dan Fuhry <dan@enanocms.org>
parents:
2
diff
changeset
|
23 |
+++ kadm5-0.2.3~patched/kadm5.c 2010-12-13 20:39:23.154629086 -0500 |
2
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
24 |
@@ -29,7 +29,8 @@ |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
25 |
#include "config.h" |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
26 |
#endif |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
27 |
|
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
28 |
-#include "kadm5/admin.h" |
3
99b46c7d3ee0
Some updates/fixes to the kadm5 patch
Dan Fuhry <dan@enanocms.org>
parents:
2
diff
changeset
|
29 |
+#include <kadm5/admin.h> |
99b46c7d3ee0
Some updates/fixes to the kadm5 patch
Dan Fuhry <dan@enanocms.org>
parents:
2
diff
changeset
|
30 |
+#include <kadm5/kadm_err.h> |
2
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
31 |
|
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
32 |
#include "php.h" |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
33 |
#include "php_ini.h" |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
34 |
@@ -74,7 +75,7 @@ |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
35 |
* |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
36 |
* 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
|
37 |
*/ |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
38 |
-function_entry kadm5_functions[] = { |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
39 |
+zend_function_entry kadm5_functions[] = { |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
40 |
PHP_FE(kadm5_init_with_password, NULL) |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
41 |
PHP_FE(kadm5_destroy, NULL) |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
42 |
PHP_FE(kadm5_flush, NULL) |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
43 |
@@ -436,6 +437,7 @@ |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
44 |
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
|
45 |
break; |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
46 |
default: |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
47 |
+ break; |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
48 |
} |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
49 |
} |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
50 |
/* }}} */ |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
51 |
@@ -465,12 +467,29 @@ |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
52 |
params.admin_server = admin_server; |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
53 |
params.mask |= KADM5_CONFIG_ADMIN_SERVER; |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
54 |
|
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
55 |
- rc = kadm5_init_with_password(princstr, |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
56 |
+/* prototype: |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
57 |
+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
|
58 |
+ char *client_name, |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
59 |
+ char *pass, |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
60 |
+ char *service_name, |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
61 |
+ kadm5_config_params *params, |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
62 |
+ krb5_ui_4 struct_version, |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
63 |
+ krb5_ui_4 api_version, |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
64 |
+ char **db_args, |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
65 |
+ void **server_handle); |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
66 |
+*/ |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
67 |
+ |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
68 |
+ krb5_context context; |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
69 |
+ krb5_init_context(&context); |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
70 |
+ char **db_args = NULL; |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
71 |
+ rc = kadm5_init_with_password(context, |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
72 |
+ princstr, |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
73 |
password, |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
74 |
KADM5_ADMIN_SERVICE, |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
75 |
¶ms, |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
76 |
KADM5_STRUCT_VERSION, |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
77 |
KADM5_API_VERSION_2, |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
78 |
+ db_args, |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
79 |
&handle); |
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
80 |
|
3e5bd9e5b22f
Added my patch to the kadm5 extension
Dan Fuhry <dan@enanocms.org>
parents:
diff
changeset
|
81 |
if (rc) { |