git.samba.org
/
abartlet
/
samba.git
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2cc2b29
)
s3:s3compat Allow replacement of lp_idmap_backend() and lp_idmap_alloc_backend
author
Andrew Bartlett
<abartlet@samba.org>
Mon, 24 May 2010 05:00:20 +0000
(15:00 +1000)
committer
Andrew Bartlett
<abartlet@samba.org>
Tue, 8 Jun 2010 01:46:51 +0000
(11:46 +1000)
source3/param/loadparm.c
patch
|
blob
|
history
diff --git
a/source3/param/loadparm.c
b/source3/param/loadparm.c
index 06803b68fe75d4057a663e55bc1d561b7fdefcaf..1839a233d3485f1c7917670a7f52ad71f1360baf 100644
(file)
--- a/
source3/param/loadparm.c
+++ b/
source3/param/loadparm.c
@@
-5522,8
+5522,10
@@
FN_GLOBAL_BOOL(lp_winbind_normalize_names, &Globals.bWinbindNormalizeNames)
FN_GLOBAL_BOOL(lp_winbind_rpc_only, &Globals.bWinbindRpcOnly)
FN_GLOBAL_BOOL(lp_create_krb5_conf, &Globals.bCreateKrb5Conf)
FN_GLOBAL_BOOL(lp_winbind_rpc_only, &Globals.bWinbindRpcOnly)
FN_GLOBAL_BOOL(lp_create_krb5_conf, &Globals.bCreateKrb5Conf)
+#ifndef ENABLE_S3COMPAT
FN_GLOBAL_CONST_STRING(lp_idmap_backend, &Globals.szIdmapBackend)
FN_GLOBAL_STRING(lp_idmap_alloc_backend, &Globals.szIdmapAllocBackend)
FN_GLOBAL_CONST_STRING(lp_idmap_backend, &Globals.szIdmapBackend)
FN_GLOBAL_STRING(lp_idmap_alloc_backend, &Globals.szIdmapAllocBackend)
+#endif
FN_GLOBAL_INTEGER(lp_idmap_cache_time, &Globals.iIdmapCacheTime)
FN_GLOBAL_INTEGER(lp_idmap_negative_cache_time, &Globals.iIdmapNegativeCacheTime)
FN_GLOBAL_INTEGER(lp_keepalive, &Globals.iKeepalive)
FN_GLOBAL_INTEGER(lp_idmap_cache_time, &Globals.iIdmapCacheTime)
FN_GLOBAL_INTEGER(lp_idmap_negative_cache_time, &Globals.iIdmapNegativeCacheTime)
FN_GLOBAL_INTEGER(lp_keepalive, &Globals.iKeepalive)