summaryrefslogtreecommitdiffstats
path: root/source3/param
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2000-05-12 06:30:45 +0000
committerAndrew Tridgell <tridge@samba.org>2000-05-12 06:30:45 +0000
commit479c73559e137a406f912f8e262e1658861dc9db (patch)
tree66f9a62b59164387fad03d01b0b00386b4fdaecd /source3/param
parent5379476d4d38ea164ebda5f39cadb68c2350c399 (diff)
downloadsamba-479c73559e137a406f912f8e262e1658861dc9db.tar.gz
samba-479c73559e137a406f912f8e262e1658861dc9db.tar.xz
samba-479c73559e137a406f912f8e262e1658861dc9db.zip
use "winbind separator" option for domain/user separator character
(This used to be commit 6cbb826b154e61085fd651116caf472d4d438c1d)
Diffstat (limited to 'source3/param')
-rw-r--r--source3/param/loadparm.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 97901cae8e8..9acfd5c170b 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -169,6 +169,7 @@ typedef struct
char *szWinbindGID;
char *szTemplateHomedir;
char *szTemplateShell;
+ char *szWinbindSeparator;
int max_log_size;
int mangled_stack;
int max_xmit;
@@ -903,6 +904,7 @@ static struct parm_struct parm_table[] =
{"winbind gid", P_STRING, P_GLOBAL, &Globals.szWinbindGID, handle_winbind_id, NULL, 0},
{"template homedir", P_STRING, P_GLOBAL, &Globals.szTemplateHomedir, NULL, NULL, 0},
{"template shell", P_STRING, P_GLOBAL, &Globals.szTemplateShell, NULL, NULL, 0},
+ {"winbind separator", P_STRING, P_GLOBAL, &Globals.szWinbindSeparator, NULL, NULL, 0},
{"winbind cache time", P_INTEGER, P_GLOBAL, &Globals.winbind_cache_time, NULL, NULL, 0},
{NULL, P_BOOL, P_NONE, NULL, NULL, NULL, 0}
@@ -1090,6 +1092,7 @@ static void init_globals(void)
string_set(&Globals.szTemplateShell, "/bin/false");
string_set(&Globals.szTemplateHomedir, "/home/%D/%U");
+ string_set(&Globals.szWinbindSeparator, "\\");
Globals.winbind_cache_time = 15;
/*
@@ -1280,11 +1283,13 @@ FN_GLOBAL_STRING(lp_domain_guest_users,&Globals.szDomainGuestUsers)
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_winbind_separator,&Globals.szWinbindSeparator)
+
+#ifdef WITH_LDAP
FN_GLOBAL_STRING(lp_ldap_server,&Globals.szLdapServer);
FN_GLOBAL_STRING(lp_ldap_suffix,&Globals.szLdapSuffix);
FN_GLOBAL_STRING(lp_ldap_filter,&Globals.szLdapFilter);