s3-privileges: link in group policy based privileges.

Guenther

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 5a5e48ac2d776207b7545e946f3b25a25d060da5..6798af2737f2a987d117676998151db01cfdf0fc 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -674,6 +674,8 @@ PASSDB_OBJ = $(PASSDB_GET_SET_OBJ) passdb/passdb.o passdb/pdb_interface.o \
                passdb/login_cache.o @PDB_STATIC@ \
                passdb/account_pol.o $(PRIVILEGES_OBJ) \
                lib/util_nscd.o lib/winbind_util.o $(SERVER_MUTEX_OBJ)
+               lib/privileges_gp.o \
+               $(LIBGPO_OBJ1)
 
 DEVEL_HELP_WEIRD_OBJ = modules/weird.o
 CP850_OBJ = modules/CP850.o
@@ -827,7 +829,9 @@ SMBD_OBJ_BASE = $(PARAM_WITHOUT_REG_OBJ) $(SMBD_OBJ_SRV) $(LIBSMB_OBJ) \
                $(REG_FULL_OBJ) $(POPT_LIB_OBJ) $(BUILDOPT_OBJ) \
                $(SMBLDAP_OBJ) $(LIBNET_OBJ) \
                $(LIBSMBCONF_OBJ) \
-               $(PRIVILEGES_BASIC_OBJ)
+               $(PRIVILEGES_BASIC_OBJ) \
+               $(LIBGPO_OBJ0) $(INIPARSER_OBJ)
+#$(LIBGPO_OBJ) $(INIPARSER_OBJ) #FIXME
 
 PRINTING_OBJ = printing/pcap.o printing/print_svid.o printing/print_aix.o \
                printing/print_cups.o printing/print_generic.o \

diff --git a/source3/lib/privileges.c b/source3/lib/privileges.c
index c8be360dc643c16ef6847bb48e7e428f3c1c83ae..3cd45cdcf084759516547330c57e0f724e7814f0 100644 (file)
--- a/source3/lib/privileges.c
+++ b/source3/lib/privileges.c
@@ -132,6 +132,10 @@ bool get_privileges_for_sids(SE_PRIV *privileges, DOM_SID *slist, int scount)
                found = True;
        }
 
+       if (gp_get_privileges(slist, scount, &mask)) {
+               se_priv_add(privileges, &mask);
+       }
+
        return found;
 }