diff options
author | Günther Deschner <gd@samba.org> | 2011-02-26 00:17:33 +0100 |
---|---|---|
committer | Günther Deschner <gd@samba.org> | 2011-03-02 22:17:17 +0100 |
commit | 93db9489fd778bd96e6434f4bd70e90b47c01b06 (patch) | |
tree | 50959368b398b29e8e7d68cf50ea8cca87b4b22d | |
parent | 4afda9ebf49f2dc63b98c38132ce636ecf92e938 (diff) | |
download | samba-93db9489fd778bd96e6434f4bd70e90b47c01b06.tar.gz samba-93db9489fd778bd96e6434f4bd70e90b47c01b06.tar.bz2 samba-93db9489fd778bd96e6434f4bd70e90b47c01b06.zip |
s3-libds: use already existing ../libds/common/flag_mapping.h header.
Guenther
-rw-r--r-- | source3/include/proto.h | 9 | ||||
-rw-r--r-- | source3/lib/netapi/user.c | 1 | ||||
-rw-r--r-- | source3/libnet/libnet_dssync_passdb.c | 1 | ||||
-rw-r--r-- | source3/passdb/pdb_ads.c | 1 | ||||
-rw-r--r-- | source3/winbindd/winbindd_ads.c | 1 |
5 files changed, 4 insertions, 9 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index bfbf840190..6cf0ebe463 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -5424,13 +5424,4 @@ void map_max_allowed_access(const struct security_token *nt_token, const struct security_unix_token *unix_token, uint32_t *pacc_requested); -/* The following definitions come from ../libds/common/flag_mapping.c */ - -uint32_t ds_acb2uf(uint32_t acb); -uint32_t ds_uf2acb(uint32_t uf); -uint32_t ds_uf2atype(uint32_t uf); -uint32_t ds_gtype2atype(uint32_t gtype); -enum lsa_SidType ds_atype_map(uint32_t atype); -uint32_t ds_uf2prim_group_rid(uint32_t uf); - #endif /* _PROTO_H_ */ diff --git a/source3/lib/netapi/user.c b/source3/lib/netapi/user.c index 3f8d6f5b2d..51a093441f 100644 --- a/source3/lib/netapi/user.c +++ b/source3/lib/netapi/user.c @@ -28,6 +28,7 @@ #include "../libds/common/flags.h" #include "rpc_client/init_lsa.h" #include "../libcli/security/security.h" +#include "../libds/common/flag_mapping.h" /**************************************************************** ****************************************************************/ diff --git a/source3/libnet/libnet_dssync_passdb.c b/source3/libnet/libnet_dssync_passdb.c index df99e40ebb..d38146ed48 100644 --- a/source3/libnet/libnet_dssync_passdb.c +++ b/source3/libnet/libnet_dssync_passdb.c @@ -24,6 +24,7 @@ #include "../libds/common/flags.h" #include "../librpc/gen_ndr/ndr_drsuapi.h" #include "dbwrap.h" +#include "../libds/common/flag_mapping.h" /**************************************************************** ****************************************************************/ diff --git a/source3/passdb/pdb_ads.c b/source3/passdb/pdb_ads.c index 4d47a3fc85..ba2193b263 100644 --- a/source3/passdb/pdb_ads.c +++ b/source3/passdb/pdb_ads.c @@ -25,6 +25,7 @@ #include "../librpc/gen_ndr/samr.h" #include "../libcli/ldap/ldap_ndr.h" #include "../libcli/security/security.h" +#include "../libds/common/flag_mapping.h" struct pdb_ads_state { struct sockaddr_un socket_address; diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c index a392305b55..838e74b83c 100644 --- a/source3/winbindd/winbindd_ads.c +++ b/source3/winbindd/winbindd_ads.c @@ -29,6 +29,7 @@ #include "secrets.h" #include "../libcli/ldap/ldap_ndr.h" #include "../libcli/security/security.h" +#include "../libds/common/flag_mapping.h" #ifdef HAVE_ADS |