diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-02 18:56:10 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-06 17:37:50 +1000 |
| commit | a18efb1490cebd92205973c50ce1582b091a7676 (patch) | |
| tree | 753518ad996beec1af6a2b63449ce8c8ee4805a4 /source4/param | |
| parent | 834d590bcff79e2d458b9e193be0c64e849a6362 (diff) | |
| download | samba-a18efb1490cebd92205973c50ce1582b091a7676.tar.gz samba-a18efb1490cebd92205973c50ce1582b091a7676.tar.bz2 samba-a18efb1490cebd92205973c50ce1582b091a7676.zip | |
s4-param Remove 'sid generator'
This was only used by the Fedora DS backend for Samba4. We agreed to
no longer support external LDAP backends.
Andrew Bartlett
Diffstat (limited to 'source4/param')
| -rw-r--r-- | source4/param/loadparm.c | 10 | ||||
| -rw-r--r-- | source4/param/param.h | 5 |
2 files changed, 0 insertions, 15 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 69a5ad590e..d5c82354af 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -80,7 +80,6 @@ static bool defaults_saved = false; struct loadparm_global { enum server_role server_role; - enum sid_generator sid_generator; const char **smb_ports; char *ncalrpc_dir; @@ -331,19 +330,11 @@ static const struct enum_list enum_server_role[] = { {-1, NULL} }; -static const struct enum_list enum_sid_generator[] = { - {SID_GENERATOR_INTERNAL, "internal"}, - {SID_GENERATOR_BACKEND, "backend"}, - {-1, NULL} -}; - #define GLOBAL_VAR(name) offsetof(struct loadparm_global, name) #define LOCAL_VAR(name) offsetof(struct loadparm_service, name) static struct parm_struct parm_table[] = { {"server role", P_ENUM, P_GLOBAL, GLOBAL_VAR(server_role), NULL, enum_server_role}, - {"sid generator", P_ENUM, P_GLOBAL, GLOBAL_VAR(sid_generator), NULL, enum_sid_generator}, - {"dos charset", P_STRING, P_GLOBAL, GLOBAL_VAR(dos_charset), NULL, NULL}, {"unix charset", P_STRING, P_GLOBAL, GLOBAL_VAR(unix_charset), NULL, NULL}, {"ncalrpc dir", P_STRING, P_GLOBAL, GLOBAL_VAR(ncalrpc_dir), NULL, NULL}, @@ -638,7 +629,6 @@ static struct loadparm_context *global_loadparm_context; _PUBLIC_ int lpcfg_ ## fn_name(struct loadparm_service *service, struct loadparm_service *sDefault) {return((service != NULL)? service->val : sDefault->val);} FN_GLOBAL_INTEGER(server_role, server_role) -FN_GLOBAL_INTEGER(sid_generator, sid_generator) FN_GLOBAL_LIST(smb_ports, smb_ports) FN_GLOBAL_INTEGER(nbt_port, nbt_port) FN_GLOBAL_INTEGER(dgram_port, dgram_port) diff --git a/source4/param/param.h b/source4/param/param.h index 622250b8b7..79a1bff2c7 100644 --- a/source4/param/param.h +++ b/source4/param/param.h @@ -47,11 +47,6 @@ typedef NTSTATUS (*init_module_fn) (void); #include "libds/common/roles.h" -enum sid_generator { - SID_GENERATOR_INTERNAL=0, - SID_GENERATOR_BACKEND=1, -}; - enum announce_as {/* Types of machine we can announce as. */ ANNOUNCE_AS_NT_SERVER=1, ANNOUNCE_AS_WIN95=2, |