[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  43c56dc s3: fix build without ads support
       via  e2747fc replace: fix unused variable warning
       via  dba3b2e doc: fix typo uniq → unique
      from  96ada4d s4:ntvfs: add '_fn' suffix to all ntvfs_ops function pointers

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


- Log -----------------------------------------------------------------
commit 43c56dc4255a7a6cbd176e6ae66a7652c6d72d2c
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Jun 13 19:28: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 :-)
    
    Autobuild-User(master): Björn Jacke <bj at sernet.de>
    Autobuild-Date(master): Wed Jun 13 21:20:15 CEST 2012 on sn-devel-104

commit e2747fc62c2acbab143c4971469e0a4fc36d8789
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Jun 13 18:55:56 2012 +0200

    replace: fix unused variable warning
    
    found by the IRIX compiler

commit dba3b2e0b62d385599057a6e6b5d604e1e70394c
Author: Björn Jacke <bj at sernet.de>
Date:   Tue Jun 12 11:35:29 2012 +0200

    doc: fix typo uniq → unique

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

Summary of changes:
 docs-xml/smbdotconf/winbind/idmapconfig.xml |    2 +-
 lib/replace/strptime.c                      |    9 +++++----
 libgpo/gpo_util.c                           |    7 ++++---
 3 files changed, 10 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/winbind/idmapconfig.xml b/docs-xml/smbdotconf/winbind/idmapconfig.xml
index 265fa12..b9aec46 100644
--- a/docs-xml/smbdotconf/winbind/idmapconfig.xml
+++ b/docs-xml/smbdotconf/winbind/idmapconfig.xml
@@ -83,7 +83,7 @@
 		Defines the available matching uid and gid range for which the
 		backend is authoritative. For allocating backends, this also
 		defines the start and the end of the range for allocating
-		new uniq IDs.
+		new unique IDs.
 		</para>
 		<para>
 		winbind uses this parameter to find the backend that is
diff --git a/lib/replace/strptime.c b/lib/replace/strptime.c
index 0e40f75..181fd12 100644
--- a/lib/replace/strptime.c
+++ b/lib/replace/strptime.c
@@ -251,7 +251,6 @@ strptime_internal (rp, fmt, tm, decided, era_cnt)
      enum locale_status *decided;
      int era_cnt;
 {
-  const char *rp_backup;
   int cnt;
   size_t val;
   int have_I, is_pm;
@@ -261,15 +260,17 @@ strptime_internal (rp, fmt, tm, decided, era_cnt)
   int have_yday;
   int have_mon, have_mday;
 #ifdef _NL_CURRENT
+  const char *rp_backup;
   size_t num_eras;
-#endif
   struct era_entry *era;
 
+  era = NULL;
+#endif
+
   have_I = is_pm = 0;
   century = -1;
   want_century = 0;
   want_era = 0;
-  era = NULL;
 
   have_wday = want_xday = have_yday = have_mon = have_mday = 0;
 
@@ -297,10 +298,10 @@ strptime_internal (rp, fmt, tm, decided, era_cnt)
 #ifndef _NL_CURRENT
       /* We need this for handling the `E' modifier.  */
     start_over:
-#endif
 
       /* Make back up of current processing pointer.  */
       rp_backup = rp;
+#endif
 
       switch (*fmt++)
 	{
diff --git a/libgpo/gpo_util.c b/libgpo/gpo_util.c
index ca529f8..cfb4512 100644
--- a/libgpo/gpo_util.c
+++ b/libgpo/gpo_util.c
@@ -838,13 +838,11 @@ ADS_STATUS gp_get_machine_token(ADS_STRUCT *ads,
 				const char *dn,
 				struct security_token **token)
 {
+#ifdef HAVE_ADS
 	struct security_token *ad_token = NULL;
 	ADS_STATUS status;
 	NTSTATUS ntstatus;
 
-#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;
@@ -855,4 +853,7 @@ ADS_STATUS gp_get_machine_token(ADS_STRUCT *ads,
 		return ADS_ERROR_NT(ntstatus);
 	}
 	return ADS_SUCCESS;
+#else
+	return ADS_ERROR_NT(NT_STATUS_NOT_SUPPORTED);
+#endif
 }


-- 
Samba Shared Repository