[SCM] Samba Shared Repository - branch v4-1-test updated

Karolin Seeger kseeger at samba.org
Tue Aug 13 04:16:04 MDT 2013


The branch, v4-1-test has been updated
       via  f3a9fe5 s3-libads: Print a message if no realm has been specified.
       via  a183dcd s3-libads: Fail create_local_private_krb5_conf_for_domain() if parameters missing.
       via  e9edcb3 docs: Add man page for vfs_linux_xfs_sgid.
      from  694d54a VERSION: Bump version number up to 4.1.0rc3...

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-1-test


- Log -----------------------------------------------------------------
commit f3a9fe50ead03732a34afaedcbdb0ee90bb6dc5a
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Aug 5 09:25:11 2013 +0200

    s3-libads: Print a message if no realm has been specified.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Mon Aug  5 12:24:44 CEST 2013 on sn-devel-104
    
    (cherry picked from commit 6659f0164c6b8d7ad522bcd6c2c6748c3d9bca81)
    
    The last 2 patches address bug #10073 - net ads join - segmentation fault in
    create_local_private_krb5_conf_for_domain.
    
    Autobuild-User(v4-1-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-1-test): Tue Aug 13 12:16:00 CEST 2013 on sn-devel-104

commit a183dcd3af2cba6025515296e954b836fbf9a9fd
Author: Günther Deschner <gd at samba.org>
Date:   Fri May 17 15:14:35 2013 +0200

    s3-libads: Fail create_local_private_krb5_conf_for_domain() if parameters missing.
    
    Guenther
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    (cherry picked from commit 6dc7c63efa95d0c04b542667d9b6a6621c8139bf)

commit e9edcb30907d825d2a5a825f3a88edf9753e7995
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Aug 12 10:02:31 2013 +0200

    docs: Add man page for vfs_linux_xfs_sgid.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Tue Aug 13 02:06:30 CEST 2013 on sn-devel-104
    (cherry picked from commit 906de702e641bb0da8ec9074b80d6e94bdb17cfe)
    
    Fix bug #7490 - man vfs_linux_xfs_sgid missing.

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

Summary of changes:
 ...s_fake_perms.8.xml => vfs_linux_xfs_sgid.8.xml} |   35 ++++++++++---------
 docs-xml/wscript_build                             |    1 +
 source3/libads/kerberos.c                          |   10 ++++++
 3 files changed, 29 insertions(+), 17 deletions(-)
 copy docs-xml/manpages/{vfs_fake_perms.8.xml => vfs_linux_xfs_sgid.8.xml} (53%)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages/vfs_fake_perms.8.xml b/docs-xml/manpages/vfs_linux_xfs_sgid.8.xml
similarity index 53%
copy from docs-xml/manpages/vfs_fake_perms.8.xml
copy to docs-xml/manpages/vfs_linux_xfs_sgid.8.xml
index 6916ced..17ed1ac 100644
--- a/docs-xml/manpages/vfs_fake_perms.8.xml
+++ b/docs-xml/manpages/vfs_linux_xfs_sgid.8.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
-<refentry id="vfs_fake_perms.8">
+<refentry id="vfs_linux_xfs_sgid.8">
 
 <refmeta>
-	<refentrytitle>vfs_fake_perms</refentrytitle>
+	<refentrytitle>vfs_syncops</refentrytitle>
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">4.0</refmiscinfo>
+	<refmiscinfo class="version">4.1</refmiscinfo>
 </refmeta>
 
 
 <refnamediv>
-	<refname>vfs_fake_perms</refname>
-	<refpurpose>enable read only Roaming Profiles</refpurpose>
+	<refname>vfs_linux_xfs_sgid</refname>
+	<refpurpose></refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 	<cmdsynopsis>
-		<command>vfs objects = fake_perms</command>
+		<command>vfs objects = linux_xfs_sgid</command>
 	</cmdsynopsis>
 </refsynopsisdiv>
 
@@ -29,13 +29,14 @@
 	<citerefentry><refentrytitle>samba</refentrytitle>
 	<manvolnum>7</manvolnum></citerefentry> suite.</para>
 
-	<para>The <command>vfs_fake_perms</command> VFS module was created
-	to allow Roaming Profile files and directories to be set (on
-	the Samba server under UNIX) as read only. This module will,
-	if installed on the Profiles share, report to the client that
-	the Profile files and directories are writeable. This satisfies
-	the client even though the files will never be overwritten as
-	the client logs out or shuts down.
+	<para>
+	<command>vfs_linux_xfs_sgid</command> is a VFS module to work around an
+	old Linux XFS bug that still exists: Under certain circumstances the
+	SGID bit is not inherited (<ulink url="http://oss.sgi.com/bugzilla/show_bug.cgi?id=280">
+	http://oss.sgi.com/bugzilla/show_bug.cgi?id=280</ulink>).
+	The <command>vfs_linux_xfs_sgid</command> VFS module will work around this
+	bug by manually setting the SGID bit after a <command>mkdir</command>
+	if the parent directory had the SGID bit set.
 	</para>
 
 	<para>This module is stackable.</para>
@@ -45,10 +46,10 @@
 <refsect1>
 	<title>EXAMPLES</title>
 
+	<para>Add syncops functionality for [share]:</para>
 <programlisting>
-        <smbconfsection name="[Profiles]"/>
-	<smbconfoption name="path">/profiles</smbconfoption>
-	<smbconfoption name="vfs objects">fake_perms</smbconfoption>
+        <smbconfsection name="[share]"/>
+	<smbconfoption name="vfs objects">linux_xfs_sgid</smbconfoption>
 </programlisting>
 
 </refsect1>
@@ -56,7 +57,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3.0.25 of the Samba suite.
+	<para>This man page is correct for version 4.1.0 of the Samba suite.
 	</para>
 </refsect1>
 
diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
index 588b0b9..f2d977a 100644
--- a/docs-xml/wscript_build
+++ b/docs-xml/wscript_build
@@ -61,6 +61,7 @@ manpages='''
          manpages/vfs_fileid.8
          manpages/vfs_full_audit.8
          manpages/vfs_gpfs.8
+         manpages/vfs_linux_xfs_sgid.8
          manpages/vfs_media_harmony.8
          manpages/vfs_netatalk.8
          manpages/vfs_notify_fam.8
diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c
index 96d194d..b026e09 100644
--- a/source3/libads/kerberos.c
+++ b/source3/libads/kerberos.c
@@ -839,6 +839,16 @@ bool create_local_private_krb5_conf_for_domain(const char *realm,
 		return false;
 	}
 
+	if (realm == NULL) {
+		DEBUG(0, ("No realm has been specified! Do you really want to "
+			  "join an Active Directory server?\n"));
+		return false;
+	}
+
+	if (domain == NULL || pss == NULL || kdc_name == NULL) {
+		return false;
+	}
+
 	dname = lock_path("smb_krb5");
 	if (!dname) {
 		return false;


-- 
Samba Shared Repository


More information about the samba-cvs mailing list