Mercurial Mercurial > repos > sso-in-a-box / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/kadm5.patch
author Dan Fuhry <dan@enanocms.org>
Sat, 23 Feb 2013 14:26:38 -0500
changeset 9 f4bf6556fb9f
parent 0 3906ca745819
permissions -rw-r--r--
Merged
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
0
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
     1
 
diff -Naur kadm5-0.2.3/config.m4 kadm5-0.2.3~patched/config.m4
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
     2
 
--- kadm5-0.2.3/config.m4	2003-05-09 10:28:45.000000000 -0400
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
     3
 
+++ kadm5-0.2.3~patched/config.m4	2010-12-13 20:47:12.369457242 -0500
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
     4
 
@@ -43,6 +43,7 @@
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
     5
 
   # --with-kadm5 -> add include path
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
     6
 
   PHP_ADD_INCLUDE($KADM5_DIR)
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
     7
 
   PHP_ADD_INCLUDE($KADM5_DIR/krb5)
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
     8
 
+  PHP_ADD_INCLUDE($KADM5_DIR/et)
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
     9
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    10
 
   # --with-kadm5 -> chech for lib and symbol presence
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    11
 
   LIBNAME=kadm5srv # you may want to change this
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    12
 
@@ -59,7 +60,7 @@
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    13
 
   PHP_ADD_LIBRARY_WITH_PATH(gssrpc, /usr/lib, KADM5_SHARED_LIBADD)
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    14
 
   PHP_ADD_LIBRARY_WITH_PATH(krb5, /usr/lib, KADM5_SHARED_LIBADD)
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    15
 
   PHP_ADD_LIBRARY_WITH_PATH(k5crypto, /usr/lib, KADM5_SHARED_LIBADD)
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    16
 
-  PHP_ADD_LIBRARY_WITH_PATH(dyn, /usr/lib, KADM5_SHARED_LIBADD)
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    17
 
+  dnl PHP_ADD_LIBRARY_WITH_PATH(dyn, /usr/lib, KADM5_SHARED_LIBADD)
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    18
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    19
 
   PHP_EXTENSION(kadm5, $ext_shared)
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    20
 
 fi
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    21
 
diff -Naur kadm5-0.2.3/kadm5.c kadm5-0.2.3~patched/kadm5.c
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    22
 
--- kadm5-0.2.3/kadm5.c	2003-05-28 06:51:42.000000000 -0400
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    23
 
+++ kadm5-0.2.3~patched/kadm5.c	2010-12-13 20:39:23.154629086 -0500
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    24
 
@@ -29,7 +29,8 @@
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    25
 
 #include "config.h"
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    26
 
 #endif
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    27
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    28
 
-#include "kadm5/admin.h"
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    29
 
+#include <kadm5/admin.h>
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    30
 
+#include <kadm5/kadm_err.h>
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    31
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    32
 
 #include "php.h"
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    33
 
 #include "php_ini.h"
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    34
 
@@ -74,7 +75,7 @@
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    35
 
  *
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    36
 
  * Every user visible function must have an entry in kadm5_functions[].
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    37
 
  */
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    38
 
-function_entry kadm5_functions[] = {
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    39
 
+zend_function_entry kadm5_functions[] = {
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    40
 
 	PHP_FE(kadm5_init_with_password, NULL)
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    41
 
 	PHP_FE(kadm5_destroy, NULL)
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    42
 
 	PHP_FE(kadm5_flush, NULL)
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    43
 
@@ -436,6 +437,7 @@
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    44
 
 		php_error(E_WARNING, "Multiple values for single or folded enctype. (KADM5_SETKEY_DUP_ENCTYPES)");
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    45
 
 		break;
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    46
 
 	default:
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    47
 
+		break;
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    48
 
 	}
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    49
 
 }
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    50
 
 /* }}} */
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    51
 
@@ -465,12 +467,29 @@
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    52
 
 	params.admin_server = admin_server;
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    53
 
 	params.mask |= KADM5_CONFIG_ADMIN_SERVER;
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    54
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    55
 
-	rc = kadm5_init_with_password(princstr,
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    56
 
+/* prototype:
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    57
 
+kadm5_ret_t    kadm5_init_with_password(krb5_context context,
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    58
 
+                                        char *client_name,
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    59
 
+                                        char *pass,
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    60
 
+                                        char *service_name,
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    61
 
+                                        kadm5_config_params *params,
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    62
 
+                                        krb5_ui_4 struct_version,
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    63
 
+                                        krb5_ui_4 api_version,
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    64
 
+                                        char **db_args,
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    65
 
+                                        void **server_handle);
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    66
 
+*/
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    67
 
+
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    68
 
+	krb5_context context;
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    69
 
+	krb5_init_context(&context);
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    70
 
+	char **db_args = NULL;
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    71
 
+	rc = kadm5_init_with_password(context,
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    72
 
+								  princstr,
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    73
 
 								  password,
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    74
 
 								  KADM5_ADMIN_SERVICE,
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    75
 
 								  &params,
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    76
 
 								  KADM5_STRUCT_VERSION,
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    77
 
 								  KADM5_API_VERSION_2,
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    78
 
+								  db_args,
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    79
 
 								  &handle);
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    80
3906ca745819 First commit!
Dan Fuhry <dan@fuhry.us>
parents:
diff changeset 
    81
 
 	if (rc) {
SSO-in-a-Box