[SCM] Samba Shared Repository - branch v3-5-stable updated

Karolin Seeger kseeger at samba.org
Sun Aug 12 22:17:33 MDT 2012


The branch, v3-5-stable has been updated
       via  5d48aa5 WHATSNEW: Remove "Major enhancements" section.
       via  584d4d7 WHATSNEW: Add changes since 3.5.16.
       via  20c8597 Fix bug #9034 - Typo in set_re_uid() call when USE_SETRESUID selected in configure.
       via  5692054 s3:vfs_gpfs: be less verbose in get/set_xattr functions
       via  1bedfea s3: fix build without ads support
       via  aa6cbf4 s3: readd h_errno struct member but rename it
      from  374e761 WHATSNEW: Start release notes for Samba 3.5.17.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-stable


- Log -----------------------------------------------------------------
commit 5d48aa5a72141c739883dd72d43b22b690c8eb74
Author: Karolin Seeger <kseeger at samba.org>
Date:   Thu Aug 2 19:26:06 2012 +0200

    WHATSNEW: Remove "Major enhancements" section.
    
    Karolin
    (cherry picked from commit 6f5cfa259dfb5501db21163982ad4397c254a9c9)

commit 584d4d774aa63643747a3bcbe69d41f955f10cab
Author: Karolin Seeger <kseeger at samba.org>
Date:   Thu Jul 26 20:03:39 2012 +0200

    WHATSNEW: Add changes since 3.5.16.
    
    Karolin
    (cherry picked from commit a7e0d4a78eaacc56463d3a9160db5862c2ea8f7b)

commit 20c85976db84a49ab13e057f51b10597c133a649
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jul 10 21:13:03 2012 -0700

    Fix bug #9034 - Typo in set_re_uid() call when USE_SETRESUID selected in configure.
    
    Previous code only set the real euid, not the effective one. This is not a security issue
    as this is *only* used in the quota code, and only between code that brackets
    it with save_re_uid()/restore_re_uid(), Also this is not used on most platforms
    (we use USE_SETREUID by preference) but it's better to have this right.
    (cherry picked from commit ceed322622b46be3745b32a5f6a02e634bfe1789)
    (cherry picked from commit a224e4cc1dbb2578813ccffb80e88d9ec92516ce)

commit 56920545d803cd7d51133f2860c7249e597c6277
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Dec 22 14:20:32 2011 +0100

    s3:vfs_gpfs: be less verbose in get/set_xattr functions
    
    metze
    
    Signed-off-by: Christian Ambach <ambi at samba.org>
    (cherry picked from commit 2e95d8048b9e9c7025ddada7ede15494e6016ba9)
    
    Fix bug #9022 - vfs_gpfs is very verbose in get/set_xattr functions.
    (cherry picked from commit 3abaa9dd8a2af9497dfc6afd6f93a638956c1c3a)
    (cherry picked from commit 4c8fdb5ce7ad0d966b3de23a1052191645b6635b)

commit 1bedfeadc04aa0fcd4740f647ea784d1bcdbd36b
Author: Björn Jacke <bj at sernet.de>
Date:   Mon Jul 2 00:46:06 2012 +0200

    s3: fix build without ads support
    
    when we have no ads support we don't have the ads_get_sid_token symbol used in
    this unused code :-)
    
    this is the backport of 43c56dc4255a7a6cbd176e6ae66a7652c6d72d2c
    
    Fix bug #8996 - build without ads support (e.g. plain solaris 8) broken.
    (cherry picked from commit f8ed8815adc6acc42bab2f1b69085dcda8bb9894)

commit aa6cbf452052cef108e2fe0b35dbd26b4d2f1fc3
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Jun 10 23:15:19 2010 +0200

    s3: readd h_errno struct member but rename it
    
    as pointed out by metze this is a structure of fixed size, which should not be
    changed.
    (cherry picked from commit a8c051b2f91852b5228d6a903d6a7fd50d22de28)
    
    Second part of a fix for bug #9011 (Build on HP-UX broken).
    (cherry picked from commit 7a56042642409556c492cadd49772bb70fbd974d)

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

Summary of changes:
 WHATSNEW.txt                |   16 +++++++++++-----
 libgpo/gpo_util.c           |    7 ++++---
 nsswitch/winbind_nss_hpux.h |    4 ++--
 source3/lib/util_sec.c      |    2 +-
 source3/modules/vfs_gpfs.c  |    4 ++--
 5 files changed, 20 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index a7333f8..e95acf1 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -6,16 +6,22 @@
 
 This is the latest stable release of Samba 3.5.
 
-Major enhancements in Samba 3.5.17 include:
-
-o  
-
 
 Changes since 3.5.16:
 ---------------------
 
 o   Jeremy Allison <jra at samba.org>
-    * BUG 
+    * BUG 9034: Fix typo in set_re_uid() call when USE_SETRESUID selected in
+      configure.
+
+
+o   Björn Jacke <bj at sernet.de>
+    * BUG 8996: Fix build without ads support.
+    * BUG 9011: Second part of a fix for bug #9011 (Build on HP-UX broken).
+
+
+o   Stefan Metzmacher <metze at samba.org>
+    * BUG 9022: Make vfs_gpfs less verbose in get/set_xattr functions.
 
 
 ######################################################################
diff --git a/libgpo/gpo_util.c b/libgpo/gpo_util.c
index 7a23b5c..4e0c8ab 100644
--- a/libgpo/gpo_util.c
+++ b/libgpo/gpo_util.c
@@ -840,6 +840,7 @@ ADS_STATUS gp_get_machine_token(ADS_STRUCT *ads,
 				const char *dn,
 				NT_USER_TOKEN **token)
 {
+#ifdef HAVE_ADS
 	NT_USER_TOKEN *ad_token = NULL;
 	ADS_STATUS status;
 #if _SAMBA_BUILD_ == 4
@@ -848,9 +849,6 @@ ADS_STATUS gp_get_machine_token(ADS_STRUCT *ads,
 	NTSTATUS ntstatus;
 #endif
 
-#ifndef HAVE_ADS
-	return ADS_ERROR_NT(NT_STATUS_NOT_SUPPORTED);
-#endif
 	status = ads_get_sid_token(ads, mem_ctx, dn, &ad_token);
 	if (!ADS_ERR_OK(status)) {
 		return status;
@@ -866,4 +864,7 @@ ADS_STATUS gp_get_machine_token(ADS_STRUCT *ads,
 	}
 #endif
 	return ADS_SUCCESS;
+#else
+	return ADS_ERROR_NT(NT_STATUS_NOT_SUPPORTED);
+#endif
 }
diff --git a/nsswitch/winbind_nss_hpux.h b/nsswitch/winbind_nss_hpux.h
index 393c0a3..dba70a7 100644
--- a/nsswitch/winbind_nss_hpux.h
+++ b/nsswitch/winbind_nss_hpux.h
@@ -133,9 +133,9 @@ typedef struct nss_XbyY_args {
 	/*
 	*  h_errno is defined as function call macro for multithreaded applications
 	*  in HP-UX. *this* h_errno is not used in the HP-UX codepath of our nss
-	*  modules, so let's simply comment it out here:
-	* int h_errno;
+	*  modules, so let's simply rename it:
 	*/
+	int h_errno_unused;
 	nss_status_t status;
 } nss_XbyY_args_t;
 
diff --git a/source3/lib/util_sec.c b/source3/lib/util_sec.c
index d7984ac..b90a6f9 100644
--- a/source3/lib/util_sec.c
+++ b/source3/lib/util_sec.c
@@ -334,7 +334,7 @@ int set_re_uid(void)
 	uid_t uid = geteuid();
 
 #if USE_SETRESUID
-	setresuid(geteuid(), -1, -1);
+	setresuid(uid, uid, -1);
 #endif
 
 #if USE_SETREUID
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index ecfa60a..c80b9e5 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -935,7 +935,7 @@ static int gpfs_set_xattr(struct vfs_handle_struct *handle,  const char *path,
 
         /* Only handle DOS Attributes */
         if (strcmp(name,SAMBA_XATTR_DOS_ATTRIB) != 0){
-		DEBUG(1, ("gpfs_set_xattr:name is %s\n",name));
+		DEBUG(5, ("gpfs_set_xattr:name is %s\n",name));
 		return SMB_VFS_NEXT_SETXATTR(handle,path,name,value,size,flags);
         }
 
@@ -989,7 +989,7 @@ static ssize_t gpfs_get_xattr(struct vfs_handle_struct *handle,  const char *pat
 
         /* Only handle DOS Attributes */
         if (strcmp(name,SAMBA_XATTR_DOS_ATTRIB) != 0){
-                DEBUG(1, ("gpfs_get_xattr:name is %s\n",name));
+		DEBUG(5, ("gpfs_get_xattr:name is %s\n",name));
                 return SMB_VFS_NEXT_GETXATTR(handle,path,name,value,size);
         }
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list