Some more profiles merges from HEAD (cvsignore and a stray const).

(This used to be commit 71b09408efc7f4e01b028f65b3b945296a369d9c)

diff --git a/source3/bin/.cvsignore b/source3/bin/.cvsignore
index de6085d52614203a1b79037a52268faafda93817..6a4d52da31dbf9f6a3163cb4f29a664ac6e105aa 100644 (file)
--- 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 de18bd0534b6b6a67b68b3074f001d74fc1bee4f..9424233e1115ed1b073513271c13c1c7f871ee9a 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, char *prefix)
+void process_acl(ACL *acl, const char *prefix)
 {
   int ace_cnt, i;
   ACE *ace;