[Samba] %U in include

[Ludek Finstrle]

> > >   I had problem with %U in include tag in configuration file smb.conf.
> > > I try explain the problem. When I connecting from Windows (domain)
> > > the samba server doesn't properly include file.
> > > E.g.: smb.conf
> > >   include = smb.conf.%U
> > > It include only smb.conf. at first time.
> > > 
> > > Please send reply with cc: luf at pzkagis.cz as I'm not list member.
> > 
> > This was fixed in 2.2.7 (and also in the HEAD/SAMBA_3_0 branches)
> > a few days ago.  Is it still not working for you?
> 
> Now I see what you point me:
> 
> | RCS file: /cvsroot/samba/source/smbd/service.c,v
> | retrieving revision 1.85.2.4
> | retrieving revision 1.85.2.5
> | diff -u -r1.85.2.4 -r1.85.2.5
> | --- samba/source/smbd/service.c 2002/11/12 23:20:49     1.85.2.4
> | +++ samba/source/smbd/service.c 2002/11/18 06:12:47     1.85.2.5
> | @@ -611,6 +611,9 @@
> |                 *status = NT_STATUS_LOGON_FAILURE;
> |                 return NULL;
> |         }
> | +
> | +       /* the %U substitution may have changed */
> | +       reload_services(True);
> | 
> |         /* Remember that a different vuid can connect later without these checks
> 
> I'll try it with this patch on Monday as I'm not at work now.

Someone else was there so I can test it.
It doesn't work properly at first attempt. If I try it second time it work.

I add into patch (before /* the %U substitution may have changed */):

| DEBUG(0,("make_connection_snum: Try to reload services with user %s\n",current_user_info.smb_name));

Of course I add into make_connection_snum:
| extern userdom_struct current_user_info;

And the log output is:

[2002/11/23 14:25:18, 0] smbd/service.c:make_connection_snum(616)
  make_connection_snum: Try to reload services with user
[2002/11/23 14:25:19, 0] smbd/service.c:make_connection(836)
  theia (147.251.48.123) couldn't find service luf
[2002/11/23 14:25:24, 0] smbd/service.c:make_connection_snum(616)
  make_connection_snum: Try to reload services with user luf
[2002/11/23 14:25:24, 0] smbd/service.c:make_connection_snum(616)
  make_connection_snum: Try to reload services with user luf

I define service luf in included smb.conf.luf I can't do it with special
homes share.

Luf