Add profiles utility support to Samba 3.0.x

(This used to be commit 2636b2231cfa6cdfc22181225e2b409bbbb75f7c)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 9a7ebfdd2d7723937aa2ba819e5a39d23428c17a..6df647258bf13c41b0e99a8c1beadbff1141615f 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -111,7 +111,7 @@ BIN_PROGS1 = bin/smbclient@EXEEXT@ bin/net@EXEEXT@ bin/smbspool@EXEEXT@ \
 BIN_PROGS2 = bin/smbcontrol@EXEEXT@ bin/smbtree@EXEEXT@ bin/tdbbackup@EXEEXT@ \
        bin/nmblookup@EXEEXT@ bin/pdbedit@EXEEXT@
 BIN_PROGS3 = bin/smbpasswd@EXEEXT@ bin/rpcclient@EXEEXT@ bin/smbcacls@EXEEXT@ \
-       bin/smbgroupedit@EXEEXT@
+       bin/profiles@EXEEXT@ bin/smbgroupedit@EXEEXT@
 
 TORTURE_PROGS = bin/smbtorture@EXEEXT@ bin/msgtest@EXEEXT@ \
        bin/masktest@EXEEXT@ bin/locktest@EXEEXT@ \
@@ -676,6 +676,10 @@ bin/net@EXEEXT@: $(NET_OBJ) @BUILD_POPT@ bin/.dummy
        @echo Linking $@
        @$(CC) $(FLAGS) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @BUILD_POPT@
 
+bin/profiles@EXEEXT@: utils/profiles.o bin/.dummy
+       @echo Linking $@
+       @$(CC) $(FLAGS) -o $@ utils/profiles.o $(LDFLAGS) $(LIBS)
+
 bin/smbspool@EXEEXT@: $(CUPS_OBJ) bin/.dummy
        @echo Linking $@
        @$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(LDFLAGS) $(LIBS)

diff --git a/source3/utils/profiles.c b/source3/utils/profiles.c
index 9424233e1115ed1b073513271c13c1c7f871ee9a..de18bd0534b6b6a67b68b3074f001d74fc1bee4f 100644 (file)
--- a/source3/utils/profiles.c
+++ b/source3/utils/profiles.c
@@ -496,7 +496,7 @@ void process_sid(DOM_SID *sid, DOM_SID *o_sid, DOM_SID *n_sid)
 
 }
 
-void process_acl(ACL *acl, const char *prefix)
+void process_acl(ACL *acl, char *prefix)
 {
   int ace_cnt, i;
   ACE *ace;