fix some compile problems. Can't get IDMAP_OBJ our of proto.h

just yet.

`
(This used to be commit 6f0b5d474a051db512db2f73a8097c80964ec513)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 1bfb99f64532d7cc75966b99e5deebd0dd10c56b..c0e7ce3055a598423baae15d73cab1d1feb6d9a7 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -479,7 +479,7 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_ads_cldap.o utils/net_help.o \
 NET_OBJ = $(NET_OBJ1) $(PARAM_OBJ) $(SECRETS_OBJ) $(LIBSMB_OBJ) \
          $(RPC_PARSE_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
          $(KRBCLIENT_OBJ) $(UBIQX_OBJ) $(LIB_OBJ) \
-         $(LIBMSRPC_OBJ) \
+         $(LIBMSRPC_OBJ) $(IDMAP_OBJ) \
          $(LIBADS_OBJ) $(LIBADS_SERVER_OBJ) $(POPT_LIB_OBJ) \
          $(SMBLDAP_OBJ) $(DCUTIL_OBJ)
 
@@ -560,7 +560,7 @@ PROTO_OBJ = $(SMBD_OBJ_MAIN) \
            $(LIB_SMBD_OBJ) $(SAM_OBJ) $(REGISTRY_OBJ) $(POPT_LIB_OBJ) \
            $(RPC_LSA_OBJ) $(RPC_NETLOG_OBJ) $(RPC_SAMR_OBJ) $(RPC_REG_OBJ) \
            $(RPC_SVC_OBJ) $(RPC_WKS_OBJ) $(RPC_DFS_OBJ) $(RPC_SPOOLSS_OBJ) \
-           $(RPC_ECHO_OBJ) $(SMBLDAP_OBJ)
+           $(RPC_ECHO_OBJ) $(SMBLDAP_OBJ) $(IDMAP_OBJ)
 
 WINBIND_WINS_NSS_OBJ = nsswitch/wins.o $(PARAM_OBJ) $(UBIQX_OBJ) \
        $(LIBSMB_OBJ) $(LIB_OBJ) $(NSSWINS_OBJ)
@@ -578,6 +578,8 @@ PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \
 
 PAM_SMBPASS_PICOOBJ = $(PAM_SMBPASS_OBJ_0:.o=.po)
 
+IDMAP_OBJ     = sam/idmap.o sam/idmap_util.o @IDMAP_STATIC@
+
 WINBINDD_OBJ1 = \
                nsswitch/winbindd.o       \
                nsswitch/winbindd_user.o  \
@@ -592,8 +594,7 @@ WINBINDD_OBJ1 = \
                nsswitch/winbindd_rpc.o \
                nsswitch/winbindd_ads.o \
                nsswitch/winbindd_dual.o \
-               nsswitch/winbindd_acct.o \
-               sam/idmap.o sam/idmap_util.o @IDMAP_STATIC@
+               nsswitch/winbindd_acct.o 
 
 WINBINDD_OBJ = \
                $(WINBINDD_OBJ1) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
@@ -601,7 +602,7 @@ WINBINDD_OBJ = \
                $(LIBSMB_OBJ) $(LIBMSRPC_OBJ) $(RPC_PARSE_OBJ) \
                $(PROFILE_OBJ) $(SLCACHE_OBJ) $(SMBLDAP_OBJ) \
                $(SECRETS_OBJ) $(LIBADS_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
-               $(DCUTIL_OBJ)
+               $(DCUTIL_OBJ) $(IDMAP_OBJ)
 
 WBINFO_OBJ = nsswitch/wbinfo.o $(LIBSAMBA_OBJ) $(PARAM_OBJ) $(LIB_OBJ) \
                $(UBIQX_OBJ) $(SECRETS_OBJ) $(POPT_LIB_OBJ)

diff --git a/source3/sam/idmap_util.c b/source3/sam/idmap_util.c
index 4e44ee16bab820c4b776733709eca27dceae9310..94de30a5ce5f8e7d6b4ac1a966ef3b39658a31ac 100644 (file)
--- a/source3/sam/idmap_util.c
+++ b/source3/sam/idmap_util.c
@@ -53,10 +53,11 @@ NTSTATUS idmap_gid_to_sid(DOM_SID *sid, gid_t gid)
        DEBUG(10,("idmap_gid_to_sid: gid = [%d]\n", gid));
 
        flags = ID_GROUPID;
+#if 0  /* JERRY */
        if (!idmap_check_ugid_is_in_free_range(gid)) {
                flags |= ID_QUERY_ONLY;
        }
-
+#endif
        id.gid = gid;
        return idmap_get_sid_from_id(sid, id, flags);
 }