From 8db45607f8d19781d33ebff0d0b13c473f34009b Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 12 Jun 2009 14:27:19 +0200 Subject: libds: share UF_ flags between samba3 and 4. Guenther --- source4/dsdb/common/sidmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/dsdb/common/sidmap.c') diff --git a/source4/dsdb/common/sidmap.c b/source4/dsdb/common/sidmap.c index 5c20149384..a2aa717ace 100644 --- a/source4/dsdb/common/sidmap.c +++ b/source4/dsdb/common/sidmap.c @@ -21,7 +21,7 @@ #include "includes.h" #include "system/passwd.h" -#include "dsdb/common/flags.h" +#include "../libds/common/flags.h" #include "dsdb/samdb/samdb.h" #include "auth/auth.h" #include "libcli/ldap/ldap_ndr.h" -- cgit From 05fbe0c7f763fbe8c1c48eb82ebdfe04bfa034ea Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 12 Jun 2009 15:20:48 +0200 Subject: libds: merge the UF<->ACB flag mapping functions. Guenther --- source4/dsdb/common/sidmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/dsdb/common/sidmap.c') diff --git a/source4/dsdb/common/sidmap.c b/source4/dsdb/common/sidmap.c index a2aa717ace..3111a78e51 100644 --- a/source4/dsdb/common/sidmap.c +++ b/source4/dsdb/common/sidmap.c @@ -583,7 +583,7 @@ NTSTATUS sidmap_allocated_sid_lookup(struct sidmap_context *sidmap, struct passwd *pwd; uid_t uid = rid - SIDMAP_LOCAL_USER_BASE; atype = ATYPE_NORMAL_ACCOUNT; - *rtype = samdb_atype_map(atype); + *rtype = ds_atype_map(atype); pwd = getpwuid(uid); if (pwd == NULL) { @@ -595,7 +595,7 @@ NTSTATUS sidmap_allocated_sid_lookup(struct sidmap_context *sidmap, struct group *grp; gid_t gid = rid - SIDMAP_LOCAL_GROUP_BASE; atype = ATYPE_LOCAL_GROUP; - *rtype = samdb_atype_map(atype); + *rtype = ds_atype_map(atype); grp = getgrgid(gid); if (grp == NULL) { *name = talloc_asprintf(mem_ctx, "gid%u", gid); -- cgit