[SCM] Samba Shared Repository - branch master updated

simo idra at samba.org
Sat May 7 07:54:36 MDT 2011


On Sat, 2011-05-07 at 02:21 +0200, Jeremy Allison wrote:
> The branch, master has been updated
>        via  ac25835 Fix Samba3 on OpenIndiana.
>       from  f7b3909 A couple more off-by-one calculations with strlcpy.
> 
> http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
> 
> 
> - Log -----------------------------------------------------------------
> commit ac25835ab7b76226bd59fec9ffef46d5c5817d54
> Author: Gordon Ross <gordon.w.ross at gmail.com>
> Date:   Fri May 6 16:00:08 2011 -0700
> 
>     Fix Samba3 on OpenIndiana.
>     
>     I'd like Samba to use the native OpenLDAP and MIT Kerberos libs.
>     Attached are some patches to do that. (relative to git master)
>     It does not build for me without these.
>     
>     (OpenIndiana is an off-shoot of OpenSolaris  See http://www.openindiana.org)
>     
>     Autobuild-User: Jeremy Allison <jra at samba.org>
>     Autobuild-Date: Sat May  7 02:20:14 CEST 2011 on sn-devel-104
> 
> -----------------------------------------------------------------------
> 
> Summary of changes:
>  auth/kerberos/gssapi_pac.c    |   24 ++++++++++++++++++++++++
>  lib/replace/system/kerberos.h |    4 +++-
>  source3/configure.in          |   26 +++++++++++++++++++++-----
>  source3/wscript               |    2 +-
>  4 files changed, 49 insertions(+), 7 deletions(-)
> 
> 
> Changeset truncated at 500 lines:
> 
> diff --git a/auth/kerberos/gssapi_pac.c b/auth/kerberos/gssapi_pac.c
> index d89a649..e115cfe 100644
> --- a/auth/kerberos/gssapi_pac.c
> +++ b/auth/kerberos/gssapi_pac.c
> @@ -23,6 +23,30 @@
>  
>  #include "libcli/auth/krb5_wrap.h"
>  
> +#if 0
> +/* FIXME - need proper configure/waf test
> + * to determine if gss_mech_krb5 and friends
> + * exist. JRA.
> + */
> +/*
> + * These are not exported by Solaris -lkrb5
> + * Maybe move to libreplace somewhere?
> + */
> +static const gss_OID_desc krb5_gss_oid_array[] = {
> +	/* this is the official, rfc-specified OID */
> +	{ 9, "\052\206\110\206\367\022\001\002\002" },
> +	/* this is the pre-RFC mech OID */
> +	{ 5, "\053\005\001\005\002" },
> +	/* this is the unofficial, incorrect mech OID emitted by MS */
> +	{ 9, "\052\206\110\202\367\022\001\002\002" },
> +	{ 0, 0 }
> +};

Jeremy something looks wrong here.
The comments seem to imply the MS and the official OID should be
different, (the MS being wrong), yet I see non difference between them.


Simo.

-- 
Simo Sorce
Samba Team GPL Compliance Officer <simo at samba.org>
Principal Software Engineer at Red Hat, Inc. <simo at redhat.com>



More information about the samba-cvs mailing list