sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-24 13:57:43 +03:00
Code

Back out some of my sync changes

Browse Source 
(This used to be commit b1ad91101d10d1fa635cfbb1684f8b598280cee0)
This commit is contained in:
Jelmer Vernooij 2002-11-09 23:28:40 +00:00
parent 017eec27bc
commit e1a9236092
4 changed files with 7 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source3/configure vendored
View File

@ -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

18
source3/configure.in
View File

@ -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

3
source3/include/config.h.in
View File

@ -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

14
source3/passdb/pdb_ldap.c
View File

@ -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)