[PATCH] s3fs-auth: Use the correct name for the guest auth module.

Andreas Schneider asn at samba.org
Wed Oct 17 02:30:03 MDT 2012


On Wednesday 17 October 2012 13:57:14 Andrew Bartlett wrote:
> On Tue, 2012-10-16 at 14:09 +0200, Andreas Schneider wrote:
> > The auth method name of this module is 'guest' and not 'builtin'.
> > 
> > Signed-off-by: Andreas Schneider <asn at samba.org>
> > ---
> > 
> >  source3/auth/{auth_builtin.c => auth_guest.c} | 0
> >  source3/auth/wscript_build                    | 9 ++++-----
> >  2 files changed, 4 insertions(+), 5 deletions(-)
> >  rename source3/auth/{auth_builtin.c => auth_guest.c} (100%)
> > 
> > diff --git a/source3/auth/auth_builtin.c b/source3/auth/auth_guest.c
> > similarity index 100%
> > rename from source3/auth/auth_builtin.c
> > rename to source3/auth/auth_guest.c
> > diff --git a/source3/auth/wscript_build b/source3/auth/wscript_build
> > index 8a535cb..d6f934d63 100644
> > --- a/source3/auth/wscript_build
> > +++ b/source3/auth/wscript_build
> > @@ -1,6 +1,5 @@
> > 
> >  #!/usr/bin/env python
> > 
> > -AUTH_BUILTIN_SRC = 'auth_builtin.c'
> > 
> >  AUTH_DOMAIN_SRC = 'auth_domain.c'
> >  AUTH_SAM_SRC = 'auth_sam.c'
> >  AUTH_UNIX_SRC = 'auth_unix.c'
> > 
> > @@ -75,13 +74,13 @@ bld.SAMBA3_MODULE('auth_domain',
> > 
> >                   internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_domain
> >                   '),
> >                   enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_domain'))
> > 
> > -bld.SAMBA3_MODULE('auth_builtin',
> > +bld.SAMBA3_MODULE('auth_guest',
> > 
> >                   subsystem='auth',
> > 
> > -                 source=AUTH_BUILTIN_SRC,
> > +                 source='auth_guest.c',
> > 
> >                   deps='samba-util',
> >                   init_function='',
> > 
> > -                
> > internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_builtin'), -           
> >      enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_builtin')) +             
> >    internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_guest'), +          
> >       enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_guest'))
> I think a simpler solution is in order - it makes no sense for this
> module to be a plugin, it is totally trivial and should always be
> internal.  Indeed, I can't think of a good reason for any of the modules
> we use by default to be plugins (except perhaps auth_samba4).
> 
> BTW, the modules in the various default lists are: guest sam winbind
> ntdomain trustdomain samba4

So the wscript should be changed so we can't built them as a module at all. 
What is "builtin" doing?


	-- andreas

-- 
Andreas Schneider                   GPG-ID: F33E3FC6
Samba Team                             asn at samba.org
www.samba.org



More information about the samba-technical mailing list