components/samba/samba/patches/svc-cifs-in-keytab.patch
author Jiri Sasek <Jiri.Sasek@Oracle.COM>
Fri, 27 Feb 2015 10:07:56 -0800
changeset 4371 29fdb14099eb
permissions -rw-r--r--
PSARC/2015/008 Update Samba to release 4 18462092 Update to Samba 4.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4371
29fdb14099eb PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     1
Source: Home brewed
29fdb14099eb PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     2
...so called MS Extensions do not support "host" (service name) as a wildcard also for "cifs".
29fdb14099eb PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     3
Drop-in will fix this issue.
29fdb14099eb PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     4
29fdb14099eb PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     5
--- a/source3/libads/kerberos_keytab.c	2014-12-01 12:48:32.000000000 +0000
29fdb14099eb PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     6
+++ samba-4.1.14/source3/libads/kerberos_keytab.c	2015-01-16 08:25:27.237534267 +0000
29fdb14099eb PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     7
@@ -559,11 +559,11 @@
29fdb14099eb PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     8
 		}
29fdb14099eb PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     9
 	}
29fdb14099eb PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    10
 
29fdb14099eb PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    11
-#if 0	/* don't create the CIFS/... keytab entries since no one except smbd
29fdb14099eb PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    12
+#if 1	/* don't create the CIFS/... keytab entries since no one except smbd
29fdb14099eb PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    13
 	   really needs them and we will fall back to verifying against
29fdb14099eb PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    14
 	   secrets.tdb */
29fdb14099eb PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    15
 
29fdb14099eb PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    16
-	ret = ads_keytab_add_entry(ads, "cifs"));
29fdb14099eb PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    17
+	ret = ads_keytab_add_entry(ads, "cifs");
29fdb14099eb PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    18
 	if (ret != 0 ) {
29fdb14099eb PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    19
 		DEBUG(1, (__location__ ": ads_keytab_add_entry failed while "
29fdb14099eb PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    20
 			  "adding 'cifs'.\n"));