Author: jra
Date: 2005-12-09 20:28:13 +0000 (Fri, 09 Dec 2005)
New Revision: 12152

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12152

Log:
More testing... acl parser works with one acl. Now to test more.
Jeremy.

Modified:
   trunk/source/param/loadparm.c
   trunk/source/rpc_server/srv_srvsvc_nt.c


Changeset:
Modified: trunk/source/param/loadparm.c
===================================================================
--- trunk/source/param/loadparm.c       2005-12-09 20:14:55 UTC (rev 12151)
+++ trunk/source/param/loadparm.c       2005-12-09 20:28:13 UTC (rev 12152)
@@ -4275,7 +4275,7 @@
                return False;
        }
 
-       if (!parse_usershare_acl(ctx, &lines[2][14], ppsd)) {
+       if (!parse_usershare_acl(ctx, &lines[3][14], ppsd)) {
                return False;
        }
 
@@ -4478,6 +4478,9 @@
                        talloc_destroy(ctx);
                        return 1;
                }
+
+               /* Read only is controlled by usershare ACL below. */
+               ServicePtrs[snum]->bRead_only = False;
        }
 
        /* Write the ACL of the new/modified share. */

Modified: trunk/source/rpc_server/srv_srvsvc_nt.c
===================================================================
--- trunk/source/rpc_server/srv_srvsvc_nt.c     2005-12-09 20:14:55 UTC (rev 
12151)
+++ trunk/source/rpc_server/srv_srvsvc_nt.c     2005-12-09 20:28:13 UTC (rev 
12152)
@@ -2361,12 +2361,15 @@
 
                switch (*pacl) {
                        case 'F': /* Full Control, ie. R+W */
+                       case 'f': /* Full Control, ie. R+W */
                                s_access = g_access = GENERIC_ALL_ACCESS;
                                break;
                        case 'R': /* Read only. */
+                       case 'r': /* Read only. */
                                s_access = g_access = GENERIC_READ_ACCESS;
                                break;
                        case 'D': /* Deny all to this SID. */
+                       case 'd': /* Deny all to this SID. */
                                type = SEC_ACE_TYPE_ACCESS_DENIED;
                                s_access = g_access = GENERIC_ALL_ACCESS;
                                break;

Reply via email to