summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-01-06 05:47:18 +0000
committerTim Potter <tpot@samba.org>2003-01-06 05:47:18 +0000
commit5df19f71d1a2a65c5915020062c2dc0aecb2581e (patch)
tree48f0d1c1c906537f39967bf5c77a5cdce779a784
parent54828099625180eae718d544ec7ce4c91f6e0448 (diff)
downloadsamba-5df19f71d1a2a65c5915020062c2dc0aecb2581e.tar.gz
samba-5df19f71d1a2a65c5915020062c2dc0aecb2581e.tar.bz2
samba-5df19f71d1a2a65c5915020062c2dc0aecb2581e.zip
Some more profiles merges from HEAD (cvsignore and a stray const).
(This used to be commit 71b09408efc7f4e01b028f65b3b945296a369d9c)
-rw-r--r--source3/bin/.cvsignore1
-rw-r--r--source3/utils/profiles.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/source3/bin/.cvsignore b/source3/bin/.cvsignore
index de6085d526..6a4d52da31 100644
--- a/source3/bin/.cvsignore
+++ b/source3/bin/.cvsignore
@@ -12,6 +12,7 @@ nmbd
nmblookup
nsstest
pdbedit
+profiles
rpcclient
samsync
smbcacls
diff --git a/source3/utils/profiles.c b/source3/utils/profiles.c
index de18bd0534..9424233e11 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, char *prefix)
+void process_acl(ACL *acl, const char *prefix)
{
int ace_cnt, i;
ACE *ace;