[samba/f17] Correctly use system iniparser library

[Guenther Deschner]

commit c1779bfe728de6d30282ba8d8d71063213b94d70
Author: Günther Deschner <gd at samba.org>
Date:   Wed May 9 13:51:21 2012 +0200

    Correctly use system iniparser library
    
    Guenther

 samba-3.6.5-iniparser.patch |   47 +++++++++++++++++++++++++++++++++++++++++++
 samba.spec                  |    9 ++++++-
 2 files changed, 54 insertions(+), 2 deletions(-)
---
diff --git a/samba-3.6.5-iniparser.patch b/samba-3.6.5-iniparser.patch
new file mode 100644
index 0000000..9e54834
--- /dev/null
+++ b/samba-3.6.5-iniparser.patch
@@ -0,0 +1,47 @@
+From adbace20a24b6ae4fbd6d17b7153833f4ac8c88d Mon Sep 17 00:00:00 2001
+From: Simo Sorce <idra at samba.org>
+Date: Mon, 23 Apr 2012 17:23:35 -0400
+Subject: [PATCH] Fix pam_winbind build against newer iniparser library
+
+iniparser_getstr is deprecated and has been removed in newer libraries
+available in Fedora. Use iniparse_getstring instead.
+
+Autobuild-User: Simo Sorce <idra at samba.org>
+Autobuild-Date: Tue Apr 24 02:56:10 CEST 2012 on sn-devel-104
+---
+ nsswitch/pam_winbind.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
+index 831fa84..e3e9af1 100644
+--- a/nsswitch/pam_winbind.c
++++ b/nsswitch/pam_winbind.c
+@@ -437,13 +437,13 @@ static int _pam_parse(const pam_handle_t *pamh,
+ 		ctrl |= WINBIND_SILENT;
+ 	}
+ 
+-	if (iniparser_getstr(d, CONST_DISCARD(char *, "global:krb5_ccache_type")) != NULL) {
++	if (iniparser_getstring(d, CONST_DISCARD(char *, "global:krb5_ccache_type"), NULL) != NULL) {
+ 		ctrl |= WINBIND_KRB5_CCACHE_TYPE;
+ 	}
+ 
+-	if ((iniparser_getstr(d, CONST_DISCARD(char *, "global:require-membership-of"))
++	if ((iniparser_getstring(d, CONST_DISCARD(char *, "global:require-membership-of"), NULL)
+ 	     != NULL) ||
+-	    (iniparser_getstr(d, CONST_DISCARD(char *, "global:require_membership_of"))
++	    (iniparser_getstring(d, CONST_DISCARD(char *, "global:require_membership_of"), NULL)
+ 	     != NULL)) {
+ 		ctrl |= WINBIND_REQUIRED_MEMBERSHIP;
+ 	}
+@@ -2278,7 +2278,7 @@ static const char *get_conf_item_string(struct pwb_context *ctx,
+ 			goto out;
+ 		}
+ 
+-		parm_opt = iniparser_getstr(ctx->dict, key);
++		parm_opt = iniparser_getstring(ctx->dict, key, NULL);
+ 		TALLOC_FREE(key);
+ 
+ 		_pam_log_debug(ctx, LOG_INFO, "CONFIG file: %s '%s'\n",
+-- 
+1.7.7.6
+
diff --git a/samba.spec b/samba.spec
index e46e7d5..b755f80 100644
--- a/samba.spec
+++ b/samba.spec
@@ -1,4 +1,4 @@
-%define main_release 86
+%define main_release 87
 %define samba_version 3.6.5
 %define tdb_version 1.2.9
 %define talloc_version 2.0.5
@@ -47,6 +47,7 @@ Patch104: samba-3.0.0rc3-nmbd-netbiosname.patch
 Patch107: samba-3.2.0pre1-grouppwd.patch
 Patch200: samba-3.2.5-inotify.patch
 Patch201: samba-3.6.4-krb5_locate_kdc.patch
+Patch202: samba-3.6.5-iniparser.patch
 
 Requires(pre): samba-common = %{epoch}:%{samba_version}-%{release}
 Requires: pam >= 0:0.64
@@ -58,7 +59,7 @@ Requires(postun): systemd-units
 BuildRequires: systemd-units
 BuildRequires: pam-devel, readline-devel, ncurses-devel, libacl-devel, krb5-devel, openldap-devel, openssl-devel, cups-devel, ctdb-devel
 BuildRequires: autoconf, gawk, popt-devel, gtk2-devel, libcap-devel, libuuid-devel, quota-devel
-BuildRequires: libtalloc-devel, libtdb-devel
+BuildRequires: libtalloc-devel, libtdb-devel, iniparser-devel
 
 # Working around perl dependency problem from docs
 %define __perl_requires %{SOURCE999}
@@ -232,6 +233,7 @@ cp %{SOURCE11} packaging/Fedora/
 %patch107 -p1 -b .grouppwd
 %patch200 -p0 -b .inotify
 %patch201 -p1 -b .krb5_locate_kdc
+%patch202 -p1 -b .iniparser
 
 mv %samba_source/VERSION %samba_source/VERSION.orig
 sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < %samba_source/VERSION.orig > %samba_source/VERSION
@@ -695,6 +697,9 @@ fi
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Wed May 09 2012 Guenther Deschner <gdeschner at redhat.com> - 2:3.6.5-87
+- Correctly use system iniparser library
+
 * Fri May 04 2012 Andreas Schneider <asn at redhat.com> - 2:3.6.5-86
 - Bump Epoch to fix a problem with a Samba4 update in testing.