The branch, master has been updated
       via  4cc04a2 s3-docs: Fix bug #7930.
       via  3c95ff0 s3-po: Fix typo in comment.
       via  48d57d7 s3-net: Fix typo in comment.
      from  f01c6cf s4 dns: unify error handling when bailing out

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4cc04a29247a0c4b3de9884890364a5712534073
Author: Karolin Seeger <[email protected]>
Date:   Tue May 8 16:33:07 2012 +0200

    s3-docs: Fix bug #7930.
    
    Add hint that setting "profile acls = yes" on normal shares can cause 
trouble.
    
    Karolin
    
    Autobuild-User: Karolin Seeger <[email protected]>
    Autobuild-Date: Tue May  8 18:47:59 CEST 2012 on sn-devel-104

commit 3c95ff0e5512ec0cc9f85003aba498e651ae3b90
Author: Karolin Seeger <[email protected]>
Date:   Tue May 8 16:03:18 2012 +0200

    s3-po: Fix typo in comment.
    
    Karolin

commit 48d57d7636959ffbf9a4829604a2f7f6968a5caa
Author: Karolin Seeger <[email protected]>
Date:   Tue May 8 16:01:14 2012 +0200

    s3-net: Fix typo in comment.
    
    Karolin

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/smbdotconf/protocol/profileacls.xml |    8 +++++++-
 source3/locale/net/de.po                     |    2 +-
 source3/utils/net_ads.c                      |    2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/protocol/profileacls.xml 
b/docs-xml/smbdotconf/protocol/profileacls.xml
index 1c6f0c9..be89753 100644
--- a/docs-xml/smbdotconf/protocol/profileacls.xml
+++ b/docs-xml/smbdotconf/protocol/profileacls.xml
@@ -25,7 +25,7 @@
        every returned ACL. This will allow any Windows 2000 or XP workstation
        user to access the profile.
        </para>
-       
+
        <para>
        Note that if you have multiple users logging
        on to a workstation then in order to prevent them from being able to 
access
@@ -35,6 +35,12 @@
        workstation profile code and has an ACL restricting entry to the 
directory
        tree to the owning user.
        </para>
+
+       <para>
+       Note that this parameter should be set to yes on dedicated profile 
shares only.
+       On other shares, it might cause incorrect file ownerships.
+       </para>
+
 </description>
 
 <value type="default">no</value>
diff --git a/source3/locale/net/de.po b/source3/locale/net/de.po
index 15e5bbf..4b40ef0 100644
--- a/source3/locale/net/de.po
+++ b/source3/locale/net/de.po
@@ -904,7 +904,7 @@ msgstr ""
 msgid "Disabled account for '%s' in realm '%s'\n"
 msgstr ""
 
-#. Based on what we requseted, we shouldn't get here, but if
+#. Based on what we requested, we shouldn't get here, but if
 #. we did, it means the secrets were removed, and therefore
 #. we have left the domain
 #: ../../utils/net_ads.c:1006
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 381393e..0ccb328 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -1018,7 +1018,7 @@ static int net_ads_leave(struct net_context *c, int argc, 
const char **argv)
                goto done;
        }
 
-       /* Based on what we requseted, we shouldn't get here, but if
+       /* Based on what we requested, we shouldn't get here, but if
           we did, it means the secrets were removed, and therefore
           we have left the domain */
        d_fprintf(stderr, _("Machine '%s' Left domain '%s'\n"),


-- 
Samba Shared Repository

Reply via email to