Refresh 0041_fix_keytab_option_for_MIT_kerberos.patch so that it applies cleanly
Roberto C. Sanchez
10 years ago
| 24 | 24 | |
| 25 | 25 | --- cyrus-sasl2.git.orig/configure |
| 26 | 26 | +++ cyrus-sasl2.git/configure |
| 27 | @@ -13333,7 +13333,7 @@ | |
| 27 | @@ -13367,7 +13367,7 @@ | |
| 28 | 28 | cmu_save_LIBS="$LIBS" |
| 29 | 29 | LIBS="$LIBS $GSSAPIBASE_LIBS" |
| 30 | 30 | |
| 45 | 45 | |
| 46 | 46 | #ifdef WIN32 |
| 47 | 47 | # include <winsock2.h> |
| 48 | @@ -1271,7 +1274,7 @@ | |
| 48 | @@ -1365,7 +1368,7 @@ | |
| 49 | 49 | }; |
| 50 | 50 | |
| 51 | 51 | int gssapiv2_server_plug_init( |
| 54 | 54 | const sasl_utils_t *utils __attribute__((unused)), |
| 55 | 55 | #else |
| 56 | 56 | const sasl_utils_t *utils, |
| 57 | @@ -1281,7 +1284,7 @@ | |
| 57 | @@ -1375,7 +1378,7 @@ | |
| 58 | 58 | sasl_server_plug_t **pluglist, |
| 59 | 59 | int *plugcount) |
| 60 | 60 | { |
| 63 | 63 | const char *keytab = NULL; |
| 64 | 64 | char keytab_path[1024]; |
| 65 | 65 | unsigned int rl; |
| 66 | @@ -1291,7 +1294,7 @@ | |
| 66 | @@ -1385,7 +1388,7 @@ | |
| 67 | 67 | return SASL_BADVERS; |
| 68 | 68 | } |
| 69 | 69 | |
| 72 | 72 | /* unfortunately, we don't check for readability of keytab if it's |
| 73 | 73 | the standard one, since we don't know where it is */ |
| 74 | 74 | |
| 75 | @@ -1314,7 +1317,12 @@ | |
| 75 | @@ -1408,7 +1411,12 @@ | |
| 76 | 76 | |
| 77 | 77 | strncpy(keytab_path, keytab, 1024); |
| 78 | 78 | |
| 98 | 98 | { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 |
| 99 | 99 | --- cyrus-sasl2.git.orig/saslauthd/saslauthd.h.in |
| 100 | 100 | +++ cyrus-sasl2.git/saslauthd/saslauthd.h.in |
| 101 | @@ -59,6 +59,10 @@ | |
| 101 | @@ -62,6 +62,10 @@ | |
| 102 | 102 | */ |
| 103 | 103 | #undef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY |
| 104 | 104 | |