cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

disable a workaround for the MIT kerberos implementation that we

Browse Source 
dont need because we use heimdal instead. this lets the ads flavor
of samba manage the kerberos keytab on openbsd.

no objections from mbalmer@
This commit is contained in:
dlg 2008-05-13 11:34:12 +00:00
parent d32bee9450
commit 6c4423c0f6
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/samba/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.90 2008/03/18 09:15:50 dlg Exp $
# $OpenBSD: Makefile,v 1.91 2008/05/13 11:34:12 dlg Exp $
COMMENT-main= SMB and CIFS client and server for UNIX
COMMENT-docs= documentation and examples for samba
DISTNAME= samba-3.0.28
PKGNAME-main= ${DISTNAME}p0
PKGNAME-main= ${DISTNAME}p1
FULLPKGNAME-docs= ${DISTNAME:S/-/-docs-/}
SHARED_LIBS= smbclient 1.0 \
msrpc 1.0

21
net/samba/patches/patch-libads_kerberos_keytab_c Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-libads_kerberos_keytab_c,v 1.1 2008/05/13 11:34:12 dlg Exp $
--- libads/kerberos_keytab.c.orig Thu Nov 15 13:15:03 2007
+++ libads/kerberos_keytab.c Mon May 12 13:38:30 2008
@@ -246,7 +246,7 @@ int ads_keytab_add_entry(ADS_STRUCT *ads, const char *
return -1;
}
-#ifdef HAVE_WRFILE_KEYTAB /* MIT */
+#if 0 && defined(HAVE_WRFILE_KEYTAB) /* MIT */
keytab_name[0] = 'W';
keytab_name[1] = 'R';
ret = krb5_kt_default_name(context, (char *) &keytab_name[2], MAX_KEYTAB_NAME_LEN - 4);
@@ -394,7 +394,7 @@ int ads_keytab_flush(ADS_STRUCT *ads)
DEBUG(1,("ads_keytab_flush: could not krb5_init_context: %s\n",error_message(ret)));
return ret;
}
-#ifdef HAVE_WRFILE_KEYTAB
+#if 0 && defined(HAVE_WRFILE_KEYTAB)
keytab_name[0] = 'W';
keytab_name[1] = 'R';
ret = krb5_kt_default_name(context, (char *) &keytab_name[2], MAX_KEYTAB_NAME_LEN - 4);