Imported Debian patch 1.0.12-2

[nfs-utils.git] / debian / patches / 11-root-on-krb5-mounts.patch

diff --git a/debian/patches/11-root-on-krb5-mounts.patch b/debian/patches/11-root-on-krb5-mounts.patch
deleted file mode 100644 (file)
index 5d8c301..0000000
--- a/debian/patches/11-root-on-krb5-mounts.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: nfs-utils-1.0.11~git-20070212/utils/gssd/krb5_util.c
-===================================================================
---- nfs-utils-1.0.11~git-20070212.orig/utils/gssd/krb5_util.c
-+++ nfs-utils-1.0.11~git-20070212/utils/gssd/krb5_util.c
-@@ -120,6 +120,9 @@
- #include "gss_oids.h"
- #include "krb5_util.h"
- 
-+#define GSSD_MACHINE_CRED_NAME "root"
-+#define GSSD_MACHINE_CRED_NAME_LEN 4
-+
- /* Global list of principals/cache file names for machine credentials */
- struct gssd_k5_kt_princ *gssd_k5_kt_princ_list = NULL;
- 
-@@ -490,13 +493,13 @@ gssd_process_krb5_keytab(krb5_context co
-               printerr(2, "Processing keytab entry for principal '%s'\n",
-                        pname);
- #ifdef HAVE_KRB5
--              if ( (kte.principal->data[0].length == GSSD_SERVICE_NAME_LEN) &&
--                   (strncmp(kte.principal->data[0].data, GSSD_SERVICE_NAME,
--                            GSSD_SERVICE_NAME_LEN) == 0) &&
-+              if ( (kte.principal->data[0].length == GSSD_MACHINE_CRED_NAME_LEN) &&
-+                   (strncmp(kte.principal->data[0].data, GSSD_MACHINE_CRED_NAME,
-+                            GSSD_MACHINE_CRED_NAME_LEN) == 0) &&
- #else
--              if ( (strlen(kte.principal->name.name_string.val[0]) == GSSD_SERVICE_NAME_LEN) &&
--                   (strncmp(kte.principal->name.name_string.val[0], GSSD_SERVICE_NAME,
--                            GSSD_SERVICE_NAME_LEN) == 0) &&
-+              if ( (strlen(kte.principal->name.name_string.val[0]) == GSSD_MACHINE_CRED_NAME_LEN) &&
-+                   (strncmp(kte.principal->name.name_string.val[0], GSSD_MACHINE_CRED_NAME,
-+                            GSSD_MACHINE_CRED_NAME_LEN) == 0) &&
-                             
- #endif
-                    (!gssd_have_realm_ple((void *)&kte.principal->realm)) ) {
-@@ -708,7 +711,7 @@ gssd_refresh_krb5_machine_creds(void)
-                       printerr(0, "Do you have a valid keytab entry for "
-                                   "%s/<your.host>@<YOUR.REALM> in "
-                                   "keytab file %s ?\n",
--                                  GSSD_SERVICE_NAME, keytabfile);
-+                                  GSSD_MACHINE_CRED_NAME, keytabfile);
-                       printerr(0, "Continuing without (machine) credentials "
-                                   "- nfs4 mounts with Kerberos will fail\n");
-               }