diff options
Diffstat (limited to 'source3')
| -rwxr-xr-x | source3/configure | 31 | ||||
| -rw-r--r-- | source3/configure.in | 18 | ||||
| -rw-r--r-- | source3/include/config.h.in | 3 | ||||
| -rw-r--r-- | source3/passdb/pdb_ldap.c | 14 |
4 files changed, 7 insertions, 59 deletions
diff --git a/source3/configure b/source3/configure index 53487964f8..c0be6591cf 100755 --- a/source3/configure +++ b/source3/configure @@ -876,7 +876,6 @@ Optional Packages: --with-smbmount Include SMBMOUNT (Linux only) support (default=no) --with-pam Include PAM support (default=no) --with-pam_smbpass Build a PAM module to allow other applications to use our smbpasswd file (default=no) - --with-sam Build new (experimental) SAM database (default=no) --with-ldapsam Include LDAP SAM 2.2 compatible configuration (default=no) --with-tdbsam Include experimental TDB SAM support (default=no) --with-nisplussam Include NISPLUS SAM support (default=no) @@ -21107,36 +21106,6 @@ _ACEOF fi fi -# New experimental SAM system - -echo "$as_me:$LINENO: checking whether to build the new (experimental) SAM database" >&5 -echo $ECHO_N "checking whether to build the new (experimental) SAM database... $ECHO_C" >&6 - -# Check whether --with-sam or --without-sam was given. -if test "${with_sam+set}" = set; then - withval="$with_sam" - case "$withval" in - yes) - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - -cat >>confdefs.h <<\_ACEOF -#define WITH_SAM 1 -_ACEOF - - ;; - *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - ;; - esac -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - -fi; - - ######################################################################################## ## ## TESTS FOR SAM BACKENDS. KEEP THESE GROUPED TOGETHER diff --git a/source3/configure.in b/source3/configure.in index 070667e44c..16e9af4b47 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -2206,24 +2206,6 @@ if test x"$samba_cv_HAVE_TRUNCATED_SALT" = x"yes"; then fi fi -# New experimental SAM system - -AC_MSG_CHECKING([whether to build the new (experimental) SAM database]) -AC_ARG_WITH(sam, -[ --with-sam Build new (experimental) SAM database (default=no)], -[ case "$withval" in - yes) - AC_MSG_RESULT(yes) - AC_DEFINE(WITH_SAM,1,[Whether to build the new (experimental) SAM database]) - ;; - *) - AC_MSG_RESULT(no) - ;; - esac ], - AC_MSG_RESULT(no) -) - - ######################################################################################## ## ## TESTS FOR SAM BACKENDS. KEEP THESE GROUPED TOGETHER diff --git a/source3/include/config.h.in b/source3/include/config.h.in index 0895a783d4..d15d699fb5 100644 --- a/source3/include/config.h.in +++ b/source3/include/config.h.in @@ -1394,9 +1394,6 @@ /* Whether to include experimental quota support */ #undef WITH_QUOTAS -/* Whether to build the new (experimental) SAM database */ -#undef WITH_SAM - /* Whether to include sendfile() support */ #undef WITH_SENDFILE diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index ce8578f5e6..e35775a6da 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -1907,49 +1907,49 @@ static NTSTATUS ldapsam_add_sam_account(struct pdb_methods *my_methods, SAM_ACCO return NT_STATUS_OK; } -static NTSTATUS lsapsam_getgrsid(struct pdb_methods *methods, GROUP_MAP *map, +static NTSTATUS ldapsam_getgrsid(struct pdb_methods *methods, GROUP_MAP *map, DOM_SID sid, BOOL with_priv) { return get_group_map_from_sid(sid, map, with_priv) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL; } -static NTSTATUS lsapsam_getgrgid(struct pdb_methods *methods, GROUP_MAP *map, +static NTSTATUS ldapsam_getgrgid(struct pdb_methods *methods, GROUP_MAP *map, gid_t gid, BOOL with_priv) { return get_group_map_from_gid(gid, map, with_priv) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL; } -static NTSTATUS lsapsam_getgrnam(struct pdb_methods *methods, GROUP_MAP *map, +static NTSTATUS ldapsam_getgrnam(struct pdb_methods *methods, GROUP_MAP *map, char *name, BOOL with_priv) { return get_group_map_from_ntname(name, map, with_priv) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL; } -static NTSTATUS lsapsam_add_group_mapping_entry(struct pdb_methods *methods, +static NTSTATUS ldapsam_add_group_mapping_entry(struct pdb_methods *methods, GROUP_MAP *map) { return add_mapping_entry(map, TDB_INSERT) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL; } -static NTSTATUS lsapsam_update_group_mapping_entry(struct pdb_methods *methods, +static NTSTATUS ldapsam_update_group_mapping_entry(struct pdb_methods *methods, GROUP_MAP *map) { return add_mapping_entry(map, TDB_REPLACE) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL; } -static NTSTATUS lsapsam_delete_group_mapping_entry(struct pdb_methods *methods, +static NTSTATUS ldapsam_delete_group_mapping_entry(struct pdb_methods *methods, DOM_SID sid) { return group_map_remove(sid) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL; } -static NTSTATUS lsapsam_enum_group_mapping(struct pdb_methods *methods, +static NTSTATUS ldapsam_enum_group_mapping(struct pdb_methods *methods, enum SID_NAME_USE sid_name_use, GROUP_MAP **rmap, int *num_entries, BOOL unix_only, BOOL with_priv) |