[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  568a237 s3: Add a word of warning about "winbind use default domain"
       via  076ccc6 s3: Fix some typos
       via  0a6b684 s3: Use sid_check_is..
      from  1cdc2d7 service_ldap, service_smb: Lowercase output file names.

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


- Log -----------------------------------------------------------------
commit 568a2377cca8b833fe4e2d0d4075399b98acc7d5
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Nov 22 22:39:45 2010 +0100

    s3: Add a word of warning about "winbind use default domain"
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Mon Nov 22 23:26:11 CET 2010 on sn-devel-104

commit 076ccc6723edb6b28b16d228eccb26bd64603dba
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Nov 22 22:37:56 2010 +0100

    s3: Fix some typos

commit 0a6b684cac1d1f525bff2d58040d572706807c35
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Nov 22 22:22:32 2010 +0100

    s3: Use sid_check_is..

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

Summary of changes:
 docs-xml/smbdotconf/security/guestok.xml           |    2 +-
 .../smbdotconf/winbind/winbindusedefaultdomain.xml |    6 +++++-
 source3/winbindd/winbindd_cache.c                  |    4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/security/guestok.xml b/docs-xml/smbdotconf/security/guestok.xml
index 7cbf4e5..f4b2c74 100644
--- a/docs-xml/smbdotconf/security/guestok.xml
+++ b/docs-xml/smbdotconf/security/guestok.xml
@@ -9,7 +9,7 @@
     a service, then no password is required to connect to the service. 
     Privileges will be those of the <smbconfoption name="guest account"/>.</para>
 
-    <para>This paramater nullifies the benifits of setting
+    <para>This parameter nullifies the benefits of setting
     <smbconfoption name="restrict anonymous">2</smbconfoption>
 	</para>
 
diff --git a/docs-xml/smbdotconf/winbind/winbindusedefaultdomain.xml b/docs-xml/smbdotconf/winbind/winbindusedefaultdomain.xml
index 334068a..c7e7600 100644
--- a/docs-xml/smbdotconf/winbind/winbindusedefaultdomain.xml
+++ b/docs-xml/smbdotconf/winbind/winbindusedefaultdomain.xml
@@ -9,9 +9,13 @@
 	<manvolnum>8</manvolnum></citerefentry> daemon should operate on users  
 	without domain component in their username. Users without a domain
 	component are treated as is part of the winbindd server's own
-	domain. While this does not benifit Windows users, it makes SSH, FTP and
+	domain. While this does not benefit Windows users, it makes SSH, FTP and
 	e-mail function in a way much closer to the way they
 	would in a native unix system.</para>
+	<para>This option should be avoided if possible. It can cause confusion
+	about responsibilities for a user or group. In many situations it is
+	not clear whether winbind or /etc/passwd should be seen as authoritative
+	for a user, likewise for groups.</para>
 </description>
 
 <value type="default">no</value>
diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index c0f44db..44c6f2b 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -664,7 +664,7 @@ static struct cache_entry *wcache_fetch_raw(char *kstr)
 static bool is_my_own_sam_domain(struct winbindd_domain *domain)
 {
 	if (strequal(domain->name, get_global_sam_name()) &&
-	     dom_sid_equal(&domain->sid, get_global_sam_sid())) {
+	    sid_check_is_domain(&domain->sid)) {
 		return true;
 	}
 
@@ -674,7 +674,7 @@ static bool is_my_own_sam_domain(struct winbindd_domain *domain)
 static bool is_builtin_domain(struct winbindd_domain *domain)
 {
 	if (strequal(domain->name, "BUILTIN") &&
-	    dom_sid_equal(&domain->sid, &global_sid_Builtin)) {
+	    sid_check_is_builtin(&domain->sid)) {
 		return true;
 	}
 


-- 
Samba Shared Repository