Hello community,

here is the log from the commit of package samba for openSUSE:Factory checked 
in at 2015-08-19 13:40:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/samba (Old)
 and      /work/SRC/openSUSE:Factory/.samba.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "samba"

Changes:
--------
--- /work/SRC/openSUSE:Factory/samba/samba.changes      2015-07-21 
13:26:32.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.samba.new/samba.changes 2015-08-19 
13:40:58.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Aug  7 12:21:57 UTC 2015 - lmue...@suse.com
+
+- Adapt net-kdc-lookup patch for post-3.3 Samba versions; (bnc#295284).
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ samba.spec ++++++
--- /var/tmp/diff_new_pack.YDPZGD/_old  2015-08-19 13:40:59.000000000 +0200
+++ /var/tmp/diff_new_pack.YDPZGD/_new  2015-08-19 13:40:59.000000000 +0200
@@ -144,8 +144,8 @@
 %else
 %define        build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3446
-%define BRANCH %{version}
+%define SOURCE_TIMESTAMP 3453
+%define BRANCH %{version}.SLE12_SP1
 %global with_mitkrb5 1
 %global with_dc 0
 Version:        4.2.3

++++++ patches.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/patches/suse/net-kdc-lookup.diff 
new/patches/suse/net-kdc-lookup.diff
--- old/patches/suse/net-kdc-lookup.diff        2015-05-13 21:10:11.000000000 
+0200
+++ new/patches/suse/net-kdc-lookup.diff        2015-08-07 15:28:08.000000000 
+0200
@@ -6,7 +6,7 @@
 ===================================================================
 --- source3/utils/net_lookup.c.orig
 +++ source3/utils/net_lookup.c
-@@ -268,6 +268,89 @@ static int net_lookup_master(struct net_
+@@ -268,6 +268,94 @@ static int net_lookup_master(struct net_
        return 0;
  }
  
@@ -14,12 +14,13 @@
 +/* Look up a KDC using the documented AD SRV records
 +   only.  Does not need ADS configured or even built */
 +
-+static int net_lookup_adskdc(int argc, const char **argv)
++static int net_lookup_adskdc(struct net_context *c, int argc, const char 
**argv)
 +{
 +      char *realm=NULL;
 +      char *sitename=NULL;
++      const char *dns_hosts_file;
 +      struct dns_rr_srv *dclist;
-+      int dcs, numdcs, i;
++      int numdcs, i;
 +      NTSTATUS status;
 +      struct addrinfo hints;
 +
@@ -42,9 +43,13 @@
 +              return -1;
 +      }
 +
-+      status = ads_dns_query_kdcs(realm, realm,
++      dns_hosts_file = lp_parm_const_string(-1, "resolv", "host file", NULL);
++      status = ads_dns_query_kdcs(realm,
++                                  dns_hosts_file,
++                                  realm,
 +                                  sitename,
-+                                  &dclist, &dcs, &numdcs);
++                                  &dclist,
++                                  &numdcs);
 +
 +      if (!NT_STATUS_IS_OK(status)) {
 +              d_printf("No KDC's found.\n");
@@ -96,7 +101,7 @@
  static int net_lookup_kdc(struct net_context *c, int argc, const char **argv)
  {
  #ifdef HAVE_KRB5
-@@ -446,6 +529,7 @@ int net_lookup(struct net_context *c, in
+@@ -446,6 +534,7 @@ int net_lookup(struct net_context *c, in
                {"DC", net_lookup_dc},
                {"PDC", net_lookup_pdc},
                {"MASTER", net_lookup_master},


++++++ vendor-files.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/vendor-files/tools/package-data 
new/vendor-files/tools/package-data
--- old/vendor-files/tools/package-data 2015-07-17 17:22:48.000000000 +0200
+++ new/vendor-files/tools/package-data 2015-08-08 01:27:48.000000000 +0200
@@ -1,2 +1,2 @@
 # This is an autogenrated file.
-SAMBA_PACKAGE_SVN_VERSION="3446"
+SAMBA_PACKAGE_SVN_VERSION="3453"


Reply via email to