summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Sharpe <sharpe@samba.org>2003-01-06 05:34:18 +0000
committerRichard Sharpe <sharpe@samba.org>2003-01-06 05:34:18 +0000
commit54828099625180eae718d544ec7ce4c91f6e0448 (patch)
tree578a2d031b982cf8c1d1e407cc1e7de58889a33f
parent2d727ea5031df66ea3eaef531cd00617a226ae1e (diff)
downloadsamba-54828099625180eae718d544ec7ce4c91f6e0448.tar.gz
samba-54828099625180eae718d544ec7ce4c91f6e0448.tar.bz2
samba-54828099625180eae718d544ec7ce4c91f6e0448.zip
Add profiles utility support to Samba 3.0.x
(This used to be commit 2636b2231cfa6cdfc22181225e2b409bbbb75f7c)
-rw-r--r--source3/Makefile.in6
-rw-r--r--source3/utils/profiles.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 9a7ebfdd2d..6df647258b 100644
--- 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 9424233e11..de18bd0534 100644
--- 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;