diff options
| author | Andrew Tridgell <tridge@samba.org> | 2000-05-10 09:49:55 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2000-05-10 09:49:55 +0000 |
| commit | ddc9b8b40642c90fe7c34b088eae4f8075f4033a (patch) | |
| tree | 56c378815bdf109d13b1d4e5b51f0e1ea313a58d /source3/param/loadparm.c | |
| parent | 6cf96ff43155346589e19c1bb2fd723be74f1f12 (diff) | |
| download | samba-ddc9b8b40642c90fe7c34b088eae4f8075f4033a.tar.gz samba-ddc9b8b40642c90fe7c34b088eae4f8075f4033a.tar.xz samba-ddc9b8b40642c90fe7c34b088eae4f8075f4033a.zip | |
more merging
it is now at the stage that winbindd can compile in the head branch,
but not link
(This used to be commit d178c00aae77710ae6ff20a7f54a30e3bd8232bb)
Diffstat (limited to 'source3/param/loadparm.c')
| -rw-r--r-- | source3/param/loadparm.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 04bf6522bf..1945dcffb2 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -1087,7 +1087,7 @@ static void init_globals(void) Globals.bAllowTrustedDomains = True; string_set(&Globals.szTemplateShell, "/bin/false"); - string_set(&Globals.szTemplateHomedir, "/home/%U"); + string_set(&Globals.szTemplateHomedir, "/home/%D/%U"); Globals.winbind_cache_time = 15; /* @@ -1279,6 +1279,10 @@ FN_GLOBAL_STRING(lp_nt_forms,&Globals.szNtForms) FN_GLOBAL_STRING(lp_nt_drivers_file,&Globals.szNtDriverFile) #ifdef WITH_LDAP +FN_GLOBAL_STRING(lp_winbind_uid,&Globals.szWinbindUID) +FN_GLOBAL_STRING(lp_winbind_gid,&Globals.szWinbindGID) +FN_GLOBAL_STRING(lp_template_homedir,&Globals.szTemplateHomedir) +FN_GLOBAL_STRING(lp_template_shell,&Globals.szTemplateShell) FN_GLOBAL_STRING(lp_ldap_server,&Globals.szLdapServer); FN_GLOBAL_STRING(lp_ldap_suffix,&Globals.szLdapSuffix); FN_GLOBAL_STRING(lp_ldap_filter,&Globals.szLdapFilter); @@ -1478,6 +1482,7 @@ FN_LOCAL_INTEGER(lp_write_cache_size,iWriteCacheSize) FN_LOCAL_CHAR(lp_magicchar,magic_char) +FN_GLOBAL_INTEGER(lp_winbind_cache_time, &Globals.winbind_cache_time) /* local prototypes */ static int strwicmp( char *psz1, char *psz2 ); |